You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2017/05/03 16:25:43 UTC
[3/6] tomee git commit: reducing our dependency on corba and rmi and ensuring we have jaxb there - this last change can need some adjustment to endorse or not jaxb

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyComplexPkTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyComplexPkTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyComplexPkTests.java
index 97581f6..05cf377 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyComplexPkTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyComplexPkTests.java
@@ -18,9 +18,9 @@ package org.apache.openejb.test.entity.cmr;
 
 import org.apache.openejb.test.entity.cmr.manytomany.GameLocal;
 import org.apache.openejb.test.entity.cmr.manytomany.GameLocalHome;
+import org.apache.openejb.test.entity.cmr.manytomany.GamePk;
 import org.apache.openejb.test.entity.cmr.manytomany.PlatformLocal;
 import org.apache.openejb.test.entity.cmr.manytomany.PlatformLocalHome;
-import org.apache.openejb.test.entity.cmr.manytomany.GamePk;
 import org.apache.openejb.test.entity.cmr.manytomany.PlatformPk;
 
 import javax.ejb.CreateException;
@@ -30,11 +30,11 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Arrays;
+import java.util.ConcurrentModificationException;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import java.util.Arrays;
-import java.util.ConcurrentModificationException;
 
 /**
  * @version $Revision$ $Date$

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyTests.java
index 09177c8..217b5ce 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyTests.java
@@ -28,11 +28,11 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Arrays;
+import java.util.ConcurrentModificationException;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import java.util.Arrays;
-import java.util.ConcurrentModificationException;
 
 /**
  * @version $Revision$ $Date$

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java
index 8d07442..d430285 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java
@@ -18,22 +18,22 @@ package org.apache.openejb.test.entity.cmr;
 
 import org.apache.openejb.test.entity.cmr.onetomany.ArtistLocal;
 import org.apache.openejb.test.entity.cmr.onetomany.ArtistLocalHome;
+import org.apache.openejb.test.entity.cmr.onetomany.ArtistPk;
 import org.apache.openejb.test.entity.cmr.onetomany.SongLocal;
 import org.apache.openejb.test.entity.cmr.onetomany.SongLocalHome;
-import org.apache.openejb.test.entity.cmr.onetomany.ArtistPk;
 import org.apache.openejb.test.entity.cmr.onetomany.SongPk;
 
-import javax.ejb.FinderException;
 import javax.ejb.CreateException;
+import javax.ejb.FinderException;
 import java.sql.Connection;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
-import java.util.HashSet;
-import java.util.Set;
+import java.sql.Statement;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.ConcurrentModificationException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @version $Revision$ $Date$

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java
index 8fb4c6d..25a7941 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java
@@ -21,17 +21,17 @@ import org.apache.openejb.test.entity.cmr.onetomany.ArtistLocalHome;
 import org.apache.openejb.test.entity.cmr.onetomany.SongLocal;
 import org.apache.openejb.test.entity.cmr.onetomany.SongLocalHome;
 
-import javax.ejb.FinderException;
 import javax.ejb.CreateException;
+import javax.ejb.FinderException;
 import java.sql.Connection;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
-import java.util.HashSet;
-import java.util.Set;
+import java.sql.Statement;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.ConcurrentModificationException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @version $Revision$ $Date$

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java
index f105814..39ef53a 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java
@@ -17,19 +17,19 @@
 package org.apache.openejb.test.entity.cmr;
 
 
-import org.apache.openejb.test.entity.cmr.onetoone.PersonLocal;
-import org.apache.openejb.test.entity.cmr.onetoone.PersonLocalHome;
 import org.apache.openejb.test.entity.cmr.onetoone.LicenseLocal;
 import org.apache.openejb.test.entity.cmr.onetoone.LicenseLocalHome;
-import org.apache.openejb.test.entity.cmr.onetoone.PersonPk;
 import org.apache.openejb.test.entity.cmr.onetoone.LicensePk;
+import org.apache.openejb.test.entity.cmr.onetoone.PersonLocal;
+import org.apache.openejb.test.entity.cmr.onetoone.PersonLocalHome;
+import org.apache.openejb.test.entity.cmr.onetoone.PersonPk;
 
 import javax.ejb.CreateException;
 import javax.ejb.FinderException;
 import java.sql.Connection;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * @version $Revision$ $Date$

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java
index 32e915f..29d72aa 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java
@@ -17,17 +17,17 @@
 package org.apache.openejb.test.entity.cmr;
 
 
-import org.apache.openejb.test.entity.cmr.onetoone.PersonLocal;
-import org.apache.openejb.test.entity.cmr.onetoone.PersonLocalHome;
 import org.apache.openejb.test.entity.cmr.onetoone.LicenseLocal;
 import org.apache.openejb.test.entity.cmr.onetoone.LicenseLocalHome;
+import org.apache.openejb.test.entity.cmr.onetoone.PersonLocal;
+import org.apache.openejb.test.entity.cmr.onetoone.PersonLocalHome;
 
 import javax.ejb.CreateException;
 import javax.ejb.FinderException;
 import java.sql.Connection;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * @version $Revision$ $Date$

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAnnotatedFieldInjectionTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAnnotatedFieldInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAnnotatedFieldInjectionTests.java
index fd9762f..70bbf13 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAnnotatedFieldInjectionTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAnnotatedFieldInjectionTests.java
@@ -17,8 +17,8 @@
  */
 package org.apache.openejb.test.mdb;
 
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
 
 import javax.jms.Destination;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbContextLookupTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbContextLookupTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbContextLookupTests.java
index 48c4147..cd4f675 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbContextLookupTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbContextLookupTests.java
@@ -17,8 +17,8 @@
  */
 package org.apache.openejb.test.mdb;
 
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
 
 import javax.jms.Destination;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbFieldInjectionTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbFieldInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbFieldInjectionTests.java
index 9a5817e..a1fbdaf 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbFieldInjectionTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbFieldInjectionTests.java
@@ -17,8 +17,8 @@
  */
 package org.apache.openejb.test.mdb;
 
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
 
 import javax.jms.Destination;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbSetterInjectionTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbSetterInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbSetterInjectionTests.java
index 2afa30f..b2be2d7 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbSetterInjectionTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbSetterInjectionTests.java
@@ -17,8 +17,8 @@
  */
 package org.apache.openejb.test.mdb;
 
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
 
 import javax.jms.Destination;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestClient.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestClient.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestClient.java
index 4b67631..10b035b 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestClient.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestClient.java
@@ -19,8 +19,8 @@ package org.apache.openejb.test.mdb;
 
 import org.apache.openejb.test.TestManager;
 
-import javax.jms.ConnectionFactory;
 import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
 import javax.jms.JMSException;
 import javax.naming.InitialContext;
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java
index ec06eae..1c2360c 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java
@@ -16,21 +16,21 @@
  */
 package org.apache.openejb.test.servlet;
 
+import org.apache.openejb.test.TestClient;
+import org.apache.openejb.test.TestManager;
+
+import javax.naming.InitialContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.net.Authenticator;
 import java.net.MalformedURLException;
+import java.net.PasswordAuthentication;
 import java.net.URL;
 import java.net.URLConnection;
-import java.net.Authenticator;
-import java.net.PasswordAuthentication;
 import java.util.Properties;
-import javax.naming.InitialContext;
-
-import org.apache.openejb.test.TestClient;
-import org.apache.openejb.test.TestManager;
 
 public abstract class ServletTestClient extends TestClient {
     protected URL serverUrl;

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoHomeIntfcTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoHomeIntfcTests.java
index de85790..b2853a3 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoHomeIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoHomeIntfcTests.java
@@ -16,9 +16,6 @@
  */
 package org.apache.openejb.test.singleton;
 
-import javax.ejb.EJB;
-
-
 /**
  * [2] Should be run as the second test suite of the BasicSingletonTestClients
  *

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoLocalHomeIntfcTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoLocalHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoLocalHomeIntfcTests.java
index 0addc2c..a18fa0e 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoLocalHomeIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoLocalHomeIntfcTests.java
@@ -16,9 +16,6 @@
  */
 package org.apache.openejb.test.singleton;
 
-import javax.ejb.EJB;
-
-
 /**
  * [2] Should be run as the second test suite of the BasicSingletonTestClients
  *

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java
index 356241a..e2328b1 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java
@@ -16,8 +16,8 @@
  */
 package org.apache.openejb.test.singleton;
 
-import org.apache.openejb.test.object.OperationsPolicy;
 import org.apache.openejb.test.beans.TimerSync;
+import org.apache.openejb.test.object.OperationsPolicy;
 
 /**
  * [10] Should be run as the nineth test suite of the BasicSingletonTestClients
@@ -68,7 +68,7 @@ public class BMTSingletonAllowedOperationsTests extends BasicSingletonTestClient
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BeanManagedBasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbObject = ejbHome.createObject();
         ejbHandle = ejbObject.getHandle();
         timerSync = (TimerSync) initialContext.lookup("TimerSyncBeanBusinessRemote");

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/MiscEjbTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/MiscEjbTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/MiscEjbTests.java
index d6227df..730411e 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/MiscEjbTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/MiscEjbTests.java
@@ -32,7 +32,7 @@ public class MiscEjbTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbObject = ejbHome.createObject();
     }
 
@@ -56,7 +56,7 @@ public class MiscEjbTests extends BasicSingletonTestClient {
             EncSingletonObject ejbObject2 = null;
 
             final Object obj = initialContext.lookup(jndiName);
-            ejbHome2 = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            ejbHome2 = (EncSingletonHome) obj;
             ejbObject2 = ejbHome2.create();
 
             //System.out.println("_______________________________________________________");
@@ -77,7 +77,7 @@ public class MiscEjbTests extends BasicSingletonTestClient {
             EncStatefulObject ejbObject2 = null;
 
             final Object obj = initialContext.lookup(jndiName);
-            ejbHome2 = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class);
+            ejbHome2 = (EncStatefulHome) obj;
             ejbObject2 = ejbHome2.create("isIdentical test");
 
             //System.out.println("_______________________________________________________");
@@ -98,7 +98,7 @@ public class MiscEjbTests extends BasicSingletonTestClient {
             EncBmpObject ejbObject2 = null;
 
             final Object obj = initialContext.lookup(jndiName);
-            ejbHome2 = (EncBmpHome) javax.rmi.PortableRemoteObject.narrow(obj, EncBmpHome.class);
+            ejbHome2 = (EncBmpHome) obj;
             ejbObject2 = ejbHome2.create("isIdentical test");
 
             //System.out.println("_______________________________________________________");
@@ -121,7 +121,7 @@ public class MiscEjbTests extends BasicSingletonTestClient {
             EncCmpObject ejbObject2 = null;
 
             final Object obj = initialContext.lookup(jndiName);
-            ejbHome2 = (EncCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, EncCmpHome.class);
+            ejbHome2 = (EncCmpHome) obj;
             ejbObject2 = ejbHome2.create("isIdentical test");
 
             //System.out.println("_______________________________________________________");

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java
index 26d9e72..37ba042 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java
@@ -16,10 +16,10 @@
  */
 package org.apache.openejb.test.singleton;
 
-import javax.ejb.EJBObject;
-
-import org.apache.openejb.test.object.OperationsPolicy;
 import org.apache.openejb.test.beans.TimerSync;
+import org.apache.openejb.test.object.OperationsPolicy;
+
+import javax.ejb.EJBObject;
 
 /**
  * [9] Should be run as the nineth test suite of the BasicSingletonTestClients
@@ -70,7 +70,7 @@ public class SingletonAllowedOperationsTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbObject = ejbHome.createObject();
         ejbHandle = ejbObject.getHandle();
         timerSync = (TimerSync) initialContext.lookup("TimerSyncBeanBusinessRemote");

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAnnotatedFieldInjectionTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAnnotatedFieldInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAnnotatedFieldInjectionTests.java
index ce76a18..4ca0411 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAnnotatedFieldInjectionTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAnnotatedFieldInjectionTests.java
@@ -16,9 +16,9 @@
  */
 package org.apache.openejb.test.singleton;
 
-import org.apache.openejb.test.stateful.StatefulTestClient;
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
+import org.apache.openejb.test.stateful.StatefulTestClient;
 
 /**
  * [4] Should be run as the fourth test suite of the StatefulTestClients
@@ -35,7 +35,7 @@ public class SingletonAnnotatedFieldInjectionTests extends StatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("AnnotatedFieldInjectionSingletonBean");
-        ejbHome = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+        ejbHome = (EncSingletonHome) obj;
         ejbObject = ejbHome.create();
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java
index 514b8ba..be86adb 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java
@@ -16,18 +16,16 @@
  */
 package org.apache.openejb.test.singleton;
 
-import java.util.Properties;
+import org.apache.openejb.test.TestManager;
+import org.apache.openejb.test.object.Account;
+import org.apache.openejb.test.object.Transaction;
 
 import javax.ejb.EJBMetaData;
 import javax.ejb.Handle;
 import javax.ejb.HomeHandle;
-import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.transaction.RollbackException;
-
-import org.apache.openejb.test.TestManager;
-import org.apache.openejb.test.object.Account;
-import org.apache.openejb.test.object.Transaction;
+import java.util.Properties;
 
 /**
  * [1] Should be run as the first test suite of the SingletonTestClients
@@ -64,7 +62,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase
 
         /*[1] Get bean */
         final Object obj = initialContext.lookup(jndiEJBHomeEntry);
-        ejbHome = (BeanTxSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BeanTxSingletonHome.class);
+        ejbHome = (BeanTxSingletonHome) obj;
         ejbObject = ejbHome.create();
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContainerTxTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContainerTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContainerTxTests.java
index 608c23a..a5c53f2 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContainerTxTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContainerTxTests.java
@@ -16,15 +16,13 @@
  */
 package org.apache.openejb.test.singleton;
 
-import java.util.Properties;
+import org.apache.openejb.test.TestManager;
 
 import javax.ejb.EJBMetaData;
 import javax.ejb.Handle;
 import javax.ejb.HomeHandle;
-import javax.naming.Context;
 import javax.naming.InitialContext;
-
-import org.apache.openejb.test.TestManager;
+import java.util.Properties;
 
 /**
  * [1] Should be run as the first test suite of the SingletonTestClients
@@ -61,7 +59,7 @@ public class SingletonContainerTxTests extends org.apache.openejb.test.NamedTest
 
         /*[1] Get bean */
         final Object obj = initialContext.lookup(jndiEJBHomeEntry);
-        ejbHome = (ContainerTxSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, ContainerTxSingletonHome.class);
+        ejbHome = (ContainerTxSingletonHome) obj;
         ejbObject = ejbHome.create();
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContextLookupTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContextLookupTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContextLookupTests.java
index afabb9d..7d9b669 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContextLookupTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonContextLookupTests.java
@@ -16,8 +16,8 @@
  */
 package org.apache.openejb.test.singleton;
 
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
 
 /**
  * [4] Should be run as the fourth test suite of the EncSingletonTestClients
@@ -34,7 +34,7 @@ public class SingletonContextLookupTests extends SingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/ContextLookupSingletonBean");
-        ejbHome = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+        ejbHome = (EncSingletonHome) obj;
         ejbObject = ejbHome.create();
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonDefaultInterceptorTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonDefaultInterceptorTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonDefaultInterceptorTests.java
index e4b390d..5c751bd 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonDefaultInterceptorTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonDefaultInterceptorTests.java
@@ -16,9 +16,6 @@
  */
 package org.apache.openejb.test.singleton;
 
-import java.util.ArrayList;
-import java.util.Map;
-
 // import javax.ejb.EJB;
 
 // public class SingletonInterceptorTests extends AnnotatedFieldInjectionSingletonLocalTestClient {

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbHomeTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbHomeTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbHomeTests.java
index 0938529..5f5a481 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbHomeTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbHomeTests.java
@@ -31,7 +31,7 @@ public class SingletonEjbHomeTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
     }
 
     //===============================

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbMetaDataTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbMetaDataTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbMetaDataTests.java
index 42885dc..768d0d9 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbMetaDataTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbMetaDataTests.java
@@ -30,7 +30,7 @@ public class SingletonEjbMetaDataTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbMetaData = ejbHome.getEJBMetaData();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbObjectTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbObjectTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbObjectTests.java
index 2d7915a..c4a8c80 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbObjectTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonEjbObjectTests.java
@@ -16,9 +16,8 @@
  */
 package org.apache.openejb.test.singleton;
 
-import java.rmi.RemoteException;
-
 import javax.ejb.EJBHome;
+import java.rmi.RemoteException;
 
 /**
  * [4] Should be run as the fourth test suite of the BasicSingletonTestClients
@@ -32,7 +31,7 @@ public class SingletonEjbObjectTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbObject = ejbHome.createObject();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonFieldInjectionTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonFieldInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonFieldInjectionTests.java
index 8174627..4ae13c1 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonFieldInjectionTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonFieldInjectionTests.java
@@ -16,11 +16,9 @@
  */
 package org.apache.openejb.test.singleton;
 
-import org.apache.openejb.test.stateful.StatefulTestClient;
-import org.apache.openejb.test.stateful.EncStatefulHome;
-import org.apache.openejb.test.stateful.EncStatefulObject;
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
+import org.apache.openejb.test.stateful.StatefulTestClient;
 
 /**
  * [4] Should be run as the fourth test suite of the StatefulTestClients
@@ -37,7 +35,7 @@ public class SingletonFieldInjectionTests extends StatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/FieldInjectionSingletonBean");
-        ejbHome = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+        ejbHome = (EncSingletonHome) obj;
         ejbObject = ejbHome.create();
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHandleTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHandleTests.java
index 6d23459..8695361 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHandleTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHandleTests.java
@@ -30,7 +30,7 @@ public class SingletonHandleTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbObject = ejbHome.createObject();
         ejbHandle = ejbObject.getHandle();
     }

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeHandleTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeHandleTests.java
index 6368697..31c2d14 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeHandleTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeHandleTests.java
@@ -30,7 +30,7 @@ public class SingletonHomeHandleTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbHomeHandle = ejbHome.getHomeHandle();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeIntfcTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeIntfcTests.java
index d38d2ce..5a16a2a 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonHomeIntfcTests.java
@@ -29,7 +29,7 @@ public class SingletonHomeIntfcTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
     }
 
     //===============================

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonInterceptorTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonInterceptorTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonInterceptorTests.java
index 1362860..8ceadb1 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonInterceptorTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonInterceptorTests.java
@@ -18,7 +18,6 @@ package org.apache.openejb.test.singleton;
 
 import java.util.ArrayList;
 import java.util.Map;
-import java.util.Arrays;
 
 /**
  * @version $Rev: 607077 $ $Date: 2007-12-27 06:55:23 -0800 (Thu, 27 Dec 2007) $
@@ -38,8 +37,7 @@ public class SingletonInterceptorTests extends BasicSingletonLocalTestClient {
         super.setUp();
         final Object obj = initialContext.lookup("BasicSingletonInterceptedBusinessRemote");
         assertNotNull("The BasicSingletonInterceptedBusinessRemote object is null", obj);
-        remoteInterceptor = (BasicSingletonInterceptedRemote) javax.rmi.PortableRemoteObject.narrow(obj,
-            BasicSingletonInterceptedRemote.class);
+        remoteInterceptor = (BasicSingletonInterceptedRemote) obj;
         assertNotNull("Remote interceptor is null", remoteInterceptor);
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiEncTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiEncTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiEncTests.java
index 255df14..5d06fd6 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiEncTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiEncTests.java
@@ -36,7 +36,7 @@ public class SingletonJndiEncTests extends SingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-        ejbHome = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+        ejbHome = (EncSingletonHome) obj;
         ejbObject = ejbHome.create();
         
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiTests.java
index 9620591..02d6164 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonJndiTests.java
@@ -40,7 +40,7 @@ public class SingletonJndiTests extends BasicSingletonTestClient {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
             assertNotNull("The EJBHome looked up from JNDI is null", obj);
-            ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+            ejbHome = (BasicSingletonHome) obj;
             assertNotNull("The EJBHome is null after PortableRemoteObject.narrow", ejbHome);
         } catch (final Exception e) {
             e.printStackTrace();

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoContextLookupTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoContextLookupTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoContextLookupTests.java
index 233ae12..78cb181 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoContextLookupTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoContextLookupTests.java
@@ -16,8 +16,8 @@
  */
 package org.apache.openejb.test.singleton;
 
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
 
 /**
  * [4] Should be run as the fourth test suite of the EncSingletonTestClients
@@ -34,7 +34,7 @@ public class SingletonPojoContextLookupTests extends SingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/ContextLookupSingletonPojoBean");
-        ejbHome = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+        ejbHome = (EncSingletonHome) obj;
         ejbObject = ejbHome.create();
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbHomeTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbHomeTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbHomeTests.java
index d370b5e..f2b8278 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbHomeTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbHomeTests.java
@@ -31,7 +31,7 @@ public class SingletonPojoEjbHomeTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonPojoHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
     }
 
     //===============================

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbLocalObjectTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbLocalObjectTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbLocalObjectTests.java
index f81e48c..237d0b4 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbLocalObjectTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbLocalObjectTests.java
@@ -29,8 +29,7 @@ public class SingletonPojoEjbLocalObjectTests extends BasicSingletonLocalTestCli
         super.setUp();
         final Object obj = initialContext
             .lookup("client/tests/singleton/BasicSingletonPojoHomeLocal");
-        ejbLocalHome = (BasicSingletonLocalHome) javax.rmi.PortableRemoteObject
-            .narrow(obj, BasicSingletonLocalHome.class);
+        ejbLocalHome = (BasicSingletonLocalHome) obj;
         ejbLocalObject = ejbLocalHome.create();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbMetaDataTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbMetaDataTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbMetaDataTests.java
index 60acd95..10d8a88 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbMetaDataTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbMetaDataTests.java
@@ -27,7 +27,7 @@ public class SingletonPojoEjbMetaDataTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonPojoHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbMetaData = ejbHome.getEJBMetaData();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbObjectTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbObjectTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbObjectTests.java
index 86acc48..46d7383 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbObjectTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoEjbObjectTests.java
@@ -36,7 +36,7 @@ public class SingletonPojoEjbObjectTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonPojoHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbObject = ejbHome.createObject();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHandleTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHandleTests.java
index 464fbd7..d6bb490 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHandleTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHandleTests.java
@@ -27,7 +27,7 @@ public class SingletonPojoHandleTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonPojoHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbObject = ejbHome.createObject();
         ejbHandle = ejbObject.getHandle();
     }

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeHandleTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeHandleTests.java
index bf6b48b..e959da5 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeHandleTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeHandleTests.java
@@ -27,7 +27,7 @@ public class SingletonPojoHomeHandleTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonPojoHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbHomeHandle = ejbHome.getHomeHandle();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeIntfcTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeIntfcTests.java
index 9206e44..0c9b18a 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoHomeIntfcTests.java
@@ -31,7 +31,7 @@ public class SingletonPojoHomeIntfcTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonPojoHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
     }
 
     //===============================

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteIntrfcTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteIntrfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteIntrfcTests.java
index bdd23f0..771384a 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteIntrfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteIntrfcTests.java
@@ -25,7 +25,7 @@ public class SingletonPojoRemoteIntrfcTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonPojoHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbObject = ejbHome.createObject();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteJndiTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteJndiTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteJndiTests.java
index 9967b39..74aa9e4 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteJndiTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonPojoRemoteJndiTests.java
@@ -33,7 +33,7 @@ public class SingletonPojoRemoteJndiTests extends BasicSingletonTestClient {
     public void test02_Jndi_lookupHome() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonPojoHome");
-            ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+            ejbHome = (BasicSingletonHome) obj;
             assertNotNull("The EJBHome is null", ejbHome);
         } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteIntfcTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteIntfcTests.java
index bdc0395..2d91704 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteIntfcTests.java
@@ -29,7 +29,7 @@ public class SingletonRemoteIntfcTests extends BasicSingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
-        ejbHome = (BasicSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicSingletonHome.class);
+        ejbHome = (BasicSingletonHome) obj;
         ejbObject = ejbHome.createObject();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java
index 85721b7..cf1784e 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java
@@ -16,14 +16,12 @@
  */
 package org.apache.openejb.test.singleton;
 
+import org.apache.openejb.test.object.ObjectGraph;
+
 import javax.ejb.EJBHome;
 import javax.ejb.EJBMetaData;
 import javax.ejb.EJBObject;
 import javax.ejb.Handle;
-import javax.rmi.PortableRemoteObject;
-
-import org.apache.openejb.test.object.ObjectGraph;
-
 import java.rmi.RemoteException;
 
 public class SingletonRmiIiopTests extends SingletonTestClient {
@@ -38,7 +36,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/RMI-over-IIOP/EJBHome");
-        ejbHome = (RmiIiopSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, RmiIiopSingletonHome.class);
+        ejbHome = (RmiIiopSingletonHome) obj;
         ejbObject = ejbHome.create();
     }
 
@@ -518,10 +516,10 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test35_returnEJBHome() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome expected = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome expected = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", expected);
 
-            final EncSingletonHome actual = (EncSingletonHome) PortableRemoteObject.narrow(ejbObject.returnEJBHome(expected), EncSingletonHome.class);
+            final EncSingletonHome actual = (EncSingletonHome) ejbObject.returnEJBHome(expected);
             assertNotNull("The EJBHome returned is null", actual);
 
         } catch (final Exception e) {
@@ -531,7 +529,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
 
     public void test36_returnEJBHome2() {
         try {
-            final EncSingletonHome actual = (EncSingletonHome) PortableRemoteObject.narrow(ejbObject.returnEJBHome(), EncSingletonHome.class);
+            final EncSingletonHome actual = (EncSingletonHome) ejbObject.returnEJBHome();
             assertNotNull("The EJBHome returned is null", actual);
 
         } catch (final Exception e) {
@@ -542,13 +540,13 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test37_returnNestedEJBHome() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome expected = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome expected = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", expected);
 
             final ObjectGraph graph = ejbObject.returnObjectGraph(new ObjectGraph(expected));
             assertNotNull("The ObjectGraph is null", graph);
 
-            final EncSingletonHome actual = (EncSingletonHome) PortableRemoteObject.narrow(graph.getObject(), EncSingletonHome.class);
+            final EncSingletonHome actual = (EncSingletonHome) graph.getObject();
             assertNotNull("The EJBHome returned is null", actual);
         } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -560,7 +558,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
             final ObjectGraph graph = ejbObject.returnNestedEJBHome();
             assertNotNull("The ObjectGraph is null", graph);
 
-            final EncSingletonHome actual = (EncSingletonHome) PortableRemoteObject.narrow(graph.getObject(), EncSingletonHome.class);
+            final EncSingletonHome actual = (EncSingletonHome) graph.getObject();
             assertNotNull("The EJBHome returned is null", actual);
         } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -573,7 +571,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
             final EncSingletonHome[] expected = new EncSingletonHome[3];
             for (int i = 0; i < expected.length; i++) {
                 final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-                expected[i] = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+                expected[i] = (EncSingletonHome) obj;
                 assertNotNull("The EJBHome returned from JNDI is null", expected[i]);
             }
 
@@ -594,13 +592,13 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test40_returnEJBObject() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome home = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome home = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", home);
 
             final EncSingletonObject expected = home.create();
             assertNotNull("The EJBObject created is null", expected);
 
-            final EncSingletonObject actual = (EncSingletonObject) PortableRemoteObject.narrow(ejbObject.returnEJBObject(expected), EncSingletonObject.class);
+            final EncSingletonObject actual = (EncSingletonObject) ejbObject.returnEJBObject(expected);
             assertNotNull("The EJBObject returned is null", actual);
 
             assertTrue("The EJBObejcts are not identical", expected.isIdentical(actual));
@@ -611,7 +609,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
 
     public void test41_returnEJBObject2() {
         try {
-            final EncSingletonObject actual = (EncSingletonObject) PortableRemoteObject.narrow(ejbObject.returnEJBObject(), EncSingletonObject.class);
+            final EncSingletonObject actual = (EncSingletonObject) ejbObject.returnEJBObject();
             assertNotNull("The EJBObject returned is null", actual);
 
         } catch (final Exception e) {
@@ -622,7 +620,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test42_returnNestedEJBObject() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome home = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome home = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", home);
 
             final EncSingletonObject expected = home.create();
@@ -631,7 +629,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
             final ObjectGraph graph = ejbObject.returnObjectGraph(new ObjectGraph(expected));
             assertNotNull("The ObjectGraph is null", graph);
 
-            final EncSingletonObject actual = (EncSingletonObject) PortableRemoteObject.narrow(graph.getObject(), EncSingletonObject.class);
+            final EncSingletonObject actual = (EncSingletonObject) graph.getObject();
             assertNotNull("The EJBObject returned is null", actual);
 
             assertTrue("The EJBObejcts are not identical", expected.isIdentical(actual));
@@ -645,7 +643,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
             final ObjectGraph graph = ejbObject.returnNestedEJBObject();
             assertNotNull("The ObjectGraph is null", graph);
 
-            final EncSingletonObject actual = (EncSingletonObject) PortableRemoteObject.narrow(graph.getObject(), EncSingletonObject.class);
+            final EncSingletonObject actual = (EncSingletonObject) graph.getObject();
             assertNotNull("The EJBHome returned is null", actual);
         } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
@@ -655,7 +653,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test44_returnEJBObjectArray() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome home = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome home = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", home);
 
             final EncSingletonObject[] expected = new EncSingletonObject[3];
@@ -684,7 +682,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test45_returnEJBMetaData() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome home = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome home = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", home);
 
             final EJBMetaData expected = home.getEJBMetaData();
@@ -713,7 +711,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test47_returnNestedEJBMetaData() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome home = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome home = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", home);
 
             final EJBMetaData expected = home.getEJBMetaData();
@@ -749,7 +747,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
         try {
 
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome home = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome home = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", home);
 
             final EJBMetaData[] expected = new EJBMetaData[3];
@@ -780,7 +778,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test50_returnHandle() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome home = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome home = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", home);
 
             final EncSingletonObject object = home.create();
@@ -817,7 +815,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test52_returnNestedHandle() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome home = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome home = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", home);
 
             final EncSingletonObject object = home.create();
@@ -860,7 +858,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
     public void test54_returnHandleArray() {
         try {
             final Object obj = initialContext.lookup("client/tests/singleton/EncBean");
-            final EncSingletonHome home = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+            final EncSingletonHome home = (EncSingletonHome) obj;
             assertNotNull("The EJBHome returned from JNDI is null", home);
 
             final EncSingletonObject object = home.create();

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonSetterInjectionTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonSetterInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonSetterInjectionTests.java
index cc058fc..5584877 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonSetterInjectionTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonSetterInjectionTests.java
@@ -16,9 +16,9 @@
  */
 package org.apache.openejb.test.singleton;
 
-import org.apache.openejb.test.stateful.StatefulTestClient;
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
+import org.apache.openejb.test.stateful.StatefulTestClient;
 
 /**
  * [4] Should be run as the fourth test suite of the StatefulTestClients
@@ -35,7 +35,7 @@ public class SingletonSetterInjectionTests extends StatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/singleton/SetterInjectionSingletonBean");
-        ejbHome = (EncSingletonHome) javax.rmi.PortableRemoteObject.narrow(obj, EncSingletonHome.class);
+        ejbHome = (EncSingletonHome) obj;
         ejbObject = ejbHome.create();
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java
index f6bb868..77ff152 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java
@@ -70,7 +70,7 @@ public class BMTStatefulAllowedOperationsTests extends BasicStatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/BeanManagedBasicStatefulHome");
-        ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class);
+        ejbHome = (BasicStatefulHome) obj;
         ejbObject = ejbHome.createObject("Fifth Bean");
         ejbHandle = ejbObject.getHandle();
         /* These tests will only work if the specified

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java
index dee3247..b9deddf 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java
@@ -92,7 +92,7 @@ public class StatefulAllowedOperationsTests extends BasicStatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulHome");
-        ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class);
+        ejbHome = (BasicStatefulHome) obj;
         ejbObject = ejbHome.createObject("Fourth Bean");
         ejbHandle = ejbObject.getHandle();
         /* These tests will only work if the specified

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java
index 4fc3721..439e256 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java
@@ -16,18 +16,16 @@
  */
 package org.apache.openejb.test.stateful;
 
-import java.util.Properties;
+import org.apache.openejb.test.TestManager;
+import org.apache.openejb.test.object.Account;
+import org.apache.openejb.test.object.Transaction;
 
 import javax.ejb.EJBMetaData;
 import javax.ejb.Handle;
 import javax.ejb.HomeHandle;
-import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.transaction.RollbackException;
-
-import org.apache.openejb.test.TestManager;
-import org.apache.openejb.test.object.Account;
-import org.apache.openejb.test.object.Transaction;
+import java.util.Properties;
 
 /**
  * [1] Should be run as the first test suite of the StatefulTestClients
@@ -64,7 +62,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase {
 
         /*[1] Get bean */
         final Object obj = initialContext.lookup(jndiEJBHomeEntry);
-        ejbHome = (BeanTxStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BeanTxStatefulHome.class);
+        ejbHome = (BeanTxStatefulHome) obj;
         ejbObject = ejbHome.create("Transaction Bean");
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulContextLookupTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulContextLookupTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulContextLookupTests.java
index 1976e6e..4d09f98 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulContextLookupTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulContextLookupTests.java
@@ -16,8 +16,8 @@
  */
 package org.apache.openejb.test.stateful;
 
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
 
 /**
  * [4] Should be run as the fourth test suite of the StatefulTestClients
@@ -34,7 +34,7 @@ public class StatefulContextLookupTests extends StatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/ContextLookupStatefulBean");
-        ejbHome = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class);
+        ejbHome = (EncStatefulHome) obj;
         ejbObject = ejbHome.create("Enc Bean");
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulDefaultInterceptorTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulDefaultInterceptorTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulDefaultInterceptorTests.java
index 0a13aac..e15ed30 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulDefaultInterceptorTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulDefaultInterceptorTests.java
@@ -16,9 +16,6 @@
  */
 package org.apache.openejb.test.stateful;
 
-import java.util.ArrayList;
-import java.util.Map;
-
 // import javax.ejb.EJB;
 
 // public class StatelessInterceptorTests extends AnnotatedFieldInjectionStatelessLocalTestClient {

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java
index 9183d04..2b907a7 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbHomeTests.java
@@ -31,7 +31,7 @@ public class StatefulEjbHomeTests extends BasicStatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulHome");
-        ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class);
+        ejbHome = (BasicStatefulHome) obj;
     }
 
     //===============================

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbMetaDataTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbMetaDataTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbMetaDataTests.java
index 6bfd5f0..82edcdf 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbMetaDataTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbMetaDataTests.java
@@ -30,7 +30,7 @@ public class StatefulEjbMetaDataTests extends BasicStatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulHome");
-        ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class);
+        ejbHome = (BasicStatefulHome) obj;
         ejbMetaData = ejbHome.getEJBMetaData();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java
index 05a3842..0180483 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulEjbObjectTests.java
@@ -16,9 +16,8 @@
  */
 package org.apache.openejb.test.stateful;
 
-import java.rmi.RemoteException;
-
 import javax.ejb.EJBHome;
+import java.rmi.RemoteException;
 
 /**
  * [4] Should be run as the fourth test suite of the BasicStatefulTestClients
@@ -32,7 +31,7 @@ public class StatefulEjbObjectTests extends BasicStatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulHome");
-        ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class);
+        ejbHome = (BasicStatefulHome) obj;
         ejbObject = ejbHome.createObject("Second Bean");
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulFieldInjectionTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulFieldInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulFieldInjectionTests.java
index a15aabe..d6a5315 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulFieldInjectionTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulFieldInjectionTests.java
@@ -16,8 +16,8 @@
  */
 package org.apache.openejb.test.stateful;
 
-import org.apache.openejb.test.TestManager;
 import org.apache.openejb.test.TestFailureException;
+import org.apache.openejb.test.TestManager;
 
 /**
  * [4] Should be run as the fourth test suite of the StatefulTestClients
@@ -34,7 +34,7 @@ public class StatefulFieldInjectionTests extends StatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/FieldInjectionStatefulBean");
-        ejbHome = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class);
+        ejbHome = (EncStatefulHome) obj;
         ejbObject = ejbHome.create("Enc Bean");
 
         /*[2] Create database table */

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHandleTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHandleTests.java
index a4439d3..74f5965 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHandleTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHandleTests.java
@@ -30,7 +30,7 @@ public class StatefulHandleTests extends BasicStatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulHome");
-        ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class);
+        ejbHome = (BasicStatefulHome) obj;
         ejbObject = ejbHome.createObject("Fourth Bean");
         ejbHandle = ejbObject.getHandle();
     }

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeHandleTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeHandleTests.java
index 2b0ce0e..035c27c 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeHandleTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeHandleTests.java
@@ -30,7 +30,7 @@ public class StatefulHomeHandleTests extends BasicStatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulHome");
-        ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class);
+        ejbHome = (BasicStatefulHome) obj;
         ejbHomeHandle = ejbHome.getHomeHandle();
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeIntfcTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeIntfcTests.java
index ecf7a11..421878d 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulHomeIntfcTests.java
@@ -29,7 +29,7 @@ public class StatefulHomeIntfcTests extends BasicStatefulTestClient {
     protected void setUp() throws Exception {
         super.setUp();
         final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulHome");
-        ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class);
+        ejbHome = (BasicStatefulHome) obj;
     }
 
     //===============================