You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/07 21:07:53 UTC

svn commit: r1608563 [24/38] - in /tomee/tomee/branches/tomee-1.7.x/itests: failover-ejb/src/main/java/org/apache/openejb/itest/failover/ejb/ failover/src/main/java/org/apache/openejb/itest/failover/ failover/src/main/java/org/apache/openejb/server/con...

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexEjbMetaDataTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexEjbMetaDataTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexEjbMetaDataTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexEjbMetaDataTests.java Mon Jul  7 19:07:41 2014
@@ -32,7 +32,7 @@ public class ComplexEjbMetaDataTests ext
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
         ejbHome = (ComplexCmpHome) PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
         ejbMetaData = ejbHome.getEJBMetaData();
     }
@@ -42,39 +42,39 @@ public class ComplexEjbMetaDataTests ext
     //
     public void test01_getEJBHome() {
         try {
-            EJBHome home = ejbMetaData.getEJBHome();
+            final EJBHome home = ejbMetaData.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test02_getHomeInterfaceClass() {
         try {
-            Class clazz = ejbMetaData.getHomeInterfaceClass();
+            final Class clazz = ejbMetaData.getHomeInterfaceClass();
             assertNotNull("The Home Interface class is null", clazz);
             assertEquals(clazz, ComplexCmpHome.class);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test03_getPrimaryKeyClass() {
         try {
-            Class clazz = ejbMetaData.getPrimaryKeyClass();
+            final Class clazz = ejbMetaData.getPrimaryKeyClass();
             assertNotNull("The EJBMetaData is null", clazz);
             assertEquals(clazz, ComplexCmpBeanPk.class);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test04_getRemoteInterfaceClass() {
         try {
-            Class clazz = ejbMetaData.getRemoteInterfaceClass();
+            final Class clazz = ejbMetaData.getRemoteInterfaceClass();
             assertNotNull("The Remote Interface class is null", clazz);
             assertEquals(clazz, ComplexCmpObject.class);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -82,7 +82,7 @@ public class ComplexEjbMetaDataTests ext
     public void test05_isSession() {
         try {
             assertTrue("EJBMetaData says this is a session bean", !ejbMetaData.isSession());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -90,7 +90,7 @@ public class ComplexEjbMetaDataTests ext
     public void test06_isStatelessSession() {
         try {
             assertTrue("EJBMetaData says this is a stateless session bean", !ejbMetaData.isStatelessSession());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexEjbObjectTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexEjbObjectTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexEjbObjectTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexEjbObjectTests.java Mon Jul  7 19:07:41 2014
@@ -33,7 +33,7 @@ public class ComplexEjbObjectTests exten
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
         ejbHome = (ComplexCmpHome) PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
         ejbObject = ejbHome.createObject("Third Bean");
     }
@@ -43,7 +43,7 @@ public class ComplexEjbObjectTests exten
         if (ejbObject != null) {
             try {
                 ejbObject.remove();
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 throw e;
             }
         }
@@ -57,7 +57,7 @@ public class ComplexEjbObjectTests exten
         try {
             ejbHandle = ejbObject.getHandle();
             assertNotNull("The Handle is null", ejbHandle);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -67,7 +67,7 @@ public class ComplexEjbObjectTests exten
             ejbPrimaryKey = ejbObject.getPrimaryKey();
             assertNotNull("The primary key is null", ejbPrimaryKey);
             assertTrue("Expected (ejbPrimaryKey instanceof ComplexCmpBeanPk) but was instanceof " + ejbPrimaryKey.getClass().getName(), ejbPrimaryKey instanceof ComplexCmpBeanPk);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
@@ -76,16 +76,16 @@ public class ComplexEjbObjectTests exten
     public void test03_isIdentical() {
         try {
             assertTrue("The EJBObjects are not equal", ejbObject.isIdentical(ejbObject));
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test04_getEjbHome() {
         try {
-            EJBHome home = ejbObject.getEJBHome();
+            final EJBHome home = ejbObject.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -99,16 +99,16 @@ public class ComplexEjbObjectTests exten
             try {
                 ejbHome.findByPrimaryKey((ComplexCmpBeanPk) ejbPrimaryKey);
                 fail("Entity was not actually removed");
-            } catch (ObjectNotFoundException e) {
+            } catch (final ObjectNotFoundException e) {
             }
 
             // verify the proxy is dead
             try{
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
-            } catch (Exception e){
+            } catch (final Exception e){
             }
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         } finally{
             ejbObject = null;

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHandleTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHandleTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHandleTests.java Mon Jul  7 19:07:41 2014
@@ -32,7 +32,7 @@ public class ComplexHandleTests extends 
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
         ejbHome = (ComplexCmpHome) PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
         ejbObject = ejbHome.createObject("Fifth Bean");
         ejbHandle = ejbObject.getHandle();
@@ -49,11 +49,11 @@ public class ComplexHandleTests extends 
     public void test01_getEJBObject() {
 
         try {
-            EJBObject object = ejbHandle.getEJBObject();
+            final EJBObject object = ejbHandle.getEJBObject();
             assertNotNull("The EJBObject is null", object);
             // Wait until isIdentical is working.
             //assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -69,10 +69,10 @@ public class ComplexHandleTests extends 
             try {
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue("Calling business method after removing the EJBObject does not throw an exception", false);
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 assertTrue(true);
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         } finally {
             ejbObject = null;

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHomeHandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHomeHandleTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHomeHandleTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHomeHandleTests.java Mon Jul  7 19:07:41 2014
@@ -32,7 +32,7 @@ public class ComplexHomeHandleTests exte
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
         ejbHome = (ComplexCmpHome) PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
         ejbHomeHandle = ejbHome.getHomeHandle();
     }
@@ -42,9 +42,9 @@ public class ComplexHomeHandleTests exte
     //
     public void test01_getEJBHome() {
         try {
-            EJBHome home = ejbHomeHandle.getEJBHome();
+            final EJBHome home = ejbHomeHandle.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHomeIntfcTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHomeIntfcTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHomeIntfcTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexHomeIntfcTests.java Mon Jul  7 19:07:41 2014
@@ -35,7 +35,7 @@ public class ComplexHomeIntfcTests exten
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
         ejbHome = (ComplexCmpHome) PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
     }
 
@@ -46,7 +46,7 @@ public class ComplexHomeIntfcTests exten
         try {
             ejbObject = ejbHome.createObject("First Bean");
             assertNotNull("The EJBObject is null", ejbObject);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -57,14 +57,14 @@ public class ComplexHomeIntfcTests exten
             assertTrue("Expected (ejbPrimaryKey instanceof ComplexCmpBeanPk) but was instanceof " + ejbPrimaryKey.getClass().getName(), ejbPrimaryKey instanceof ComplexCmpBeanPk);
             ejbObject = ejbHome.findByPrimaryKey((ComplexCmpBeanPk) ejbPrimaryKey);
             assertNotNull("The EJBObject is null", ejbObject);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test03_findByLastName() {
-        Set<ComplexCmpBeanPk> keys = new HashSet<ComplexCmpBeanPk>();
+        final Set<ComplexCmpBeanPk> keys = new HashSet<ComplexCmpBeanPk>();
         try {
             ejbObject = ejbHome.createObject("David Blevins");
             ejbPrimaryKey = ejbObject.getPrimaryKey();
@@ -80,27 +80,27 @@ public class ComplexHomeIntfcTests exten
             ejbPrimaryKey = ejbObject.getPrimaryKey();
             assertTrue("Expected (ejbPrimaryKey instanceof ComplexCmpBeanPk) but was instanceof " + ejbPrimaryKey.getClass().getName(), ejbPrimaryKey instanceof ComplexCmpBeanPk);
             keys.add((ComplexCmpBeanPk) ejbObject.getPrimaryKey());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received exception while preparing the test: " + e.getClass() + " : " + e.getMessage());
         }
 
         try {
-            Collection objects = ejbHome.findByLastName("Blevins");
-            Set<ComplexCmpBeanPk> foundKeys = new HashSet<ComplexCmpBeanPk>();
+            final Collection objects = ejbHome.findByLastName("Blevins");
+            final Set<ComplexCmpBeanPk> foundKeys = new HashSet<ComplexCmpBeanPk>();
             assertNotNull("The Collection is null", objects);
             assertEquals("The Collection is not the right size.", keys.size(), objects.size());
-            for (Object object : objects) {
+            for (final Object object : objects) {
                 ejbObject = (ComplexCmpObject) PortableRemoteObject.narrow(object, ComplexCmpObject.class);
 
                 // This could be problematic, it assumes the order of the collection.
-                ComplexCmpBeanPk foundKey = (ComplexCmpBeanPk) ejbObject.getPrimaryKey();
+                final ComplexCmpBeanPk foundKey = (ComplexCmpBeanPk) ejbObject.getPrimaryKey();
                 assertTrue("Extra ejb found " + ejbObject.getPrimaryKey(), keys.contains(foundKey));
                 foundKeys.add(foundKey);
             }
 
             keys.removeAll(foundKeys);
             assertEquals("Some keys were not found", Collections.EMPTY_SET, keys);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
@@ -108,10 +108,10 @@ public class ComplexHomeIntfcTests exten
 
     public void test04_homeMethod() {
         try {
-            int expected = 8;
-            int actual = ejbHome.sum(5, 3);
+            final int expected = 8;
+            final int actual = ejbHome.sum(5, 3);
             assertEquals("home method returned wrong result", expected, actual);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexRemoteIntfcTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexRemoteIntfcTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexRemoteIntfcTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/ComplexRemoteIntfcTests.java Mon Jul  7 19:07:41 2014
@@ -31,7 +31,7 @@ public class ComplexRemoteIntfcTests ext
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/ComplexCmpHome");
         ejbHome = (ComplexCmpHome) PortableRemoteObject.narrow(obj, ComplexCmpHome.class);
         ejbObject = ejbHome.createObject("Forth Bean");
     }
@@ -41,10 +41,10 @@ public class ComplexRemoteIntfcTests ext
     //
     public void test01_businessMethod() {
         try {
-            String expected = "Success";
-            String actual = ejbObject.businessMethod("sseccuS");
+            final String expected = "Success";
+            final String actual = ejbObject.businessMethod("sseccuS");
             assertEquals(expected, actual);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -56,10 +56,10 @@ public class ComplexRemoteIntfcTests ext
     public void test02_throwApplicationException() {
         try {
             ejbObject.throwApplicationException();
-        } catch (org.apache.openejb.test.ApplicationException e) {
+        } catch (final org.apache.openejb.test.ApplicationException e) {
             //Good.  This is the correct behaviour
             return;
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
         fail("An ApplicationException should have been thrown.");
@@ -71,10 +71,10 @@ public class ComplexRemoteIntfcTests ext
      */
     public void test03_invokeAfterApplicationException() {
         try {
-            String expected = "Success";
-            String actual = ejbObject.businessMethod("sseccuS");
+            final String expected = "Success";
+            final String actual = ejbObject.businessMethod("sseccuS");
             assertEquals(expected, actual);
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -82,13 +82,13 @@ public class ComplexRemoteIntfcTests ext
     public void test04_throwSystemException() {
         try {
             ejbObject.throwSystemException_NullPointer();
-        } catch (java.rmi.RemoteException e) {
+        } catch (final java.rmi.RemoteException e) {
             //Good, so far.
-            Throwable n = e.detail;
+            final Throwable n = e.detail;
             assertNotNull("Nested exception should not be is null", n);
             assertTrue("Nested exception should be an instance of NullPointerException, but exception is " + n.getClass().getName(), (n instanceof NullPointerException));
             return;
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
         fail("A NullPointerException should have been thrown.");
@@ -104,9 +104,9 @@ public class ComplexRemoteIntfcTests ext
         try {
             ejbObject.businessMethod("This refernce is invalid");
             fail("A java.rmi.NoSuchObjectException should have been thrown.");
-        } catch (java.rmi.NoSuchObjectException e) {
+        } catch (final java.rmi.NoSuchObjectException e) {
             // Good.
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpTestClient.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpTestClient.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpTestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpTestClient.java Mon Jul  7 19:07:41 2014
@@ -21,7 +21,7 @@ public abstract class UnknownCmpTestClie
     protected UnknownCmpHome ejbHome;
     protected UnknownCmpObject ejbObject;
 
-    public UnknownCmpTestClient(String name) {
+    public UnknownCmpTestClient(final String name) {
         super(name);
     }
 }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbHomeTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbHomeTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbHomeTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbHomeTests.java Mon Jul  7 19:07:41 2014
@@ -33,7 +33,7 @@ public class UnknownEjbHomeTests extends
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
         ejbHome = (UnknownCmpHome) PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
         ejbObject = ejbHome.createObject("Second Bean");
         ejbPrimaryKey = ejbObject.getPrimaryKey();
@@ -44,9 +44,9 @@ public class UnknownEjbHomeTests extends
     //
     public void test01_getEJBMetaData() {
         try {
-            EJBMetaData ejbMetaData = ejbHome.getEJBMetaData();
+            final EJBMetaData ejbMetaData = ejbHome.getEJBMetaData();
             assertNotNull("The EJBMetaData is null", ejbMetaData);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -55,7 +55,7 @@ public class UnknownEjbHomeTests extends
         try {
             ejbHomeHandle = ejbHome.getHomeHandle();
             assertNotNull("The HomeHandle is null", ejbHomeHandle);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -69,20 +69,20 @@ public class UnknownEjbHomeTests extends
             try {
                 ejbHome.findByPrimaryKey(ejbPrimaryKey);
                 fail("Entity was not actually removed");
-            } catch (ObjectNotFoundException e) {
+            } catch (final ObjectNotFoundException e) {
             }
 
             // verify the proxy is dead
             try{
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
-            } catch (Exception e){
+            } catch (final Exception e){
             }
 
             // create a new ejb for the next test
             ejbObject = ejbHome.createObject("Second Bean");
             ejbPrimaryKey = ejbObject.getPrimaryKey();
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -96,20 +96,20 @@ public class UnknownEjbHomeTests extends
             try {
                 ejbHome.findByPrimaryKey(ejbPrimaryKey);
                 fail("Entity was not actually removed");
-            } catch (ObjectNotFoundException e) {
+            } catch (final ObjectNotFoundException e) {
             }
 
             // verify the proxy is dead
             try{
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
-            } catch (Exception e){
+            } catch (final Exception e){
             }
 
             // create a new ejb for the next test
             ejbObject = ejbHome.createObject("Second Bean");
             ejbPrimaryKey = ejbObject.getPrimaryKey();
-        } catch (Exception e){
+        } catch (final Exception e){
             e.printStackTrace();
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
@@ -118,7 +118,7 @@ public class UnknownEjbHomeTests extends
     public void test05_ejbHomeMethod() {
         try {
             assertEquals(8+9, ejbHome.sum(8, 9));
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbMetaDataTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbMetaDataTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbMetaDataTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbMetaDataTests.java Mon Jul  7 19:07:41 2014
@@ -32,7 +32,7 @@ public class UnknownEjbMetaDataTests ext
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
         ejbHome = (UnknownCmpHome) PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
         ejbMetaData = ejbHome.getEJBMetaData();
     }
@@ -42,39 +42,39 @@ public class UnknownEjbMetaDataTests ext
     //
     public void test01_getEJBHome() {
         try {
-            EJBHome home = ejbMetaData.getEJBHome();
+            final EJBHome home = ejbMetaData.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test02_getHomeInterfaceClass() {
         try {
-            Class clazz = ejbMetaData.getHomeInterfaceClass();
+            final Class clazz = ejbMetaData.getHomeInterfaceClass();
             assertNotNull("The Home Interface class is null", clazz);
             assertEquals(clazz, UnknownCmpHome.class);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test03_getPrimaryKeyClass() {
         try {
-            Class clazz = ejbMetaData.getPrimaryKeyClass();
+            final Class clazz = ejbMetaData.getPrimaryKeyClass();
             assertNotNull("The EJBMetaData is null", clazz);
             assertEquals(clazz, Object.class);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test04_getRemoteInterfaceClass() {
         try {
-            Class clazz = ejbMetaData.getRemoteInterfaceClass();
+            final Class clazz = ejbMetaData.getRemoteInterfaceClass();
             assertNotNull("The Remote Interface class is null", clazz);
             assertEquals(clazz, UnknownCmpObject.class);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -82,7 +82,7 @@ public class UnknownEjbMetaDataTests ext
     public void test05_isSession() {
         try {
             assertTrue("EJBMetaData says this is a session bean", !ejbMetaData.isSession());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -90,7 +90,7 @@ public class UnknownEjbMetaDataTests ext
     public void test06_isStatelessSession() {
         try {
             assertTrue("EJBMetaData says this is a stateless session bean", !ejbMetaData.isStatelessSession());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbObjectTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbObjectTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbObjectTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownEjbObjectTests.java Mon Jul  7 19:07:41 2014
@@ -33,7 +33,7 @@ public class UnknownEjbObjectTests exten
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
         ejbHome = (UnknownCmpHome) PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
         ejbObject = ejbHome.createObject("Third Bean");
     }
@@ -43,7 +43,7 @@ public class UnknownEjbObjectTests exten
         if (ejbObject != null) {
             try {
                 ejbObject.remove();
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 throw e;
             }
         }
@@ -57,7 +57,7 @@ public class UnknownEjbObjectTests exten
         try {
             ejbHandle = ejbObject.getHandle();
             assertNotNull("The Handle is null", ejbHandle);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -66,7 +66,7 @@ public class UnknownEjbObjectTests exten
         try {
             ejbPrimaryKey = ejbObject.getPrimaryKey();
             assertNotNull("The primary key is null", ejbPrimaryKey);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
@@ -75,16 +75,16 @@ public class UnknownEjbObjectTests exten
     public void test03_isIdentical() {
         try {
             assertTrue("The EJBObjects are not equal", ejbObject.isIdentical(ejbObject));
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test04_getEjbHome() {
         try {
-            EJBHome home = ejbObject.getEJBHome();
+            final EJBHome home = ejbObject.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -98,16 +98,16 @@ public class UnknownEjbObjectTests exten
             try {
                 ejbHome.findByPrimaryKey(ejbPrimaryKey);
                 fail("Entity was not actually removed");
-            } catch (ObjectNotFoundException e) {
+            } catch (final ObjectNotFoundException e) {
             }
 
             // verify the proxy is dead
             try{
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
-            } catch (Exception e){
+            } catch (final Exception e){
             }
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         } finally{
             ejbObject = null;

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHandleTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHandleTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHandleTests.java Mon Jul  7 19:07:41 2014
@@ -32,7 +32,7 @@ public class UnknownHandleTests extends 
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
         ejbHome = (UnknownCmpHome) PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
         ejbObject = ejbHome.createObject("Fifth Bean");
         ejbHandle = ejbObject.getHandle();
@@ -49,11 +49,11 @@ public class UnknownHandleTests extends 
     public void test01_getEJBObject() {
 
         try {
-            EJBObject object = ejbHandle.getEJBObject();
+            final EJBObject object = ejbHandle.getEJBObject();
             assertNotNull("The EJBObject is null", object);
             // Wait until isIdentical is working.
             //assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -69,10 +69,10 @@ public class UnknownHandleTests extends 
             try {
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue("Calling business method after removing the EJBObject does not throw an exception", false);
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 assertTrue(true);
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         } finally {
             ejbObject = null;

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHomeHandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHomeHandleTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHomeHandleTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHomeHandleTests.java Mon Jul  7 19:07:41 2014
@@ -32,7 +32,7 @@ public class UnknownHomeHandleTests exte
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
         ejbHome = (UnknownCmpHome) PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
         ejbHomeHandle = ejbHome.getHomeHandle();
     }
@@ -42,9 +42,9 @@ public class UnknownHomeHandleTests exte
     //
     public void test01_getEJBHome() {
         try {
-            EJBHome home = ejbHomeHandle.getEJBHome();
+            final EJBHome home = ejbHomeHandle.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHomeIntfcTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHomeIntfcTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHomeIntfcTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownHomeIntfcTests.java Mon Jul  7 19:07:41 2014
@@ -35,7 +35,7 @@ public class UnknownHomeIntfcTests exten
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
         ejbHome = (UnknownCmpHome) PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
     }
 
@@ -46,7 +46,7 @@ public class UnknownHomeIntfcTests exten
         try {
             ejbObject = ejbHome.createObject("First Bean");
             assertNotNull("The EJBObject is null", ejbObject);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -57,14 +57,14 @@ public class UnknownHomeIntfcTests exten
             assertNotNull("ejbPrimaryKey is null", ejbPrimaryKey);
             ejbObject = ejbHome.findByPrimaryKey(ejbPrimaryKey);
             assertNotNull("The EJBObject is null", ejbObject);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test03_findByLastName() {
-        Set<Object> keys = new HashSet<Object>();
+        final Set<Object> keys = new HashSet<Object>();
         try {
             ejbObject = ejbHome.createObject("David Blevins");
             ejbPrimaryKey = ejbObject.getPrimaryKey();
@@ -80,27 +80,27 @@ public class UnknownHomeIntfcTests exten
             ejbPrimaryKey = ejbObject.getPrimaryKey();
             assertNotNull("ejbPrimaryKey is null", ejbPrimaryKey);
             keys.add(ejbPrimaryKey);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received exception while preparing the test: " + e.getClass() + " : " + e.getMessage());
         }
 
         try {
-            Collection objects = ejbHome.findByLastName("Blevins");
-            Set<Object> foundKeys = new HashSet<Object>();
+            final Collection objects = ejbHome.findByLastName("Blevins");
+            final Set<Object> foundKeys = new HashSet<Object>();
             assertNotNull("The Collection is null", objects);
             assertEquals("The Collection is not the right size.", keys.size(), objects.size());
-            for (Object object : objects) {
+            for (final Object object : objects) {
                 ejbObject = (UnknownCmpObject) PortableRemoteObject.narrow(object, UnknownCmpObject.class);
 
                 // This could be problematic, it assumes the order of the collection.
-                Object foundKey = ejbObject.getPrimaryKey();
+                final Object foundKey = ejbObject.getPrimaryKey();
                 assertTrue("Extra ejb found " + ejbObject.getPrimaryKey(), keys.contains(foundKey));
                 foundKeys.add(foundKey);
             }
 
             keys.removeAll(foundKeys);
             assertEquals("Some keys were not found", Collections.EMPTY_SET, keys);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
@@ -108,10 +108,10 @@ public class UnknownHomeIntfcTests exten
 
     public void test04_homeMethod() {
         try {
-            int expected = 8;
-            int actual = ejbHome.sum(5, 3);
+            final int expected = 8;
+            final int actual = ejbHome.sum(5, 3);
             assertEquals("home method returned wrong result", expected, actual);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownRemoteIntfcTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownRemoteIntfcTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownRemoteIntfcTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/UnknownRemoteIntfcTests.java Mon Jul  7 19:07:41 2014
@@ -31,7 +31,7 @@ public class UnknownRemoteIntfcTests ext
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp/UnknownCmpHome");
         ejbHome = (UnknownCmpHome) PortableRemoteObject.narrow(obj, UnknownCmpHome.class);
         ejbObject = ejbHome.createObject("Forth Bean");
     }
@@ -41,10 +41,10 @@ public class UnknownRemoteIntfcTests ext
     //
     public void test01_businessMethod() {
         try {
-            String expected = "Success";
-            String actual = ejbObject.businessMethod("sseccuS");
+            final String expected = "Success";
+            final String actual = ejbObject.businessMethod("sseccuS");
             assertEquals(expected, actual);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -56,10 +56,10 @@ public class UnknownRemoteIntfcTests ext
     public void test02_throwApplicationException() {
         try {
             ejbObject.throwApplicationException();
-        } catch (org.apache.openejb.test.ApplicationException e) {
+        } catch (final org.apache.openejb.test.ApplicationException e) {
             //Good.  This is the correct behaviour
             return;
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
         fail("An ApplicationException should have been thrown.");
@@ -71,10 +71,10 @@ public class UnknownRemoteIntfcTests ext
      */
     public void test03_invokeAfterApplicationException() {
         try {
-            String expected = "Success";
-            String actual = ejbObject.businessMethod("sseccuS");
+            final String expected = "Success";
+            final String actual = ejbObject.businessMethod("sseccuS");
             assertEquals(expected, actual);
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -82,13 +82,13 @@ public class UnknownRemoteIntfcTests ext
     public void test04_throwSystemException() {
         try {
             ejbObject.throwSystemException_NullPointer();
-        } catch (java.rmi.RemoteException e) {
+        } catch (final java.rmi.RemoteException e) {
             //Good, so far.
-            Throwable n = e.detail;
+            final Throwable n = e.detail;
             assertNotNull("Nested exception should not be is null", n);
             assertTrue("Nested exception should be an instance of NullPointerException, but exception is " + n.getClass().getName(), (n instanceof NullPointerException));
             return;
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
         fail("A NullPointerException should have been thrown.");
@@ -104,9 +104,9 @@ public class UnknownRemoteIntfcTests ext
         try {
             ejbObject.businessMethod("This refernce is invalid");
             fail("A java.rmi.NoSuchObjectException should have been thrown.");
-        } catch (java.rmi.NoSuchObjectException e) {
+        } catch (final java.rmi.NoSuchObjectException e) {
             // Good.
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/BasicCmp2TestClient.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/BasicCmp2TestClient.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/BasicCmp2TestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/BasicCmp2TestClient.java Mon Jul  7 19:07:41 2014
@@ -23,7 +23,7 @@ public abstract class BasicCmp2TestClien
     protected BasicCmpHome ejbHome;
     protected BasicCmpObject ejbObject;
 
-    public BasicCmp2TestClient(String name) {
+    public BasicCmp2TestClient(final String name) {
         super(name);
     }
 }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2AllowedOperationsTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2AllowedOperationsTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2AllowedOperationsTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2AllowedOperationsTests.java Mon Jul  7 19:07:41 2014
@@ -141,7 +141,7 @@ public class Cmp2AllowedOperationsTests 
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp2/allowed_operations/EntityHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp2/allowed_operations/EntityHome");
         ejbHome = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicCmpHome.class);
         ejbObject = ejbHome.createObject("Fourth Bean");
         ejbHandle = ejbObject.getHandle();
@@ -161,7 +161,7 @@ public class Cmp2AllowedOperationsTests 
     protected void tearDown() throws Exception {
         try {
             ejbObject.remove();
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             // todo this throws an exception for an unrelated reason....
         }
         super.tearDown();
@@ -204,17 +204,17 @@ public class Cmp2AllowedOperationsTests 
     public void test01_setEntityContext() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("setEntityContext");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("setEntityContext");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -234,17 +234,17 @@ public class Cmp2AllowedOperationsTests 
         try {
 
             /* TO DO:  This test needs unique functionality to work */
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("unsetEntityContext");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("unsetEntityContext");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -269,7 +269,7 @@ public class Cmp2AllowedOperationsTests 
     public void test03_ejbCreate() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.Context_getCallerPrincipal);
             policy.allow(OperationsPolicy.Context_isCallerInRole);
@@ -277,13 +277,13 @@ public class Cmp2AllowedOperationsTests 
 //        policy.allow( OperationsPolicy.Context_setRollbackOnly );
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbCreate");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbCreate");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -310,7 +310,7 @@ public class Cmp2AllowedOperationsTests 
     public void test04_ejbPostCreate() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.Context_getCallerPrincipal);
             policy.allow(OperationsPolicy.Context_getRollbackOnly);
@@ -320,13 +320,13 @@ public class Cmp2AllowedOperationsTests 
             policy.allow(OperationsPolicy.Context_getPrimaryKey);
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbPostCreate");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbPostCreate");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -353,7 +353,7 @@ public class Cmp2AllowedOperationsTests 
     public void test05_ejbRemove() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.Context_getCallerPrincipal);
             policy.allow(OperationsPolicy.Context_getRollbackOnly);
@@ -363,13 +363,13 @@ public class Cmp2AllowedOperationsTests 
             policy.allow(OperationsPolicy.Context_getPrimaryKey);
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbRemove");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbRemove");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -394,7 +394,7 @@ public class Cmp2AllowedOperationsTests 
     public void test08_ejbHome() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.Context_getCallerPrincipal);
             policy.allow(OperationsPolicy.Context_getRollbackOnly);
@@ -402,13 +402,13 @@ public class Cmp2AllowedOperationsTests 
 //        policy.allow( OperationsPolicy.Context_setRollbackOnly );
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbHome");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbHome");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -429,19 +429,19 @@ public class Cmp2AllowedOperationsTests 
     public void test10_ejbActivate() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.Context_getEJBObject);
             policy.allow(OperationsPolicy.Context_getPrimaryKey);
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbActivate");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbActivate");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -462,19 +462,19 @@ public class Cmp2AllowedOperationsTests 
     public void TODO_test11_ejbPassivate() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.Context_getEJBObject);
             policy.allow(OperationsPolicy.Context_getPrimaryKey);
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbPassivate");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbPassivate");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -501,7 +501,7 @@ public class Cmp2AllowedOperationsTests 
     public void test12_ejbLoad() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.Context_getCallerPrincipal);
             policy.allow(OperationsPolicy.Context_getRollbackOnly);
@@ -511,13 +511,13 @@ public class Cmp2AllowedOperationsTests 
             policy.allow(OperationsPolicy.Context_getPrimaryKey);
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbLoad");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbLoad");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -544,7 +544,7 @@ public class Cmp2AllowedOperationsTests 
     public void test13_ejbStore() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.Context_getCallerPrincipal);
             policy.allow(OperationsPolicy.Context_getRollbackOnly);
@@ -554,13 +554,13 @@ public class Cmp2AllowedOperationsTests 
             policy.allow(OperationsPolicy.Context_getPrimaryKey);
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbStore");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbStore");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -587,7 +587,7 @@ public class Cmp2AllowedOperationsTests 
     public void test14_businessMethod() {
         try {
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow(OperationsPolicy.Context_getEJBHome);
             policy.allow(OperationsPolicy.Context_getCallerPrincipal);
             policy.allow(OperationsPolicy.Context_getRollbackOnly);
@@ -597,13 +597,13 @@ public class Cmp2AllowedOperationsTests 
             policy.allow(OperationsPolicy.Context_getPrimaryKey);
             policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("businessMethod");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("businessMethod");
 
             assertNotNull("The OperationsPolicy is null", actual);
             assertEquals(expected, actual);
 
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbHomeTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbHomeTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbHomeTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbHomeTests.java Mon Jul  7 19:07:41 2014
@@ -32,7 +32,7 @@ public class Cmp2EjbHomeTests extends Ba
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
         ejbHome = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicCmpHome.class);
         ejbObject = ejbHome.createObject("Second Bean");
         ejbPrimaryKey = ejbObject.getPrimaryKey();
@@ -43,9 +43,9 @@ public class Cmp2EjbHomeTests extends Ba
     //
     public void test01_getEJBMetaData() {
         try {
-            EJBMetaData ejbMetaData = ejbHome.getEJBMetaData();
+            final EJBMetaData ejbMetaData = ejbHome.getEJBMetaData();
             assertNotNull("The EJBMetaData is null", ejbMetaData);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -54,7 +54,7 @@ public class Cmp2EjbHomeTests extends Ba
         try {
             ejbHomeHandle = ejbHome.getHomeHandle();
             assertNotNull("The HomeHandle is null", ejbHomeHandle);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -68,20 +68,20 @@ public class Cmp2EjbHomeTests extends Ba
             try {
                 ejbHome.findByPrimaryKey((Integer) ejbPrimaryKey);
                 fail("Entity was not actually removed");
-            } catch (ObjectNotFoundException e) {
+            } catch (final ObjectNotFoundException e) {
             }
 
             // verify the proxy is dead
             try{
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
-            } catch (Exception e){
+            } catch (final Exception e){
             }
 
             // create a new ejb for the next test
             ejbObject = ejbHome.createObject("Second Bean");
             ejbPrimaryKey = ejbObject.getPrimaryKey();
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -95,20 +95,20 @@ public class Cmp2EjbHomeTests extends Ba
             try {
                 ejbHome.findByPrimaryKey((Integer) ejbPrimaryKey);
                 fail("Entity was not actually removed");
-            } catch (ObjectNotFoundException e) {
+            } catch (final ObjectNotFoundException e) {
             }
 
             // verify the proxy is dead
             try{
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
-            } catch (Exception e){
+            } catch (final Exception e){
             }
 
             // create a new ejb for the next test
             ejbObject = ejbHome.createObject("Second Bean");
             ejbPrimaryKey = ejbObject.getPrimaryKey();
-        } catch (Exception e){
+        } catch (final Exception e){
             e.printStackTrace();
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
@@ -117,7 +117,7 @@ public class Cmp2EjbHomeTests extends Ba
     public void test05_ejbHomeMethod() {
         try {
             assertEquals(8+9, ejbHome.sum(8, 9));
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
@@ -126,7 +126,7 @@ public class Cmp2EjbHomeTests extends Ba
     public void test06_voidEjbSelect() {
         try {
             ejbHome.voidSelect();
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbMetaDataTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbMetaDataTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbMetaDataTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbMetaDataTests.java Mon Jul  7 19:07:41 2014
@@ -32,7 +32,7 @@ public class Cmp2EjbMetaDataTests extend
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
         ejbHome = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicCmpHome.class);
         ejbMetaData = ejbHome.getEJBMetaData();
     }
@@ -42,39 +42,39 @@ public class Cmp2EjbMetaDataTests extend
     //
     public void test01_getEJBHome() {
         try {
-            EJBHome home = ejbMetaData.getEJBHome();
+            final EJBHome home = ejbMetaData.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test02_getHomeInterfaceClass() {
         try {
-            Class clazz = ejbMetaData.getHomeInterfaceClass();
+            final Class clazz = ejbMetaData.getHomeInterfaceClass();
             assertNotNull("The Home Interface class is null", clazz);
             assertEquals(clazz, BasicCmpHome.class);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test03_getPrimaryKeyClass() {
         try {
-            Class clazz = ejbMetaData.getPrimaryKeyClass();
+            final Class clazz = ejbMetaData.getPrimaryKeyClass();
             assertNotNull("The EJBMetaData is null", clazz);
             assertEquals(clazz, Integer.class);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test04_getRemoteInterfaceClass() {
         try {
-            Class clazz = ejbMetaData.getRemoteInterfaceClass();
+            final Class clazz = ejbMetaData.getRemoteInterfaceClass();
             assertNotNull("The Remote Interface class is null", clazz);
             assertEquals(clazz, BasicCmpObject.class);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -82,7 +82,7 @@ public class Cmp2EjbMetaDataTests extend
     public void test05_isSession() {
         try {
             assertTrue("EJBMetaData says this is a session bean", !ejbMetaData.isSession());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -90,7 +90,7 @@ public class Cmp2EjbMetaDataTests extend
     public void test06_isStatelessSession() {
         try {
             assertTrue("EJBMetaData says this is a stateless session bean", !ejbMetaData.isStatelessSession());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbObjectTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbObjectTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbObjectTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2EjbObjectTests.java Mon Jul  7 19:07:41 2014
@@ -32,7 +32,7 @@ public class Cmp2EjbObjectTests extends 
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
         ejbHome = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicCmpHome.class);
         ejbObject = ejbHome.createObject("Third Bean");
     }
@@ -41,7 +41,7 @@ public class Cmp2EjbObjectTests extends 
         if (ejbObject != null) {// set to null by test05_remove() method
             try {
                 ejbObject.remove();
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 throw e;
             }
         }
@@ -55,7 +55,7 @@ public class Cmp2EjbObjectTests extends 
         try {
             ejbHandle = ejbObject.getHandle();
             assertNotNull("The Handle is null", ejbHandle);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -64,7 +64,7 @@ public class Cmp2EjbObjectTests extends 
         try {
             ejbPrimaryKey = ejbObject.getPrimaryKey();
             assertNotNull("The primary key is null", ejbPrimaryKey);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
@@ -73,16 +73,16 @@ public class Cmp2EjbObjectTests extends 
     public void test03_isIdentical() {
         try {
             assertTrue("The EJBObjects are not equal", ejbObject.isIdentical(ejbObject));
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void test04_getEjbHome() {
         try {
-            EJBHome home = ejbObject.getEJBHome();
+            final EJBHome home = ejbObject.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -96,16 +96,16 @@ public class Cmp2EjbObjectTests extends 
             try {
                 ejbHome.findByPrimaryKey((Integer) ejbPrimaryKey);
                 fail("Entity was not actually removed");
-            } catch (ObjectNotFoundException e) {
+            } catch (final ObjectNotFoundException e) {
             }
 
             // verify the proxy is dead
             try{
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue( "Calling business method after removing the EJBObject does not throw an exception", false );
-            } catch (Exception e){
+            } catch (final Exception e){
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         } finally {
             ejbObject = null;

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HandleTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HandleTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HandleTests.java Mon Jul  7 19:07:41 2014
@@ -37,7 +37,7 @@ public class Cmp2HandleTests extends Bas
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
         ejbHome = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicCmpHome.class);
         ejbObject = ejbHome.createObject("Fifth Bean");
         ejbHandle = ejbObject.getHandle();
@@ -56,43 +56,43 @@ public class Cmp2HandleTests extends Bas
     public void test01_getEJBObject() {
 
         try {
-            EJBObject object = ejbHandle.getEJBObject();
+            final EJBObject object = ejbHandle.getEJBObject();
             assertNotNull("The EJBObject is null", object);
             // Wait until isIdentical is working.
             //assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void Xtest02_copyHandleByMarshalledObject() {
         try {
-            MarshalledObject obj = new MarshalledObject(ejbHandle);
-            Handle copy = (Handle) obj.get();
+            final MarshalledObject obj = new MarshalledObject(ejbHandle);
+            final Handle copy = (Handle) obj.get();
 
-            EJBObject object = copy.getEJBObject();
+            final EJBObject object = copy.getEJBObject();
             assertNotNull("The EJBObject is null", object);
             assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void Xtest03_copyHandleBySerialize() {
         try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            ObjectOutputStream oos = new ObjectOutputStream(baos);
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            final ObjectOutputStream oos = new ObjectOutputStream(baos);
             oos.writeObject(ejbHandle);
             oos.flush();
             oos.close();
-            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-            ObjectInputStream ois = new ObjectInputStream(bais);
-            Handle copy = (Handle) ois.readObject();
+            final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+            final ObjectInputStream ois = new ObjectInputStream(bais);
+            final Handle copy = (Handle) ois.readObject();
 
-            EJBObject object = copy.getEJBObject();
+            final EJBObject object = copy.getEJBObject();
             assertNotNull("The EJBObject is null", object);
             assertTrue("EJBObjects are not identical", object.isIdentical(ejbObject));
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
@@ -108,11 +108,11 @@ public class Cmp2HandleTests extends Bas
             try {
                 ejbObject.businessMethod("Should throw an exception");
                 assertTrue("Calling business method after removing the EJBObject does not throw an exception", false);
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 assertTrue(true);
                 return;
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         } finally {
             ejbObject = null;

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HomeHandleTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HomeHandleTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HomeHandleTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HomeHandleTests.java Mon Jul  7 19:07:41 2014
@@ -37,7 +37,7 @@ public class Cmp2HomeHandleTests extends
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
         ejbHome = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicCmpHome.class);
         ejbHomeHandle = ejbHome.getHomeHandle();
     }
@@ -47,41 +47,41 @@ public class Cmp2HomeHandleTests extends
     //
     public void test01_getEJBHome() {
         try {
-            EJBHome home = ejbHomeHandle.getEJBHome();
+            final EJBHome home = ejbHomeHandle.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void Xtest02_copyHandleByMarshalledObject() {
         try {
-            MarshalledObject obj = new MarshalledObject(ejbHomeHandle);
-            HomeHandle copy = (HomeHandle) obj.get();
+            final MarshalledObject obj = new MarshalledObject(ejbHomeHandle);
+            final HomeHandle copy = (HomeHandle) obj.get();
 
             assertNotNull("The HomeHandle copy is null", copy);
-            EJBHome home = copy.getEJBHome();
+            final EJBHome home = copy.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
     public void Xtest03_copyHandleBySerialize() {
         try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            ObjectOutputStream oos = new ObjectOutputStream(baos);
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            final ObjectOutputStream oos = new ObjectOutputStream(baos);
             oos.writeObject(ejbHomeHandle);
             oos.flush();
             oos.close();
-            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-            ObjectInputStream ois = new ObjectInputStream(bais);
-            HomeHandle copy = (HomeHandle) ois.readObject();
+            final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+            final ObjectInputStream ois = new ObjectInputStream(bais);
+            final HomeHandle copy = (HomeHandle) ois.readObject();
 
             assertNotNull("The HomeHandle copy is null", copy);
-            EJBHome home = copy.getEJBHome();
+            final EJBHome home = copy.getEJBHome();
             assertNotNull("The EJBHome is null", home);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HomeIntfcTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HomeIntfcTests.java?rev=1608563&r1=1608562&r2=1608563&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HomeIntfcTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2HomeIntfcTests.java Mon Jul  7 19:07:41 2014
@@ -31,7 +31,7 @@ public class Cmp2HomeIntfcTests extends 
 
     protected void setUp() throws Exception {
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
+        final Object obj = initialContext.lookup("client/tests/entity/cmp2/BasicCmpHome");
         ejbHome = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow(obj, BasicCmpHome.class);
     }
 
@@ -50,7 +50,7 @@ public class Cmp2HomeIntfcTests extends 
     }
 
     public void test03_findByLastName() throws Exception {
-        Integer[] keys = new Integer[3];
+        final Integer[] keys = new Integer[3];
         ejbObject = ejbHome.createObject("David Blevins");
         keys[0] = (Integer) ejbObject.getPrimaryKey();
 
@@ -60,10 +60,10 @@ public class Cmp2HomeIntfcTests extends 
         ejbObject = ejbHome.createObject("Claude Blevins");
         keys[2] = (Integer) ejbObject.getPrimaryKey();
 
-        java.util.Collection objects = ejbHome.findByLastName("Blevins");
+        final java.util.Collection objects = ejbHome.findByLastName("Blevins");
         assertNotNull("The Collection is null", objects);
         assertEquals("The Collection is not the right size.", keys.length, objects.size());
-        Object[] objs = objects.toArray();
+        final Object[] objs = objects.toArray();
         for (int i = 0; i < objs.length; i++) {
             ejbObject = (BasicCmpObject) javax.rmi.PortableRemoteObject.narrow(objs[i], BasicCmpObject.class);
             // This could be problematic, it assumes the order of the collection.
@@ -73,10 +73,10 @@ public class Cmp2HomeIntfcTests extends 
 
     public void test04_homeMethod() {
         try {
-            int expected = 8;
-            int actual = ejbHome.sum(5, 3);
+            final int expected = 8;
+            final int actual = ejbHome.sum(5, 3);
             assertEquals("home method returned wrong result", expected, actual);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }