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 [29/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/mdb/MdbPojoContextLookupTests.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/mdb/MdbPojoContextLookupTests.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/mdb/MdbPojoContextLookupTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbPojoContextLookupTests.java Mon Jul  7 19:07:41 2014
@@ -31,7 +31,7 @@ public class MdbPojoContextLookupTests e
 
     protected void setUp() throws Exception {
         super.setUp();
-        Destination destination = (Destination) initialContext.lookup("ContextLookupMdbPojoBean");
+        final Destination destination = (Destination) initialContext.lookup("ContextLookupMdbPojoBean");
         ejbObject = MdbProxy.newProxyInstance(EncMdbObject.class, connectionFactory, destination);
         TestManager.getDatabase().createEntityTable();
     }
@@ -41,7 +41,7 @@ public class MdbPojoContextLookupTests e
         MdbProxy.destroyProxy(ejbObject);
         try {
             TestManager.getDatabase().dropEntityTable();
-        } catch (Exception e){
+        } catch (final Exception e){
             throw e;
         } finally {
             super.tearDown();
@@ -51,9 +51,9 @@ public class MdbPojoContextLookupTests e
     public void test01_lookupStringEntry() {
         try{
             ejbObject.lookupStringEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -61,9 +61,9 @@ public class MdbPojoContextLookupTests e
     public void test02_lookupDoubleEntry() {
         try{
             ejbObject.lookupDoubleEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -71,9 +71,9 @@ public class MdbPojoContextLookupTests e
     public void test03_lookupLongEntry() {
         try{
             ejbObject.lookupLongEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -81,9 +81,9 @@ public class MdbPojoContextLookupTests e
     public void test04_lookupFloatEntry() {
         try{
             ejbObject.lookupFloatEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -91,9 +91,9 @@ public class MdbPojoContextLookupTests e
     public void test05_lookupIntegerEntry() {
         try{
             ejbObject.lookupIntegerEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -101,9 +101,9 @@ public class MdbPojoContextLookupTests e
     public void test06_lookupShortEntry() {
         try{
             ejbObject.lookupShortEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -111,9 +111,9 @@ public class MdbPojoContextLookupTests e
     public void test07_lookupBooleanEntry() {
         try{
             ejbObject.lookupBooleanEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -121,9 +121,9 @@ public class MdbPojoContextLookupTests e
     public void test08_lookupByteEntry() {
         try{
             ejbObject.lookupByteEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -131,9 +131,9 @@ public class MdbPojoContextLookupTests e
     public void test09_lookupCharacterEntry() {
         try{
             ejbObject.lookupCharacterEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -141,9 +141,9 @@ public class MdbPojoContextLookupTests e
     public void test10_lookupEntityBean() {
         try{
             ejbObject.lookupEntityBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -151,9 +151,9 @@ public class MdbPojoContextLookupTests e
     public void test11_lookupStatefulBean() {
         try{
             ejbObject.lookupStatefulBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -161,9 +161,9 @@ public class MdbPojoContextLookupTests e
     public void test12_lookupStatelessBean() {
         try{
             ejbObject.lookupStatelessBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -171,9 +171,9 @@ public class MdbPojoContextLookupTests e
     public void test13_lookupResource() {
         try{
             ejbObject.lookupResource();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -181,9 +181,9 @@ public class MdbPojoContextLookupTests e
     public void test14_lookupPersistenceUnit() {
         try{
             ejbObject.lookupPersistenceUnit();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -191,9 +191,9 @@ public class MdbPojoContextLookupTests e
     public void test15_lookupPersistenceContext() {
         try{
             ejbObject.lookupPersistenceContext();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -201,9 +201,9 @@ public class MdbPojoContextLookupTests e
     public void test18_lookupMessageDrivenContext() {
         try{
             ejbObject.lookupMessageDrivenContext();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -211,9 +211,9 @@ public class MdbPojoContextLookupTests e
     public void test23_lookupJMSConnectionFactory() {
         try{
             ejbObject.lookupJMSConnectionFactory();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } 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/mdb/MdbSetterInjectionTests.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/mdb/MdbSetterInjectionTests.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/mdb/MdbSetterInjectionTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbSetterInjectionTests.java Mon Jul  7 19:07:41 2014
@@ -31,7 +31,7 @@ public class MdbSetterInjectionTests ext
 
     protected void setUp() throws Exception {
         super.setUp();
-        Destination destination = (Destination) initialContext.lookup("SetterInjectionMdbBean");
+        final Destination destination = (Destination) initialContext.lookup("SetterInjectionMdbBean");
         ejbObject = MdbProxy.newProxyInstance(EncMdbObject.class, connectionFactory, destination);
         TestManager.getDatabase().createEntityTable();
     }
@@ -40,7 +40,7 @@ public class MdbSetterInjectionTests ext
         MdbProxy.destroyProxy(ejbObject);
         try {
             TestManager.getDatabase().dropEntityTable();
-        } catch (Exception e){
+        } catch (final Exception e){
             throw e;
         } finally {
             super.tearDown();
@@ -50,9 +50,9 @@ public class MdbSetterInjectionTests ext
     public void test01_lookupStringEntry() {
         try{
             ejbObject.lookupStringEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -60,9 +60,9 @@ public class MdbSetterInjectionTests ext
     public void test02_lookupDoubleEntry() {
         try{
             ejbObject.lookupDoubleEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -70,9 +70,9 @@ public class MdbSetterInjectionTests ext
     public void test03_lookupLongEntry() {
         try{
             ejbObject.lookupLongEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -80,9 +80,9 @@ public class MdbSetterInjectionTests ext
     public void test04_lookupFloatEntry() {
         try{
             ejbObject.lookupFloatEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -90,9 +90,9 @@ public class MdbSetterInjectionTests ext
     public void test05_lookupIntegerEntry() {
         try{
             ejbObject.lookupIntegerEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -100,9 +100,9 @@ public class MdbSetterInjectionTests ext
     public void test06_lookupShortEntry() {
         try{
             ejbObject.lookupShortEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -110,9 +110,9 @@ public class MdbSetterInjectionTests ext
     public void test07_lookupBooleanEntry() {
         try{
             ejbObject.lookupBooleanEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -120,9 +120,9 @@ public class MdbSetterInjectionTests ext
     public void test08_lookupByteEntry() {
         try{
             ejbObject.lookupByteEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -130,9 +130,9 @@ public class MdbSetterInjectionTests ext
     public void test09_lookupCharacterEntry() {
         try{
             ejbObject.lookupCharacterEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -140,9 +140,9 @@ public class MdbSetterInjectionTests ext
     public void test10_lookupEntityBean() {
         try{
             ejbObject.lookupEntityBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -150,9 +150,9 @@ public class MdbSetterInjectionTests ext
     public void test11_lookupStatefulBean() {
         try{
             ejbObject.lookupStatefulBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -160,9 +160,9 @@ public class MdbSetterInjectionTests ext
     public void test12_lookupStatelessBean() {
         try{
             ejbObject.lookupStatelessBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -170,9 +170,9 @@ public class MdbSetterInjectionTests ext
     public void test13_lookupResource() {
         try{
             ejbObject.lookupResource();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -180,9 +180,9 @@ public class MdbSetterInjectionTests ext
     public void test14_lookupPersistenceUnit() {
         try{
             ejbObject.lookupPersistenceUnit();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -190,9 +190,9 @@ public class MdbSetterInjectionTests ext
     public void test15_lookupPersistenceContext() {
         try{
             ejbObject.lookupPersistenceContext();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -200,9 +200,9 @@ public class MdbSetterInjectionTests ext
     public void test18_lookupMessageDrivenContext() {
         try{
             ejbObject.lookupMessageDrivenContext();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -210,9 +210,9 @@ public class MdbSetterInjectionTests ext
     public void test19_lookupStatelessBusinessLocal() {
         try{
             ejbObject.lookupStatelessBusinessLocal();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -220,9 +220,9 @@ public class MdbSetterInjectionTests ext
     public void test20_lookupStatelessBusinessRemote() {
         try{
             ejbObject.lookupStatelessBusinessRemote();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -230,9 +230,9 @@ public class MdbSetterInjectionTests ext
     public void test21_lookupStatefulBusinessLocal() {
         try{
             ejbObject.lookupStatefulBusinessLocal();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -240,9 +240,9 @@ public class MdbSetterInjectionTests ext
     public void test22_lookupStatefulBusinessRemote() {
         try{
             ejbObject.lookupStatefulBusinessRemote();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -250,9 +250,9 @@ public class MdbSetterInjectionTests ext
     public void test23_lookupJMSConnectionFactory() {
         try{
             ejbObject.lookupJMSConnectionFactory();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } 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/mdb/MdbTestClient.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/mdb/MdbTestClient.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/mdb/MdbTestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestClient.java Mon Jul  7 19:07:41 2014
@@ -30,7 +30,7 @@ public abstract class MdbTestClient exte
     protected ConnectionFactory connectionFactory;
 
 
-    public MdbTestClient(String name) {
+    public MdbTestClient(final String name) {
         super("MDB." + name);
     }
 
@@ -39,13 +39,13 @@ public abstract class MdbTestClient exte
      * This method is called before a test is executed.
      */
     protected void setUp() throws Exception {
-        Properties properties = TestManager.getServer().getContextEnvironment();
+        final Properties properties = TestManager.getServer().getContextEnvironment();
         initialContext = new InitialContext(properties);
         connectionFactory = TestManager.getJms().getConnectionFactory();
     }
 
     protected Connection createConnection() throws JMSException {
-        Connection connection = connectionFactory.createConnection();
+        final Connection connection = connectionFactory.createConnection();
         connection.start();
         return connection;
     }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.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/mdb/MdbTestSuite.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/mdb/MdbTestSuite.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java Mon Jul  7 19:07:41 2014
@@ -24,12 +24,12 @@ import org.apache.openejb.test.FilteredT
  * @version $Rev$ $Date$
  */
 public class MdbTestSuite extends junit.framework.TestCase {
-    public MdbTestSuite(String name) {
+    public MdbTestSuite(final String name) {
         super(name);
     }
 
     public static junit.framework.Test suite() {
-        TestSuite suite = new FilteredTestSuite();
+        final TestSuite suite = new FilteredTestSuite();
 
         // Verify the famework is working
         suite.addTest(new MdbConnectionFactoryTests());

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.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/servlet/ServletTestClient.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/servlet/ServletTestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java Mon Jul  7 19:07:41 2014
@@ -36,13 +36,13 @@ public abstract class ServletTestClient 
     protected URL serverUrl;
     private final String servletName;
 
-    public ServletTestClient(String servletName) {
+    public ServletTestClient(final String servletName) {
         super("Servlet." + servletName + ".");
         this.servletName = servletName;
-        String serverUri = System.getProperty("openejb.server.uri", "http://127.0.0.1:8080/tomee/ejb");
+        final String serverUri = System.getProperty("openejb.server.uri", "http://127.0.0.1:8080/tomee/ejb");
         try {
             serverUrl = new URL(serverUri);
-        } catch (MalformedURLException e) {
+        } catch (final MalformedURLException e) {
             throw new RuntimeException(e);
         }
 
@@ -62,18 +62,18 @@ public abstract class ServletTestClient 
      */
     protected void setUp() throws Exception {
 
-        Properties properties = TestManager.getServer().getContextEnvironment();
+        final Properties properties = TestManager.getServer().getContextEnvironment();
         //properties.put(Context.SECURITY_PRINCIPAL, "STATEFUL_test00_CLIENT");
         //properties.put(Context.SECURITY_CREDENTIALS, "STATEFUL_test00_CLIENT");
 
         initialContext = new InitialContext(properties);
     }
 
-    protected Object invoke(String methodName) {
+    protected Object invoke(final String methodName) {
         InputStream in = null;
         try {
-            URL url = new URL(serverUrl, "/itests/" + servletName + "?method=" + methodName);
-            URLConnection connection = url.openConnection();
+            final URL url = new URL(serverUrl, "/itests/" + servletName + "?method=" + methodName);
+            final URLConnection connection = url.openConnection();
             connection.connect();
             in = connection.getInputStream();
             String response = readAll(in);
@@ -81,22 +81,22 @@ public abstract class ServletTestClient 
                 response = response.substring("FAILED".length()).trim();
                 fail(response);
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         } finally {
             if (in != null) {
                 try {
                     in.close();
-                } catch (Exception ignored) {
+                } catch (final Exception ignored) {
                 }
             }
         }
         return null;
     }
 
-    private static String readAll(InputStream in) throws IOException {
+    private static String readAll(final InputStream in) throws IOException {
         // SwizzleStream block read methods are broken so read byte at a time
-        StringBuilder sb = new StringBuilder();
+        final StringBuilder sb = new StringBuilder();
         int i = in.read();
         while (i != -1) {
             sb.append((char) i);
@@ -106,16 +106,16 @@ public abstract class ServletTestClient 
     }
 
     @SuppressWarnings({"unchecked"})
-    protected <T> T newServletProxy(Class<T> clazz) {
-        Object proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{clazz}, new ServletInvocationHandler());
+    protected <T> T newServletProxy(final Class<T> clazz) {
+        final Object proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{clazz}, new ServletInvocationHandler());
         return (T) proxy;
     }
 
     private class ServletInvocationHandler implements InvocationHandler {
-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
             if (method.getParameterTypes().length != 0) throw new IllegalArgumentException("ServletProxy only supports no-argument methods: " + method);
 
-            String methodName = method.getName();
+            final String methodName = method.getName();
 
             return ServletTestClient.this.invoke(methodName);
         }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestSuite.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/servlet/ServletTestSuite.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/servlet/ServletTestSuite.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestSuite.java Mon Jul  7 19:07:41 2014
@@ -21,12 +21,12 @@ import junit.framework.TestSuite;
 import org.apache.openejb.test.FilteredTestSuite;
 
 public class ServletTestSuite extends junit.framework.TestCase {
-    public ServletTestSuite(String name) {
+    public ServletTestSuite(final String name) {
         super(name);
     }
 
     public static junit.framework.Test suite() {
-        TestSuite suite = new FilteredTestSuite();
+        final TestSuite suite = new FilteredTestSuite();
         suite.addTest(new AnnotatedServletTests());
         suite.addTest(new EjbServletTests());
         suite.addTest(new SecureServletTests());

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonLocalTestClient.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/singleton/AnnotatedFieldInjectionSingletonLocalTestClient.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/singleton/AnnotatedFieldInjectionSingletonLocalTestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonLocalTestClient.java Mon Jul  7 19:07:41 2014
@@ -24,7 +24,7 @@ package org.apache.openejb.test.singleto
  */
 public abstract class AnnotatedFieldInjectionSingletonLocalTestClient extends BasicSingletonLocalTestClient {
 
-    public AnnotatedFieldInjectionSingletonLocalTestClient(String name) {
+    public AnnotatedFieldInjectionSingletonLocalTestClient(final String name) {
         super("AnnotatedFieldInjectionSingletonLocalTestClient." + name);
     }
     

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoHomeIntfcTests.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/singleton/AnnotatedFieldInjectionSingletonPojoHomeIntfcTests.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/singleton/AnnotatedFieldInjectionSingletonPojoHomeIntfcTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoHomeIntfcTests.java Mon Jul  7 19:07:41 2014
@@ -42,7 +42,7 @@ public class AnnotatedFieldInjectionSing
         try{
             ejbObject = ejbHome.createObject();
             assertNotNull( "The EJBObject is null", ejbObject );
-        } 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/singleton/AnnotatedFieldInjectionSingletonPojoLocalHomeIntfcTests.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/singleton/AnnotatedFieldInjectionSingletonPojoLocalHomeIntfcTests.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/singleton/AnnotatedFieldInjectionSingletonPojoLocalHomeIntfcTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonPojoLocalHomeIntfcTests.java Mon Jul  7 19:07:41 2014
@@ -42,7 +42,7 @@ public class AnnotatedFieldInjectionSing
         try{
             ejbLocalObject = ejbLocalHome.create();
             assertNotNull( "The EJBObject is null", ejbLocalObject );
-        } 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/singleton/AnnotatedFieldInjectionSingletonTestClient.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/singleton/AnnotatedFieldInjectionSingletonTestClient.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/singleton/AnnotatedFieldInjectionSingletonTestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonTestClient.java Mon Jul  7 19:07:41 2014
@@ -24,7 +24,7 @@ package org.apache.openejb.test.singleto
  */
 public abstract class AnnotatedFieldInjectionSingletonTestClient extends BasicSingletonTestClient {
 
-    public AnnotatedFieldInjectionSingletonTestClient(String name) {
+    public AnnotatedFieldInjectionSingletonTestClient(final String name) {
         super("AnnotatedFieldInjectionSingletonTestClient." + name);
     }
     

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedSetterInjectionSingletonLocalTestClient.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/singleton/AnnotatedSetterInjectionSingletonLocalTestClient.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/singleton/AnnotatedSetterInjectionSingletonLocalTestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedSetterInjectionSingletonLocalTestClient.java Mon Jul  7 19:07:41 2014
@@ -24,7 +24,7 @@ package org.apache.openejb.test.singleto
  */
 public abstract class AnnotatedSetterInjectionSingletonLocalTestClient extends BasicSingletonLocalTestClient {
 
-    public AnnotatedSetterInjectionSingletonLocalTestClient(String name) {
+    public AnnotatedSetterInjectionSingletonLocalTestClient(final String name) {
         super("AnnotatedSetterInjectionSingletonLocalTestClient." + name);
     }
     

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedSetterInjectionSingletonPojoHomeIntfcTests.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/singleton/AnnotatedSetterInjectionSingletonPojoHomeIntfcTests.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/singleton/AnnotatedSetterInjectionSingletonPojoHomeIntfcTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedSetterInjectionSingletonPojoHomeIntfcTests.java Mon Jul  7 19:07:41 2014
@@ -37,7 +37,7 @@ public class AnnotatedSetterInjectionSin
     
     @EJB(name="client/tests/singleton/BasicSingletonPojoHome",
    	     beanInterface=BasicSingletonHome.class)
-    public void setEjbHome(BasicSingletonHome bsEjbHome) {
+    public void setEjbHome(final BasicSingletonHome bsEjbHome) {
     	ejbHome = bsEjbHome;
     }
     
@@ -48,7 +48,7 @@ public class AnnotatedSetterInjectionSin
         try{
             ejbObject = ejbHome.createObject();
             assertNotNull( "The EJBObject is null", ejbObject );
-        } 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/singleton/AnnotatedSetterInjectionSingletonPojoLocalHomeIntfcTests.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/singleton/AnnotatedSetterInjectionSingletonPojoLocalHomeIntfcTests.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/singleton/AnnotatedSetterInjectionSingletonPojoLocalHomeIntfcTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedSetterInjectionSingletonPojoLocalHomeIntfcTests.java Mon Jul  7 19:07:41 2014
@@ -37,7 +37,7 @@ public class AnnotatedSetterInjectionSin
     
 	@EJB(name="client/tests/singleton/BasicSingletonPojoHomeLocal",
 		 beanInterface = BasicSingletonLocalHome.class)
-    public void setEjbLocalHome(BasicSingletonLocalHome bslEjbHome) {
+    public void setEjbLocalHome(final BasicSingletonLocalHome bslEjbHome) {
     	ejbLocalHome = bslEjbHome;
     }
     
@@ -48,7 +48,7 @@ public class AnnotatedSetterInjectionSin
         try{
             ejbLocalObject = ejbLocalHome.create();
             assertNotNull( "The EJBObject is null", ejbLocalObject );
-        } 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/singleton/AnnotatedSetterInjectionSingletonTestClient.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/singleton/AnnotatedSetterInjectionSingletonTestClient.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/singleton/AnnotatedSetterInjectionSingletonTestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/AnnotatedSetterInjectionSingletonTestClient.java Mon Jul  7 19:07:41 2014
@@ -24,7 +24,7 @@ package org.apache.openejb.test.singleto
  */
 public abstract class AnnotatedSetterInjectionSingletonTestClient extends BasicSingletonTestClient {
 
-    public AnnotatedSetterInjectionSingletonTestClient(String name) {
+    public AnnotatedSetterInjectionSingletonTestClient(final String name) {
         super("AnnotatedSetterInjectionSingletonTestClient." + name);
     }
     

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.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/singleton/BMTSingletonAllowedOperationsTests.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/singleton/BMTSingletonAllowedOperationsTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java Mon Jul  7 19:07:41 2014
@@ -69,7 +69,7 @@ public class BMTSingletonAllowedOperatio
 
     protected void setUp() throws Exception{
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/singleton/BeanManagedBasicSingletonHome");
+        final Object obj = initialContext.lookup("client/tests/singleton/BeanManagedBasicSingletonHome");
         ejbHome = (BasicSingletonHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicSingletonHome.class);
         ejbObject = ejbHome.createObject();
         ejbHandle = ejbObject.getHandle();
@@ -89,7 +89,7 @@ public class BMTSingletonAllowedOperatio
     protected void tearDown() throws Exception{
         try {
             ejbObject.remove();
-        } catch (Exception e){
+        } catch (final Exception e){
             throw e;
         } finally {
             super.tearDown();
@@ -113,17 +113,17 @@ public class BMTSingletonAllowedOperatio
      */
     public void test01_setSessionContext(){         
         try{
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow( policy.Context_getEJBHome );
             policy.allow( policy.Context_lookup );
             policy.allow( policy.JNDI_access_to_java_comp_env );
             
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("setSessionContext");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("setSessionContext");
             
             assertNotNull("The OperationsPolicy is null", actual );
             assertEquals( expected, actual );
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -144,7 +144,7 @@ public class BMTSingletonAllowedOperatio
      */
     public void test02_ejbCreate(){             
         try{
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow( policy.Context_getEJBHome );
             policy.allow( policy.Context_getEJBObject );
             policy.allow( policy.Context_getUserTransaction );
@@ -152,12 +152,12 @@ public class BMTSingletonAllowedOperatio
             policy.allow( policy.Context_lookup );
             policy.allow( policy.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());
         }
     }
@@ -179,7 +179,7 @@ public class BMTSingletonAllowedOperatio
     public void TODO_test03_ejbRemove(){             
         try{
             /* TO DO:  This test needs unique functionality to work */
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow( policy.Context_getEJBHome );
             policy.allow( policy.Context_getEJBObject );
             policy.allow( policy.Context_getUserTransaction );
@@ -187,12 +187,12 @@ public class BMTSingletonAllowedOperatio
             policy.allow( policy.Context_lookup );
             policy.allow( policy.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());
         }
     }
@@ -218,7 +218,7 @@ public class BMTSingletonAllowedOperatio
      */
     public void test04_businessMethod(){
         try{
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow( policy.Context_getEJBHome );
             policy.allow( policy.Context_getCallerPrincipal );
             policy.allow( policy.Context_isCallerInRole );
@@ -228,12 +228,12 @@ public class BMTSingletonAllowedOperatio
             policy.allow( policy.Context_lookup );
             policy.allow( policy.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());
         }
     }
@@ -243,7 +243,7 @@ public class BMTSingletonAllowedOperatio
             ejbObject.scheduleTimer("BmtSingletonAllowedOperationsTests");
             timerSync.waitFor("BmtSingletonAllowedOperationsTests");
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow( policy.Context_getEJBHome );
             policy.allow( policy.Context_getCallerPrincipal );
             policy.allow( policy.Context_isCallerInRole );
@@ -253,12 +253,12 @@ public class BMTSingletonAllowedOperatio
             policy.allow( policy.Context_lookup );
             policy.allow( policy.JNDI_access_to_java_comp_env );
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbTimeout");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbTimeout");
 
             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/singleton/BasicSingletonLocalTestClient.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/singleton/BasicSingletonLocalTestClient.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/singleton/BasicSingletonLocalTestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BasicSingletonLocalTestClient.java Mon Jul  7 19:07:41 2014
@@ -29,11 +29,11 @@ public abstract class BasicSingletonLoca
 	protected BasicSingletonLocalHome ejbLocalHome = null;
     protected BasicSingletonLocalObject ejbLocalObject = null;
 
-    public BasicSingletonLocalTestClient(String name){
+    public BasicSingletonLocalTestClient(final String name){
         super(name);
     }
     
-    protected Object cast(Object object, Class type) {
+    protected Object cast(final Object object, final Class type) {
     	return type.cast(object);
     }
     

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BasicSingletonTestClient.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/singleton/BasicSingletonTestClient.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/singleton/BasicSingletonTestClient.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BasicSingletonTestClient.java Mon Jul  7 19:07:41 2014
@@ -25,7 +25,7 @@ public abstract class BasicSingletonTest
     protected BasicSingletonHome ejbHome = null;
     protected BasicSingletonObject ejbObject = null;
 
-    public BasicSingletonTestClient(String name){
+    public BasicSingletonTestClient(final String name){
         super(name);
     }
 }

Modified: tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/MiscEjbTests.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/singleton/MiscEjbTests.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/singleton/MiscEjbTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/MiscEjbTests.java Mon Jul  7 19:07:41 2014
@@ -31,7 +31,7 @@ public class MiscEjbTests extends BasicS
 
     protected void setUp() throws Exception{
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
+        final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
         ejbHome = (BasicSingletonHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicSingletonHome.class);
         ejbObject = ejbHome.createObject();
     }
@@ -39,7 +39,7 @@ public class MiscEjbTests extends BasicS
     protected void tearDown() throws Exception {
         try {
             //ejbObject.remove();
-        } catch (Exception e){
+        } catch (final Exception e){
             throw e;
         } finally {
             super.tearDown();
@@ -51,11 +51,11 @@ public class MiscEjbTests extends BasicS
     //
     public void test01_isIdentical_singleton(){
         try{
-            String jndiName = "client/tests/singleton/EncBean";
+            final String jndiName = "client/tests/singleton/EncBean";
             EncSingletonHome ejbHome2 = null;
             EncSingletonObject ejbObject2 = null;
 
-            Object obj = initialContext.lookup(jndiName);
+            final Object obj = initialContext.lookup(jndiName);
             ejbHome2 = (EncSingletonHome)javax.rmi.PortableRemoteObject.narrow( obj, EncSingletonHome.class);
             ejbObject2 = ejbHome2.create();
 
@@ -64,7 +64,7 @@ public class MiscEjbTests extends BasicS
             //System.out.println(" ejb2 "+ejbObject2);
             assertTrue( "The EJBObjects should not be identical", !ejbObject.isIdentical(ejbObject2) );
             //System.out.println("-------------------------------------------------------");
-        } catch (Exception e){
+        } catch (final Exception e){
             //System.out.println("-------------------------------------------------------");
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
@@ -72,11 +72,11 @@ public class MiscEjbTests extends BasicS
 
     public void test02_isIdentical_stateful(){
         try{
-            String jndiName = "client/tests/stateful/EncBean";
+            final String jndiName = "client/tests/stateful/EncBean";
             EncStatefulHome ejbHome2 = null;
             EncStatefulObject ejbObject2 = null;
 
-            Object obj = initialContext.lookup(jndiName);
+            final Object obj = initialContext.lookup(jndiName);
             ejbHome2 = (EncStatefulHome)javax.rmi.PortableRemoteObject.narrow( obj, EncStatefulHome.class);
             ejbObject2 = ejbHome2.create("isIdentical test");
 
@@ -85,7 +85,7 @@ public class MiscEjbTests extends BasicS
             //System.out.println(" ejb2 "+ejbObject2);
             assertTrue( "The EJBObjects should not be identical", !ejbObject.isIdentical(ejbObject2) );
             //System.out.println("-------------------------------------------------------");
-        } catch (Exception e){
+        } catch (final Exception e){
             //System.out.println("-------------------------------------------------------");
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
@@ -93,11 +93,11 @@ public class MiscEjbTests extends BasicS
 
     public void test03_isIdentical_bmp(){
         try{
-            String jndiName = "client/tests/entity/bmp/EncBean";
+            final String jndiName = "client/tests/entity/bmp/EncBean";
             EncBmpHome ejbHome2 = null;
             EncBmpObject ejbObject2 = null;
 
-            Object obj = initialContext.lookup(jndiName);
+            final Object obj = initialContext.lookup(jndiName);
             ejbHome2 = (EncBmpHome)javax.rmi.PortableRemoteObject.narrow( obj, EncBmpHome.class);
             ejbObject2 = ejbHome2.create("isIdentical test");
 
@@ -106,7 +106,7 @@ public class MiscEjbTests extends BasicS
             //System.out.println(" ejb1 "+ejbObject);
             //System.out.println(" ejb2 "+ejbObject2);
             //System.out.println("-------------------------------------------------------");
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -116,11 +116,11 @@ public class MiscEjbTests extends BasicS
      */ 
     public void _test04_isIdentical_cmp(){
         try{
-            String jndiName = "client/tests/entity/cmp/EncBean";
+            final String jndiName = "client/tests/entity/cmp/EncBean";
             EncCmpHome ejbHome2 = null;
             EncCmpObject ejbObject2 = null;
 
-            Object obj = initialContext.lookup(jndiName);
+            final Object obj = initialContext.lookup(jndiName);
             ejbHome2 = (EncCmpHome)javax.rmi.PortableRemoteObject.narrow( obj, EncCmpHome.class);
             ejbObject2 = ejbHome2.create("isIdentical test");
 
@@ -129,7 +129,7 @@ public class MiscEjbTests extends BasicS
             //System.out.println(" ejb2 "+ejbObject2);
             assertTrue( "The EJBObjects should not be identical", !ejbObject.isIdentical(ejbObject2) );
             //System.out.println("-------------------------------------------------------");
-        } 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/singleton/SingletonAllowedOperationsTests.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/singleton/SingletonAllowedOperationsTests.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/singleton/SingletonAllowedOperationsTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java Mon Jul  7 19:07:41 2014
@@ -71,7 +71,7 @@ public class SingletonAllowedOperationsT
 
     protected void setUp() throws Exception{
         super.setUp();
-        Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
+        final Object obj = initialContext.lookup("client/tests/singleton/BasicSingletonHome");
         ejbHome = (BasicSingletonHome)javax.rmi.PortableRemoteObject.narrow( obj, BasicSingletonHome.class);
         ejbObject = ejbHome.createObject();
         ejbHandle = ejbObject.getHandle();
@@ -95,7 +95,7 @@ public class SingletonAllowedOperationsT
         /* Create more instances to fill the pool size 
          * causing instances to be passivated
          */
-        EJBObject[] ejbObjects = new EJBObject[10];
+        final EJBObject[] ejbObjects = new EJBObject[10];
         for (int i=0; i < ejbObjects.length; i++){
             ejbObjects[i] = ejbHome.createObject();
         }
@@ -105,7 +105,7 @@ public class SingletonAllowedOperationsT
     protected void tearDown() throws Exception{
         try {
             ejbObject.remove();
-        } catch (Exception e){
+        } catch (final Exception e){
             throw e;
         } finally {
             super.tearDown();
@@ -129,17 +129,17 @@ public class SingletonAllowedOperationsT
      */
     public void test01_setSessionContext(){
         try {
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow( OperationsPolicy.Context_getEJBHome );
             policy.allow( OperationsPolicy.Context_lookup );
             policy.allow( OperationsPolicy.JNDI_access_to_java_comp_env );
             
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("setSessionContext");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("setSessionContext");
             
             assertNotNull("The OperationsPolicy is null", actual );
             assertEquals( expected, actual );
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -162,19 +162,19 @@ public class SingletonAllowedOperationsT
 	// so, the test Context_getUserTransaction should fail, but,
 	// it does not.  Someone should see why it does not fail.
         try {
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow( OperationsPolicy.Context_getEJBHome );
             policy.allow( OperationsPolicy.Context_getEJBObject );
             policy.allow( OperationsPolicy.Context_getTimerService );
             policy.allow( OperationsPolicy.Context_lookup );
             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());
         }
     }
@@ -195,19 +195,19 @@ public class SingletonAllowedOperationsT
     public void TODO_test03_ejbRemove(){
         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.Context_getEJBObject );
             policy.allow( OperationsPolicy.Context_getTimerService );
             policy.allow( OperationsPolicy.Context_lookup );
             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());
         }
     }
@@ -234,7 +234,7 @@ public class SingletonAllowedOperationsT
      */
     public void test04_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 );
@@ -245,12 +245,12 @@ public class SingletonAllowedOperationsT
             policy.allow( OperationsPolicy.Context_lookup );
             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());
         }
     }
@@ -260,7 +260,7 @@ public class SingletonAllowedOperationsT
             ejbObject.scheduleTimer("SingletonAllowedOperationsTests");
             timerSync.waitFor("SingletonAllowedOperationsTests");
 
-            OperationsPolicy policy = new OperationsPolicy();
+            final OperationsPolicy policy = new OperationsPolicy();
             policy.allow( OperationsPolicy.Context_getEJBHome );
             policy.allow( OperationsPolicy.Context_getCallerPrincipal );
             policy.allow( OperationsPolicy.Context_getRollbackOnly );
@@ -271,12 +271,12 @@ public class SingletonAllowedOperationsT
             policy.allow( OperationsPolicy.Context_lookup );
             policy.allow( OperationsPolicy.JNDI_access_to_java_comp_env );
 
-            Object expected = policy;
-            Object actual = ejbObject.getAllowedOperationsReport("ejbTimeout");
+            final Object expected = policy;
+            final Object actual = ejbObject.getAllowedOperationsReport("ejbTimeout");
 
             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/singleton/SingletonAnnotatedFieldInjectionTests.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/singleton/SingletonAnnotatedFieldInjectionTests.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/singleton/SingletonAnnotatedFieldInjectionTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAnnotatedFieldInjectionTests.java Mon Jul  7 19:07:41 2014
@@ -35,7 +35,7 @@ public class SingletonAnnotatedFieldInje
 
     protected void setUp() throws Exception{
         super.setUp();
-        Object obj = initialContext.lookup("AnnotatedFieldInjectionSingletonBean");
+        final Object obj = initialContext.lookup("AnnotatedFieldInjectionSingletonBean");
         ejbHome = (EncSingletonHome)javax.rmi.PortableRemoteObject.narrow( obj, EncSingletonHome.class);
         ejbObject = ejbHome.create();
 
@@ -51,7 +51,7 @@ public class SingletonAnnotatedFieldInje
         try {
             /*[1] Drop database table */
             TestManager.getDatabase().dropEntityTable();
-        } catch (Exception e){
+        } catch (final Exception e){
             throw e;
         } finally {
             super.tearDown();
@@ -61,9 +61,9 @@ public class SingletonAnnotatedFieldInje
     public void test01_lookupStringEntry() {
         try{
             ejbObject.lookupStringEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -71,9 +71,9 @@ public class SingletonAnnotatedFieldInje
     public void test02_lookupDoubleEntry() {
         try{
             ejbObject.lookupDoubleEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -81,9 +81,9 @@ public class SingletonAnnotatedFieldInje
     public void test03_lookupLongEntry() {
         try{
             ejbObject.lookupLongEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -91,9 +91,9 @@ public class SingletonAnnotatedFieldInje
     public void test04_lookupFloatEntry() {
         try{
             ejbObject.lookupFloatEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -101,9 +101,9 @@ public class SingletonAnnotatedFieldInje
     public void test05_lookupIntegerEntry() {
         try{
             ejbObject.lookupIntegerEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -111,9 +111,9 @@ public class SingletonAnnotatedFieldInje
     public void test06_lookupShortEntry() {
         try{
             ejbObject.lookupShortEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -121,9 +121,9 @@ public class SingletonAnnotatedFieldInje
     public void test07_lookupBooleanEntry() {
         try{
             ejbObject.lookupBooleanEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -131,9 +131,9 @@ public class SingletonAnnotatedFieldInje
     public void test08_lookupByteEntry() {
         try{
             ejbObject.lookupByteEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -141,9 +141,9 @@ public class SingletonAnnotatedFieldInje
     public void test09_lookupCharacterEntry() {
         try{
             ejbObject.lookupCharacterEntry();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -151,9 +151,9 @@ public class SingletonAnnotatedFieldInje
     public void test10_lookupEntityBean() {
         try{
             ejbObject.lookupEntityBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -161,9 +161,9 @@ public class SingletonAnnotatedFieldInje
     public void test11_lookupStatefulBean() {
         try{
             ejbObject.lookupStatefulBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -171,9 +171,9 @@ public class SingletonAnnotatedFieldInje
     public void test12_lookupSingletonBean() {
         try{
             ejbObject.lookupSingletonBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -181,9 +181,9 @@ public class SingletonAnnotatedFieldInje
     public void test13_lookupResource() {
         try{
             ejbObject.lookupResource();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -191,9 +191,9 @@ public class SingletonAnnotatedFieldInje
     public void test14_lookupPersistenceUnit() {
         try{
             ejbObject.lookupPersistenceUnit();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -201,9 +201,9 @@ public class SingletonAnnotatedFieldInje
     public void test15_lookupPersistenceContext() {
         try{
             ejbObject.lookupPersistenceContext();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -211,9 +211,9 @@ public class SingletonAnnotatedFieldInje
     public void test18_lookupSessionContext() {
         try{
             ejbObject.lookupSessionContext();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -221,9 +221,9 @@ public class SingletonAnnotatedFieldInje
     public void test19_lookupSingletonBusinessLocal() {
         try{
             ejbObject.lookupSingletonBusinessLocal();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -231,9 +231,9 @@ public class SingletonAnnotatedFieldInje
     public void test20_lookupSingletonBusinessRemote() {
         try{
             ejbObject.lookupSingletonBusinessRemote();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -241,9 +241,9 @@ public class SingletonAnnotatedFieldInje
     public void test21_lookupStatefulBusinessLocal() {
         try{
             ejbObject.lookupStatefulBusinessLocal();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -251,9 +251,9 @@ public class SingletonAnnotatedFieldInje
     public void test22_lookupStatefulBusinessRemote() {
         try{
             ejbObject.lookupStatefulBusinessRemote();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -261,9 +261,9 @@ public class SingletonAnnotatedFieldInje
     public void test23_lookupJMSConnectionFactory() {
         try{
             ejbObject.lookupJMSConnectionFactory();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -271,9 +271,9 @@ public class SingletonAnnotatedFieldInje
     public void test24_lookupStatefulBusinessLocalBean() {
         try{
             ejbObject.lookupStatefulBusinessLocalBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -281,9 +281,9 @@ public class SingletonAnnotatedFieldInje
     public void test25_lookupSingletonBusinessLocal() {
         try{
             ejbObject.lookupSingletonBusinessLocalBean();
-        } catch (TestFailureException e){
+        } catch (final TestFailureException e){
             throw e.error;
-        } 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/singleton/SingletonBeanTxTests.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/singleton/SingletonBeanTxTests.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/singleton/SingletonBeanTxTests.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java Mon Jul  7 19:07:41 2014
@@ -57,14 +57,14 @@ public class SingletonBeanTxTests extend
      */
     protected void setUp() throws Exception {
 
-        Properties properties = TestManager.getServer().getContextEnvironment();
+        final Properties properties = TestManager.getServer().getContextEnvironment();
         //properties.put(Context.SECURITY_PRINCIPAL, "SINGLETON_test00_CLIENT");
         //properties.put(Context.SECURITY_CREDENTIALS, "SINGLETON_test00_CLIENT");
 
         initialContext = new InitialContext(properties);
 
         /*[1] Get bean */
-        Object obj = initialContext.lookup(jndiEJBHomeEntry);
+        final Object obj = initialContext.lookup(jndiEJBHomeEntry);
         ejbHome = (BeanTxSingletonHome)javax.rmi.PortableRemoteObject.narrow( obj, BeanTxSingletonHome.class);
         ejbObject = ejbHome.create();
 
@@ -101,9 +101,9 @@ public class SingletonBeanTxTests extend
      */
     public void test01_EJBContext_getUserTransaction(){
         try{
-           Transaction t = ejbObject.getUserTransaction();
+           final Transaction t = ejbObject.getUserTransaction();
            assertNotNull("UserTransaction is null.", t);
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -128,9 +128,9 @@ public class SingletonBeanTxTests extend
      */
     public void test02_java_comp_UserTransaction(){
         try{
-            Transaction t = ejbObject.jndiUserTransaction();
+            final Transaction t = ejbObject.jndiUserTransaction();
             assertNotNull("UserTransaction is null. Could not retreive a UserTransaction from the bean's JNDI namespace.", t);
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Could not retreive a UserTransaction from the bean's JNDI namespace. Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -150,7 +150,7 @@ public class SingletonBeanTxTests extend
     public void TODO_test03_EJBContext_setRollbackOnly(){
         try{
 
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -170,7 +170,7 @@ public class SingletonBeanTxTests extend
     public void TODO_test04_EJBContext_getRollbackOnly(){
         try{
 
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -180,7 +180,7 @@ public class SingletonBeanTxTests extend
      */
     public void test05_singleTransactionCommit(){
         try{
-            Account expected = new Account("123-45-6789","Joe","Cool",40000);
+            final Account expected = new Account("123-45-6789","Joe","Cool",40000);
             Account actual = new Account();
 
             ejbObject.openAccount(expected, new Boolean(false));
@@ -188,9 +188,9 @@ public class SingletonBeanTxTests extend
 
             assertNotNull( "The transaction was not commited.  The record is null", actual );
             assertEquals( "The transaction was not commited cleanly.", expected, actual );
-        } catch (RollbackException re){
+        } catch (final RollbackException re){
             fail("Transaction was rolledback.  Received Exception "+re.getClass()+ " : "+re.getMessage());
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -201,17 +201,17 @@ public class SingletonBeanTxTests extend
      * sent to the client, the server blocks.
      */
     public void BUG_test06_singleTransactionRollback(){
-        Account expected = new Account("234-56-7890","Charlie","Brown", 20000);
-        Account actual   = new Account();
+        final Account expected = new Account("234-56-7890","Charlie","Brown", 20000);
+        final Account actual   = new Account();
 
         // Try and add the account in a transaction.  This should fail and 
         // throw a RollbackException
         try{
             ejbObject.openAccount(expected, new Boolean(true));
             fail( "A javax.transaction.RollbackException should have been thrown." );
-        } catch (RollbackException re){
+        } catch (final RollbackException re){
             // Good.
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
         
@@ -235,7 +235,7 @@ public class SingletonBeanTxTests extend
     public void TODO_test07_serialTransactions(){
         try{
 
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -253,7 +253,7 @@ public class SingletonBeanTxTests extend
     public void TODO_test08_nestedTransactions(){
         try{
 
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -278,7 +278,7 @@ public class SingletonBeanTxTests extend
     public void TODO_test09_beginWithNoCommit(){
         try{
 
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -327,7 +327,7 @@ public class SingletonBeanTxTests extend
     public void TODO_test10_scenario1_NoneNone(){
         try{
 
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }
@@ -376,7 +376,7 @@ public class SingletonBeanTxTests extend
     public void TODO_test11_scenario2_T1None(){
         try{
 
-        } catch (Exception e){
+        } catch (final Exception e){
             fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         }
     }