http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptorTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptorTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptorTests.java index ad9feaf..0aed8f6 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptorTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptorTests.java @@ -37,8 +37,7 @@ public class StatefulInterceptorTests extends BasicStatefulLocalTestClient { super.setUp(); final Object obj = initialContext.lookup("BasicStatefulInterceptedBusinessRemote"); assertNotNull("The object is null", obj); - remoteInterceptor = (BasicStatefulInterceptedRemote) javax.rmi.PortableRemoteObject.narrow(obj, - BasicStatefulInterceptedRemote.class); + remoteInterceptor = (BasicStatefulInterceptedRemote) 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/stateful/StatefulJndiEncTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java index a5180fc..f206102 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java @@ -34,7 +34,7 @@ public class StatefulJndiEncTests extends StatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - 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/StatefulJndiTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiTests.java index 4d2244b..aed5a07 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiTests.java @@ -29,7 +29,7 @@ public class StatefulJndiTests extends BasicStatefulTestClient { public void test01_Jndi_lookupHome() { try { final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulHome"); - ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class); + ejbHome = (BasicStatefulHome) 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/stateful/StatefulLocalTestSuite.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java index a7e796a..e9b7033 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalTestSuite.java @@ -18,8 +18,8 @@ package org.apache.openejb.test.stateful; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.openejb.test.stateless.AnnotatedSetterInjectionStatelessPojoLocalHomeIntfcTests; import org.apache.openejb.test.FilteredTestSuite; +import org.apache.openejb.test.stateless.AnnotatedSetterInjectionStatelessPojoLocalHomeIntfcTests; /** * @version $Rev$ $Date$ http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPersistenceContextTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPersistenceContextTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPersistenceContextTests.java index 8309db3..e898d75 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPersistenceContextTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPersistenceContextTests.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; public class StatefulPersistenceContextTests extends StatefulTestClient { http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoContextLookupTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoContextLookupTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoContextLookupTests.java index 47dab78..c58f426 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoContextLookupTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoContextLookupTests.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 StatefulPojoContextLookupTests extends StatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateful/ContextLookupStatefulPojoBean"); - 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/StatefulPojoEjbHomeTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbHomeTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbHomeTests.java index fc6b47d..b17a6eb 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbHomeTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbHomeTests.java @@ -31,7 +31,7 @@ public class StatefulPojoEjbHomeTests extends BasicStatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulPojoHome"); - 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/StatefulPojoEjbLocalObjectTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbLocalObjectTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbLocalObjectTests.java index ae37e82..b2f7ca9 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbLocalObjectTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbLocalObjectTests.java @@ -16,7 +16,6 @@ */ package org.apache.openejb.test.stateful; -import javax.ejb.EJBHome; import javax.ejb.EJBLocalHome; public class StatefulPojoEjbLocalObjectTests extends BasicStatefulLocalTestClient { http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbObjectTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbObjectTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbObjectTests.java index 54ae171..35a8627 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbObjectTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoEjbObjectTests.java @@ -31,7 +31,7 @@ public class StatefulPojoEjbObjectTests extends BasicStatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulPojoHome"); - ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class); + ejbHome = (BasicStatefulHome) obj; ejbObject = ejbHome.createObject("First Bean"); } http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHandleTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHandleTests.java index effb634..51eb881 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHandleTests.java @@ -16,9 +16,8 @@ */ package org.apache.openejb.test.stateful; -import java.rmi.NoSuchObjectException; - import javax.ejb.EJBObject; +import java.rmi.NoSuchObjectException; public class StatefulPojoHandleTests extends BasicStatefulTestClient { @@ -29,7 +28,7 @@ public class StatefulPojoHandleTests extends BasicStatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulPojoHome"); - ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class); + ejbHome = (BasicStatefulHome) obj; ejbObject = ejbHome.createObject("StatefulPojoHandleTests 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/StatefulPojoHomeHandleTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHomeHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHomeHandleTests.java index 098d7f2..85d1e18 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHomeHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHomeHandleTests.java @@ -27,7 +27,7 @@ public class StatefulPojoHomeHandleTests extends BasicStatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulPojoHome"); - 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/StatefulPojoHomeIntfcTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHomeIntfcTests.java index 02a5fad..74da3d3 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHomeIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoHomeIntfcTests.java @@ -29,7 +29,7 @@ public class StatefulPojoHomeIntfcTests extends BasicStatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulPojoHome"); - 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/StatefulPojoRemoteJndiTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoRemoteJndiTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoRemoteJndiTests.java index 549bc50..7a40ba5 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoRemoteJndiTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulPojoRemoteJndiTests.java @@ -29,7 +29,7 @@ public class StatefulPojoRemoteJndiTests extends BasicStatefulTestClient { public void test01_Jndi_lookupHome() { try { final Object obj = initialContext.lookup("client/tests/stateful/BasicStatefulPojoHome"); - ejbHome = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatefulHome.class); + ejbHome = (BasicStatefulHome) 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/stateful/StatefulRemoteIntfcTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteIntfcTests.java index 0ea4914..c97e7d2 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteIntfcTests.java @@ -31,7 +31,7 @@ public class StatefulRemoteIntfcTests 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("Third Bean"); } http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java index f688e37..8256730 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java @@ -16,13 +16,12 @@ */ package org.apache.openejb.test.stateful; +import org.apache.openejb.test.object.ObjectGraph; + import javax.ejb.EJBHome; import javax.ejb.EJBMetaData; import javax.ejb.EJBObject; import javax.ejb.Handle; - -import org.apache.openejb.test.object.ObjectGraph; - import java.rmi.RemoteException; public class StatefulRmiIiopTests extends StatefulTestClient { @@ -37,7 +36,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateful/RMI-over-IIOP/EJBHome"); - ejbHome = (RmiIiopStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, RmiIiopStatefulHome.class); + ejbHome = (RmiIiopStatefulHome) obj; ejbObject = ejbHome.create("RMI-IIOP TestBean"); } @@ -518,10 +517,10 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test35_returnEJBHome() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome expected = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome expected = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", expected); - final EncStatefulHome actual = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(ejbObject.returnEJBHome(expected), EncStatefulHome.class); + final EncStatefulHome actual = (EncStatefulHome) ejbObject.returnEJBHome(expected); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { @@ -531,7 +530,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test36_returnEJBHome2() { try { - final EncStatefulHome actual = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(ejbObject.returnEJBHome(), EncStatefulHome.class); + final EncStatefulHome actual = (EncStatefulHome) ejbObject.returnEJBHome(); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { @@ -542,13 +541,13 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test37_returnNestedEJBHome() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome expected = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome expected = (EncStatefulHome) 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 EncStatefulHome actual = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(graph.getObject(), EncStatefulHome.class); + final EncStatefulHome actual = (EncStatefulHome) graph.getObject(); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { fail("Received Exception " + e.getClass() + " : " + e.getMessage()); @@ -560,7 +559,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { final ObjectGraph graph = ejbObject.returnNestedEJBHome(); assertNotNull("The ObjectGraph is null", graph); - final EncStatefulHome actual = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(graph.getObject(), EncStatefulHome.class); + final EncStatefulHome actual = (EncStatefulHome) graph.getObject(); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { fail("Received Exception " + e.getClass() + " : " + e.getMessage()); @@ -573,7 +572,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { final EncStatefulHome[] expected = new EncStatefulHome[3]; for (int i = 0; i < expected.length; i++) { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - expected[i] = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + expected[i] = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", expected[i]); } @@ -594,13 +593,13 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test40_returnEJBObject() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome home = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome home = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatefulObject expected = home.create("test_40 StatefulBean"); assertNotNull("The EJBObject created is null", expected); - final EncStatefulObject actual = (EncStatefulObject) javax.rmi.PortableRemoteObject.narrow(ejbObject.returnEJBObject(expected), EncStatefulObject.class); + final EncStatefulObject actual = (EncStatefulObject) ejbObject.returnEJBObject(expected); assertNotNull("The EJBObject returned is null", actual); assertTrue("The EJBObejcts are not identical", expected.isIdentical(actual)); @@ -611,7 +610,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test41_returnEJBObject2() { try { - final EncStatefulObject actual = (EncStatefulObject) javax.rmi.PortableRemoteObject.narrow(ejbObject.returnEJBObject(), EncStatefulObject.class); + final EncStatefulObject actual = (EncStatefulObject) ejbObject.returnEJBObject(); assertNotNull("The EJBObject returned is null", actual); } catch (final Exception e) { @@ -622,7 +621,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test42_returnNestedEJBObject() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome home = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome home = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatefulObject expected = home.create("test_42 StatefulBean"); @@ -631,7 +630,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { final ObjectGraph graph = ejbObject.returnObjectGraph(new ObjectGraph(expected)); assertNotNull("The ObjectGraph is null", graph); - final EncStatefulObject actual = (EncStatefulObject) javax.rmi.PortableRemoteObject.narrow(graph.getObject(), EncStatefulObject.class); + final EncStatefulObject actual = (EncStatefulObject) graph.getObject(); assertNotNull("The EJBObject returned is null", actual); assertTrue("The EJBObejcts are not identical", expected.isIdentical(actual)); @@ -645,7 +644,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { final ObjectGraph graph = ejbObject.returnNestedEJBObject(); assertNotNull("The ObjectGraph is null", graph); - final EncStatefulObject actual = (EncStatefulObject) javax.rmi.PortableRemoteObject.narrow(graph.getObject(), EncStatefulObject.class); + final EncStatefulObject actual = (EncStatefulObject) graph.getObject(); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { fail("Received Exception " + e.getClass() + " : " + e.getMessage()); @@ -655,7 +654,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test44_returnEJBObjectArray() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome home = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome home = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatefulObject[] expected = new EncStatefulObject[3]; @@ -684,7 +683,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test45_returnEJBMetaData() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome home = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome home = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EJBMetaData expected = home.getEJBMetaData(); @@ -713,7 +712,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test47_returnNestedEJBMetaData() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome home = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome home = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EJBMetaData expected = home.getEJBMetaData(); @@ -749,7 +748,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome home = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome home = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EJBMetaData[] expected = new EJBMetaData[3]; @@ -780,7 +779,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test50_returnHandle() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome home = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome home = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatefulObject object = home.create("test_50 StatefulBean"); @@ -817,7 +816,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test52_returnNestedHandle() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome home = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome home = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatefulObject object = home.create("test_52 StatefulBean"); @@ -860,7 +859,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient { public void test54_returnHandleArray() { try { final Object obj = initialContext.lookup("client/tests/stateful/EncBean"); - final EncStatefulHome home = (EncStatefulHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatefulHome.class); + final EncStatefulHome home = (EncStatefulHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatefulObject object = home.create("test_54 StatefulBean"); http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulSetterInjectionTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulSetterInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulSetterInjectionTests.java index 870ba4d..3363a15 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulSetterInjectionTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulSetterInjectionTests.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 StatefulSetterInjectionTests extends StatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateful/SetterInjectionStatefulBean"); - 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/StatefulTestClient.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulTestClient.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulTestClient.java index e327773..5a4eb60 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulTestClient.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulTestClient.java @@ -16,14 +16,12 @@ */ package org.apache.openejb.test.stateful; -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; - import org.apache.openejb.test.TestClient; import org.apache.openejb.test.TestManager; +import javax.naming.InitialContext; +import java.util.Properties; + public abstract class StatefulTestClient extends TestClient { public StatefulTestClient(final String name) { http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoHomeIntfcTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoHomeIntfcTests.java index 8cf4872..79e1324 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoHomeIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoHomeIntfcTests.java @@ -16,9 +16,6 @@ */ package org.apache.openejb.test.stateless; -import javax.ejb.EJB; - - /** * [2] Should be run as the second test suite of the BasicStatelessTestClients * http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoLocalHomeIntfcTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoLocalHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoLocalHomeIntfcTests.java index f306f9f..e511980 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoLocalHomeIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessPojoLocalHomeIntfcTests.java @@ -16,9 +16,6 @@ */ package org.apache.openejb.test.stateless; -import javax.ejb.EJB; - - /** * [2] Should be run as the second test suite of the BasicStatelessTestClients * http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java index f202e86..095f2d0 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java @@ -16,8 +16,8 @@ */ package org.apache.openejb.test.stateless; -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 BasicStatelessTestClients @@ -68,7 +68,7 @@ public class BMTStatelessAllowedOperationsTests extends BasicStatelessTestClient protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BeanManagedBasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/MiscEjbTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/MiscEjbTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/MiscEjbTests.java index 35e62ce..ead91d9 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/MiscEjbTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/MiscEjbTests.java @@ -32,7 +32,7 @@ public class MiscEjbTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) obj; ejbObject = ejbHome.createObject(); } @@ -56,7 +56,7 @@ public class MiscEjbTests extends BasicStatelessTestClient { EncStatelessObject ejbObject2 = null; final Object obj = initialContext.lookup(jndiName); - ejbHome2 = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + ejbHome2 = (EncStatelessHome) obj; ejbObject2 = ejbHome2.create(); //System.out.println("_______________________________________________________"); @@ -77,7 +77,7 @@ public class MiscEjbTests extends BasicStatelessTestClient { 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 BasicStatelessTestClient { 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 BasicStatelessTestClient { 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/stateless/StatelessAllowedOperationsTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAllowedOperationsTests.java index 5e117a8..baf8a84 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAllowedOperationsTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAllowedOperationsTests.java @@ -16,10 +16,10 @@ */ package org.apache.openejb.test.stateless; -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 BasicStatelessTestClients @@ -70,7 +70,7 @@ public class StatelessAllowedOperationsTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessAnnotatedFieldInjectionTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAnnotatedFieldInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAnnotatedFieldInjectionTests.java index c595433..9b3da04 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAnnotatedFieldInjectionTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAnnotatedFieldInjectionTests.java @@ -16,9 +16,9 @@ */ package org.apache.openejb.test.stateless; -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 StatelessAnnotatedFieldInjectionTests extends StatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("AnnotatedFieldInjectionStatelessBean"); - ejbHome = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + ejbHome = (EncStatelessHome) 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/stateless/StatelessBeanTxTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java index 73515db..369cca4 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java @@ -16,18 +16,16 @@ */ package org.apache.openejb.test.stateless; -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 StatelessTestClients @@ -64,7 +62,7 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase /*[1] Get bean */ final Object obj = initialContext.lookup(jndiEJBHomeEntry); - ejbHome = (BeanTxStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BeanTxStatelessHome.class); + ejbHome = (BeanTxStatelessHome) 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/stateless/StatelessContainerTxTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessContainerTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessContainerTxTests.java index 27a831c..e3faa00 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessContainerTxTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessContainerTxTests.java @@ -16,15 +16,13 @@ */ package org.apache.openejb.test.stateless; -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 StatelessTestClients @@ -61,7 +59,7 @@ public class StatelessContainerTxTests extends org.apache.openejb.test.NamedTest /*[1] Get bean */ final Object obj = initialContext.lookup(jndiEJBHomeEntry); - ejbHome = (ContainerTxStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, ContainerTxStatelessHome.class); + ejbHome = (ContainerTxStatelessHome) 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/stateless/StatelessContextLookupTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessContextLookupTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessContextLookupTests.java index ed7d539..badf10b 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessContextLookupTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessContextLookupTests.java @@ -16,8 +16,8 @@ */ package org.apache.openejb.test.stateless; -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 EncStatelessTestClients @@ -34,7 +34,7 @@ public class StatelessContextLookupTests extends StatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/ContextLookupStatelessBean"); - ejbHome = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + ejbHome = (EncStatelessHome) 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/stateless/StatelessDefaultInterceptorTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessDefaultInterceptorTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessDefaultInterceptorTests.java index b5bd1d1..4c5277f 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessDefaultInterceptorTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessDefaultInterceptorTests.java @@ -16,9 +16,6 @@ */ package org.apache.openejb.test.stateless; -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/stateless/StatelessEjbHomeTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbHomeTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbHomeTests.java index 9d14848..f43a407 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbHomeTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbHomeTests.java @@ -31,7 +31,7 @@ public class StatelessEjbHomeTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) obj; } //=============================== http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbMetaDataTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbMetaDataTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbMetaDataTests.java index f24ffb9..7c5ff14 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbMetaDataTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbMetaDataTests.java @@ -30,7 +30,7 @@ public class StatelessEjbMetaDataTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessEjbObjectTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java index 17563a8..574cee1 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessEjbObjectTests.java @@ -16,9 +16,8 @@ */ package org.apache.openejb.test.stateless; -import java.rmi.RemoteException; - import javax.ejb.EJBHome; +import java.rmi.RemoteException; /** * [4] Should be run as the fourth test suite of the BasicStatelessTestClients @@ -32,7 +31,7 @@ public class StatelessEjbObjectTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessFieldInjectionTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessFieldInjectionTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessFieldInjectionTests.java index cf4196f..508fe5e 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessFieldInjectionTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessFieldInjectionTests.java @@ -16,11 +16,9 @@ */ package org.apache.openejb.test.stateless; -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 StatelessFieldInjectionTests extends StatefulTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/FieldInjectionStatelessBean"); - ejbHome = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + ejbHome = (EncStatelessHome) 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/stateless/StatelessHandleTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHandleTests.java index d6deb4c..cebec9a 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHandleTests.java @@ -30,7 +30,7 @@ public class StatelessHandleTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessHomeHandleTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHomeHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHomeHandleTests.java index 8032622..b0d2392 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHomeHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHomeHandleTests.java @@ -30,7 +30,7 @@ public class StatelessHomeHandleTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessHomeIntfcTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHomeIntfcTests.java index 7cf474a..1bd111f 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHomeIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessHomeIntfcTests.java @@ -29,7 +29,7 @@ public class StatelessHomeIntfcTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) obj; } //=============================== http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptorTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptorTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptorTests.java index ff790ee..6177fb1 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptorTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptorTests.java @@ -18,7 +18,6 @@ package org.apache.openejb.test.stateless; import java.util.ArrayList; import java.util.Map; -import java.util.Arrays; /** * @version $Rev$ $Date$ @@ -38,8 +37,7 @@ public class StatelessInterceptorTests extends BasicStatelessLocalTestClient { super.setUp(); final Object obj = initialContext.lookup("BasicStatelessInterceptedBusinessRemote"); assertNotNull("The BasicStatelessInterceptedBusinessRemote object is null", obj); - remoteInterceptor = (BasicStatelessInterceptedRemote) javax.rmi.PortableRemoteObject.narrow(obj, - BasicStatelessInterceptedRemote.class); + remoteInterceptor = (BasicStatelessInterceptedRemote) 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/stateless/StatelessJndiEncTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java index c2e6eb1..6084aef 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java @@ -36,7 +36,7 @@ public class StatelessJndiEncTests extends StatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - ejbHome = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + ejbHome = (EncStatelessHome) 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/stateless/StatelessJndiTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiTests.java index 8d653f4..7931454 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiTests.java @@ -39,7 +39,7 @@ public class StatelessJndiTests extends BasicStatelessTestClient { public void test02_Jndi_lookupHome() { try { final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessPojoContextLookupTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoContextLookupTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoContextLookupTests.java index 9957b52..1911c0b 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoContextLookupTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoContextLookupTests.java @@ -16,8 +16,8 @@ */ package org.apache.openejb.test.stateless; -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 EncStatelessTestClients @@ -34,7 +34,7 @@ public class StatelessPojoContextLookupTests extends StatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/ContextLookupStatelessPojoBean"); - ejbHome = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + ejbHome = (EncStatelessHome) 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/stateless/StatelessPojoEjbHomeTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbHomeTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbHomeTests.java index d5db5a1..bc76fa0 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbHomeTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbHomeTests.java @@ -31,7 +31,7 @@ public class StatelessPojoEjbHomeTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessPojoHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) obj; } //=============================== http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalObjectTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalObjectTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalObjectTests.java index 2666f37..d69bb02 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalObjectTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbLocalObjectTests.java @@ -29,8 +29,7 @@ public class StatelessPojoEjbLocalObjectTests extends BasicStatelessLocalTestCli super.setUp(); final Object obj = initialContext .lookup("client/tests/stateless/BasicStatelessPojoHomeLocal"); - ejbLocalHome = (BasicStatelessLocalHome) javax.rmi.PortableRemoteObject - .narrow(obj, BasicStatelessLocalHome.class); + ejbLocalHome = (BasicStatelessLocalHome) 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/stateless/StatelessPojoEjbMetaDataTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbMetaDataTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbMetaDataTests.java index 8d3b3ce..d1a749e 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbMetaDataTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbMetaDataTests.java @@ -27,7 +27,7 @@ public class StatelessPojoEjbMetaDataTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessPojoHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessPojoEjbObjectTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbObjectTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbObjectTests.java index eb002c9..7f1a1eb 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbObjectTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoEjbObjectTests.java @@ -36,7 +36,7 @@ public class StatelessPojoEjbObjectTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessPojoHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessPojoHandleTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHandleTests.java index 42950b4..5f21f66 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHandleTests.java @@ -27,7 +27,7 @@ public class StatelessPojoHandleTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessPojoHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessPojoHomeHandleTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHomeHandleTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHomeHandleTests.java index 86a1efe..1699079 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHomeHandleTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHomeHandleTests.java @@ -27,7 +27,7 @@ public class StatelessPojoHomeHandleTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessPojoHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessPojoHomeIntfcTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHomeIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHomeIntfcTests.java index 854dd5e..0ec9bda 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHomeIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoHomeIntfcTests.java @@ -31,7 +31,7 @@ public class StatelessPojoHomeIntfcTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessPojoHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) obj; } //=============================== http://git-wip-us.apache.org/repos/asf/tomee/blob/09ace086/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteIntrfcTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteIntrfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteIntrfcTests.java index c85cf19..a9a9bfc 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteIntrfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteIntrfcTests.java @@ -25,7 +25,7 @@ public class StatelessPojoRemoteIntrfcTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessPojoHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessPojoRemoteJndiTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteJndiTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteJndiTests.java index 66e4c5b..a4fafac 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteJndiTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessPojoRemoteJndiTests.java @@ -33,7 +33,7 @@ public class StatelessPojoRemoteJndiTests extends BasicStatelessTestClient { public void test02_Jndi_lookupHome() { try { final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessPojoHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessRemoteIntfcTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteIntfcTests.java index c825a14..ed7ecef 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteIntfcTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteIntfcTests.java @@ -29,7 +29,7 @@ public class StatelessRemoteIntfcTests extends BasicStatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/BasicStatelessHome"); - ejbHome = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicStatelessHome.class); + ejbHome = (BasicStatelessHome) 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/stateless/StatelessRmiIiopTests.java ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java index bc3d7e2..df3dfd3 100644 --- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java +++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java @@ -16,15 +16,13 @@ */ package org.apache.openejb.test.stateless; +import org.apache.openejb.test.object.Color; +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 org.apache.openejb.test.object.Color; - import java.rmi.RemoteException; public class StatelessRmiIiopTests extends StatelessTestClient { @@ -39,7 +37,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { protected void setUp() throws Exception { super.setUp(); final Object obj = initialContext.lookup("client/tests/stateless/RMI-over-IIOP/EJBHome"); - ejbHome = (RmiIiopStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, RmiIiopStatelessHome.class); + ejbHome = (RmiIiopStatelessHome) obj; ejbObject = ejbHome.create(); } @@ -519,10 +517,10 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test35_returnEJBHome() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome expected = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome expected = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", expected); - final EncStatelessHome actual = (EncStatelessHome) PortableRemoteObject.narrow(ejbObject.returnEJBHome(expected), EncStatelessHome.class); + final EncStatelessHome actual = (EncStatelessHome) ejbObject.returnEJBHome(expected); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { @@ -532,7 +530,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test36_returnEJBHome2() { try { - final EncStatelessHome actual = (EncStatelessHome) PortableRemoteObject.narrow(ejbObject.returnEJBHome(), EncStatelessHome.class); + final EncStatelessHome actual = (EncStatelessHome) ejbObject.returnEJBHome(); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { @@ -543,13 +541,13 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test37_returnNestedEJBHome() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome expected = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome expected = (EncStatelessHome) 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 EncStatelessHome actual = (EncStatelessHome) PortableRemoteObject.narrow(graph.getObject(), EncStatelessHome.class); + final EncStatelessHome actual = (EncStatelessHome) graph.getObject(); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { fail("Received Exception " + e.getClass() + " : " + e.getMessage()); @@ -561,7 +559,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { final ObjectGraph graph = ejbObject.returnNestedEJBHome(); assertNotNull("The ObjectGraph is null", graph); - final EncStatelessHome actual = (EncStatelessHome) PortableRemoteObject.narrow(graph.getObject(), EncStatelessHome.class); + final EncStatelessHome actual = (EncStatelessHome) graph.getObject(); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { fail("Received Exception " + e.getClass() + " : " + e.getMessage()); @@ -574,7 +572,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { final EncStatelessHome[] expected = new EncStatelessHome[3]; for (int i = 0; i < expected.length; i++) { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - expected[i] = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + expected[i] = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", expected[i]); } @@ -595,13 +593,13 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test40_returnEJBObject() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome home = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome home = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatelessObject expected = home.create(); assertNotNull("The EJBObject created is null", expected); - final EncStatelessObject actual = (EncStatelessObject) PortableRemoteObject.narrow(ejbObject.returnEJBObject(expected), EncStatelessObject.class); + final EncStatelessObject actual = (EncStatelessObject) ejbObject.returnEJBObject(expected); assertNotNull("The EJBObject returned is null", actual); assertTrue("The EJBObejcts are not identical", expected.isIdentical(actual)); @@ -612,7 +610,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test41_returnEJBObject2() { try { - final EncStatelessObject actual = (EncStatelessObject) PortableRemoteObject.narrow(ejbObject.returnEJBObject(), EncStatelessObject.class); + final EncStatelessObject actual = (EncStatelessObject) ejbObject.returnEJBObject(); assertNotNull("The EJBObject returned is null", actual); } catch (final Exception e) { @@ -623,7 +621,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test42_returnNestedEJBObject() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome home = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome home = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatelessObject expected = home.create(); @@ -632,7 +630,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { final ObjectGraph graph = ejbObject.returnObjectGraph(new ObjectGraph(expected)); assertNotNull("The ObjectGraph is null", graph); - final EncStatelessObject actual = (EncStatelessObject) PortableRemoteObject.narrow(graph.getObject(), EncStatelessObject.class); + final EncStatelessObject actual = (EncStatelessObject) graph.getObject(); assertNotNull("The EJBObject returned is null", actual); assertTrue("The EJBObejcts are not identical", expected.isIdentical(actual)); @@ -646,7 +644,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { final ObjectGraph graph = ejbObject.returnNestedEJBObject(); assertNotNull("The ObjectGraph is null", graph); - final EncStatelessObject actual = (EncStatelessObject) PortableRemoteObject.narrow(graph.getObject(), EncStatelessObject.class); + final EncStatelessObject actual = (EncStatelessObject) graph.getObject(); assertNotNull("The EJBHome returned is null", actual); } catch (final Exception e) { fail("Received Exception " + e.getClass() + " : " + e.getMessage()); @@ -656,7 +654,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test44_returnEJBObjectArray() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome home = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome home = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatelessObject[] expected = new EncStatelessObject[3]; @@ -685,7 +683,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test45_returnEJBMetaData() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome home = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome home = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EJBMetaData expected = home.getEJBMetaData(); @@ -714,7 +712,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test47_returnNestedEJBMetaData() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome home = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome home = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EJBMetaData expected = home.getEJBMetaData(); @@ -750,7 +748,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome home = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome home = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EJBMetaData[] expected = new EJBMetaData[3]; @@ -781,7 +779,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test50_returnHandle() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome home = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome home = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatelessObject object = home.create(); @@ -818,7 +816,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test52_returnNestedHandle() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome home = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome home = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatelessObject object = home.create(); @@ -861,7 +859,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { public void test54_returnHandleArray() { try { final Object obj = initialContext.lookup("client/tests/stateless/EncBean"); - final EncStatelessHome home = (EncStatelessHome) javax.rmi.PortableRemoteObject.narrow(obj, EncStatelessHome.class); + final EncStatelessHome home = (EncStatelessHome) obj; assertNotNull("The EJBHome returned from JNDI is null", home); final EncStatelessObject object = home.create(); @@ -956,7 +954,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { try { final Color expected = Color.GREEN; - final Color actual = (Color) PortableRemoteObject.narrow(ejbObject.returnColor(expected), Color.class); + final Color actual = (Color) ejbObject.returnColor(expected); assertNotNull("The Color returned is null", actual); @@ -971,7 +969,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient { try { final Color expected = Color.GREEN; - final Color actual = (Color) PortableRemoteObject.narrow(ejbObject.returnColor(), Color.class); + final Color actual = (Color) ejbObject.returnColor(); assertNotNull("The Color returned is null", actual);
