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

tomee git commit: Fixes #34 patch from Ivan Junckes to remove some unused imports

Repository: tomee
Updated Branches:
  refs/heads/master d2376e186 -> fc14d71df


Fixes #34 patch from Ivan Junckes to remove some unused imports


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fc14d71d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fc14d71d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fc14d71d

Branch: refs/heads/master
Commit: fc14d71dfc5be15a286457b17ec2c7f89779f551
Parents: d2376e1
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Sat Jul 2 23:30:26 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Sat Jul 2 23:30:26 2016 +0200

----------------------------------------------------------------------
 .../org/apache/openejb/arquillian/common/SetupTest.java   |  1 -
 .../apache/openejb/core/mdb/QuartzMdbContainerTest.java   |  3 ---
 .../apache/openejb/junit/AppComposerAsJUnitRuleTest.java  |  2 --
 .../openejb/util/proxy/LocalBeanProxyFactoryTest.java     |  4 ++--
 .../org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java  | 10 ----------
 .../org/apache/openejb/junit/TestClassConfigFile.java     |  4 ----
 .../openejb/junit/TestClassConfigFileAndProperties.java   |  5 -----
 .../apache/openejb/junit/TestClassConfigProperties.java   |  5 -----
 .../org/apache/openejb/junit/TestDualConfigOverride.java  |  5 -----
 .../java/org/apache/openejb/junit/TestEjbSecurity.java    |  1 -
 .../apache/openejb/junit/TestEjbSecurityRunTestAs.java    |  1 -
 .../org/apache/openejb/junit/TestMethodConfigFile.java    |  4 ----
 .../apache/openejb/junit/TestMethodConfigProperties.java  |  5 -----
 .../test/java/org/apache/openejb/junit/TestRunner.java    |  3 ---
 .../openejb/test/entity/bmp/ContextLookupBmpBean.java     |  2 +-
 .../org/apache/openejb/test/entity/bmp/EncBmpBean.java    |  2 +-
 .../openejb/test/entity/cmp/ContextLookupCmpBean.java     |  2 +-
 .../org/apache/openejb/test/entity/cmp/EncCmp2Bean.java   |  2 +-
 .../org/apache/openejb/test/entity/cmp/EncCmpBean.java    |  2 +-
 .../singleton/AnnotatedFieldInjectionSingletonBean.java   |  2 +-
 .../test/singleton/ContextLookupSingletonBean.java        |  2 +-
 .../test/singleton/ContextLookupSingletonPojoBean.java    |  2 +-
 .../apache/openejb/test/singleton/EncSingletonBean.java   |  2 +-
 .../test/singleton/FieldInjectionSingletonBean.java       |  2 +-
 .../test/singleton/SetterInjectionSingletonBean.java      |  2 +-
 .../stateful/AnnotatedFieldInjectionStatefulBean.java     |  2 +-
 .../openejb/test/stateful/ContextLookupStatefulBean.java  |  2 +-
 .../test/stateful/ContextLookupStatefulPojoBean.java      |  2 +-
 .../org/apache/openejb/test/stateful/EncStatefulBean.java |  2 +-
 .../openejb/test/stateful/FieldInjectionStatefulBean.java |  2 +-
 .../test/stateful/SetterInjectionStatefulBean.java        |  2 +-
 .../stateless/AnnotatedFieldInjectionStatelessBean.java   |  2 +-
 .../test/stateless/ContextLookupStatelessBean.java        |  2 +-
 .../test/stateless/ContextLookupStatelessPojoBean.java    |  2 +-
 .../apache/openejb/test/stateless/EncStatelessBean.java   |  2 +-
 .../test/stateless/FieldInjectionStatelessBean.java       |  2 +-
 .../test/stateless/SetterInjectionStatelessBean.java      |  2 +-
 .../apache/openejb/test/entity/bmp/BmpRmiIiopTests.java   |  4 ++--
 .../apache/openejb/test/entity/cmp/CmpRmiIiopTests.java   |  4 ++--
 .../apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java |  4 ++--
 .../openejb/test/singleton/SingletonBeanTxTests.java      |  4 ++--
 .../openejb/test/singleton/SingletonRmiIiopTests.java     |  4 ++--
 .../apache/openejb/test/stateful/StatefulBeanTxTests.java |  4 ++--
 .../openejb/test/stateful/StatefulRmiIiopTests.java       |  4 ++--
 .../openejb/test/stateless/StatelessBeanTxTests.java      |  4 ++--
 .../openejb/test/stateless/StatelessRmiIiopTests.java     |  4 ++--
 .../cxf/rs/event/ExtensionProviderRegistrationTest.java   |  1 -
 .../openejb/server/cxf/rs/event/ServerCreatedTest.java    |  1 -
 .../org/apache/openejb/server/ServerServiceFilter.java    |  2 --
 49 files changed, 43 insertions(+), 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java b/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java
index cc3b38e..22fbd68 100644
--- a/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java
+++ b/arquillian/arquillian-tomee-common/src/test/java/org/apache/openejb/arquillian/common/SetupTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.openejb.arquillian.common;
 
-import org.apache.openejb.loader.*;
 import org.apache.openejb.loader.Files;
 import org.apache.openejb.testng.PropertiesBuilder;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
index 5f76eae..f985cd2 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
@@ -40,10 +40,7 @@ import org.apache.openejb.resource.quartz.QuartzResourceAdapter;
 import org.apache.openejb.quartz.Job;
 import org.apache.openejb.quartz.JobExecutionContext;
 import org.apache.openejb.quartz.JobExecutionException;
-import org.apache.openejb.resource.quartz.JobSpec;
-import org.apache.openejb.resource.quartz.QuartzResourceAdapter;
 import org.junit.AfterClass;
-import org.junit.Assert;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleTest.java b/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleTest.java
index 7f23747..45ef194 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleTest.java
@@ -20,12 +20,10 @@ import org.apache.openejb.jee.Empty;
 import org.apache.openejb.jee.StatelessBean;
 import org.apache.openejb.jee.jpa.unit.Persistence;
 import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.apache.openejb.junit.ApplicationComposer;
 import org.apache.openejb.testing.Configuration;
 import org.apache.openejb.testing.Module;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import javax.annotation.Resource;
 import javax.ejb.EJB;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java
index e3ddecb..8db0796 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java
@@ -287,7 +287,7 @@ public class LocalBeanProxyFactoryTest extends TestCase {
     public void testIsTrueBoolean() throws Exception {
         final TestInvocationHandler invocationHandler = new TestInvocationHandler(new SampleLocalBean());
         final SampleLocalBean proxy = loadProxy(invocationHandler);
-        final boolean result = proxy.isTrue(new Boolean(true).booleanValue());
+        final boolean result = proxy.isTrue(Boolean.TRUE);
 
         assertTrue(result);
         assertEquals(1, invocationHandler.getCalls().length);
@@ -300,7 +300,7 @@ public class LocalBeanProxyFactoryTest extends TestCase {
     public void testIsTrueBoolean1() throws Exception {
         final TestInvocationHandler invocationHandler = new TestInvocationHandler(new SampleLocalBean());
         final SampleLocalBean proxy = loadProxy(invocationHandler);
-        final Boolean result = proxy.isTrue(new Boolean(true));
+        final Boolean result = proxy.isTrue(Boolean.TRUE);
 
         assertTrue(result);
         assertEquals(1, invocationHandler.getCalls().length);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
index b5bafc7..2b3dc7d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
@@ -16,16 +16,6 @@
  */
 package org.apache.openejb.jee.oejb2;
 
-import org.apache.openejb.jee.oejb2.EnvironmentType;
-import org.apache.openejb.jee.oejb2.MessageDestinationType;
-import org.apache.openejb.jee.oejb2.AbstractSecurityType;
-import org.apache.openejb.jee.oejb2.AbstractServiceType;
-import org.apache.openejb.jee.oejb2.AbstractNamingEntryType;
-import org.apache.openejb.jee.oejb2.EjbRefType;
-import org.apache.openejb.jee.oejb2.EjbLocalRefType;
-import org.apache.openejb.jee.oejb2.ServiceRefType;
-import org.apache.openejb.jee.oejb2.ResourceRefType;
-import org.apache.openejb.jee.oejb2.ResourceEnvRefType;
 import org.apache.openejb.jee.jpa.unit.Persistence;
 
 import javax.xml.bind.annotation.XmlElement;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java
----------------------------------------------------------------------
diff --git a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java
index e111701..eaa973b 100644
--- a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java
+++ b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java
@@ -17,10 +17,6 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.ContextConfig;
-import org.apache.openejb.junit.TestResource;
-import org.apache.openejb.junit.TestResourceTypes;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java
----------------------------------------------------------------------
diff --git a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java
index 17a069b..c0e6b71 100644
--- a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java
+++ b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java
@@ -17,11 +17,6 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.ContextConfig;
-import org.apache.openejb.junit.Property;
-import org.apache.openejb.junit.TestResource;
-import org.apache.openejb.junit.TestResourceTypes;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
----------------------------------------------------------------------
diff --git a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
index 75a0d29..988436c 100644
--- a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
+++ b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
@@ -17,11 +17,6 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.ContextConfig;
-import org.apache.openejb.junit.Property;
-import org.apache.openejb.junit.TestResource;
-import org.apache.openejb.junit.TestResourceTypes;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java
----------------------------------------------------------------------
diff --git a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java
index 1a023a0..d37c391 100644
--- a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java
+++ b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java
@@ -17,11 +17,6 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.ContextConfig;
-import org.apache.openejb.junit.Property;
-import org.apache.openejb.junit.TestResource;
-import org.apache.openejb.junit.TestResourceTypes;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java
----------------------------------------------------------------------
diff --git a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java
index a5c6518..8289050 100644
--- a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java
+++ b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java
@@ -18,7 +18,6 @@
 package org.apache.openejb.junit;
 
 import org.apache.openejb.api.LocalClient;
-import org.apache.openejb.junit.TestSecurity;
 import org.apache.openejb.junit.ejbs.BasicEjbLocal;
 import org.apache.openejb.junit.ejbs.SecuredEjbLocal;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java
----------------------------------------------------------------------
diff --git a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java
index e4cb4b2..10ea9f9 100644
--- a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java
+++ b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java
@@ -17,7 +17,6 @@
 package org.apache.openejb.junit;
 
 import org.apache.openejb.api.LocalClient;
-import org.apache.openejb.junit.RunTestAs;
 import org.apache.openejb.junit.ejbs.BasicEjbLocal;
 import org.apache.openejb.junit.ejbs.SecuredEjbLocal;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java
----------------------------------------------------------------------
diff --git a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java
index 10da232..70cb3e3 100644
--- a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java
+++ b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java
@@ -17,10 +17,6 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.ContextConfig;
-import org.apache.openejb.junit.TestResource;
-import org.apache.openejb.junit.TestResourceTypes;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
----------------------------------------------------------------------
diff --git a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
index e73e705..5f75bcb 100644
--- a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
+++ b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
@@ -17,11 +17,6 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.ContextConfig;
-import org.apache.openejb.junit.Property;
-import org.apache.openejb.junit.TestResource;
-import org.apache.openejb.junit.TestResourceTypes;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java
----------------------------------------------------------------------
diff --git a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java
index fe0546b..eae1cdb 100644
--- a/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java
+++ b/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java
@@ -17,9 +17,6 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.TestResource;
-import org.apache.openejb.junit.TestResourceTypes;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java
index 1b954b5..dc6725a 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java
@@ -311,7 +311,7 @@ public class ContextLookupBmpBean implements javax.ejb.EntityBean {
     public void lookupBooleanEntry() throws TestFailureException {
         try {
             try {
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ejbContext.lookup("entity/bmp/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
index e0bef2f..c50b1fc 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
@@ -361,7 +361,7 @@ public class EncBmpBean implements javax.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ctx.lookup("java:comp/env/entity/bmp/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java
index 496b091..f87989c 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java
@@ -289,7 +289,7 @@ public class ContextLookupCmpBean implements javax.ejb.EntityBean {
     public void lookupBooleanEntry() throws TestFailureException {
         try {
             try {
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ejbContext.lookup("entity/cmp/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java
index 40a47f4..ee60c5a 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java
@@ -339,7 +339,7 @@ public abstract class EncCmp2Bean implements EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ctx.lookup("java:comp/env/entity/cmp/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
index ba8ffa8..a87b152 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
@@ -340,7 +340,7 @@ public class EncCmpBean implements javax.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ctx.lookup("java:comp/env/entity/cmp/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java
index 39ade9c..d3e191c 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java
@@ -244,7 +244,7 @@ public class AnnotatedFieldInjectionSingletonBean {
 
     public void lookupBooleanEntry() throws TestFailureException {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
 
             Assert.assertNotNull("The Boolean looked up is null", booolean);
             Assert.assertEquals(expected, booolean);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java
index 9fa73fa..9334919 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java
@@ -287,7 +287,7 @@ public class ContextLookupSingletonBean implements javax.ejb.SessionBean {
     public void lookupBooleanEntry() throws TestFailureException {
         try {
             try {
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ejbContext.lookup("singleton/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java
index fa9b091..36babab 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java
@@ -269,7 +269,7 @@ public class ContextLookupSingletonPojoBean {
     public void lookupBooleanEntry() throws TestFailureException {
         try {
             try {
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) getSessionContext().lookup("singleton/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java
index e7a20a2..bc704fa 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java
@@ -342,7 +342,7 @@ public class EncSingletonBean implements javax.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ctx.lookup("java:comp/env/singleton/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java
index 96d2e6b..e961e83 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java
@@ -216,7 +216,7 @@ public class FieldInjectionSingletonBean implements SessionBean {
 
     public void lookupBooleanEntry() throws TestFailureException {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
 
             Assert.assertNotNull("The Boolean looked up is null", booolean);
             Assert.assertEquals(expected, booolean);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java
index 80b6d16..e6c5c56 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java
@@ -434,7 +434,7 @@ public class SetterInjectionSingletonBean implements SessionBean {
 
     public void lookupBooleanEntry() throws TestFailureException {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
 
             Assert.assertNotNull("The Boolean looked up is null", boooleanField);
             Assert.assertEquals(expected, boooleanField);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java
index 4e50133..d194c44 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java
@@ -252,7 +252,7 @@ public class AnnotatedFieldInjectionStatefulBean {
 
     public void lookupBooleanEntry() throws TestFailureException {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
 
             Assert.assertNotNull("The Boolean looked up is null", booolean);
             Assert.assertEquals(expected, booolean);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
index b81113d..86d960f 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
@@ -308,7 +308,7 @@ public class ContextLookupStatefulBean implements javax.ejb.SessionBean, Session
     public void lookupBooleanEntry() throws TestFailureException {
         try {
             try {
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ejbContext.lookup("stateful/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java
index 3a154c0..93ec4a2 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java
@@ -292,7 +292,7 @@ public class ContextLookupStatefulPojoBean {
     public void lookupBooleanEntry() throws TestFailureException {
         try {
             try {
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ejbContext.lookup("stateful/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
index 5014f8d..5230398 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
@@ -357,7 +357,7 @@ public class EncStatefulBean implements javax.ejb.SessionBean, SessionSynchroniz
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ctx.lookup("java:comp/env/stateful/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
index 2829fd1..495af01 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
@@ -237,7 +237,7 @@ public class FieldInjectionStatefulBean implements SessionBean {
 
     public void lookupBooleanEntry() throws TestFailureException {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
 
             Assert.assertNotNull("The Boolean looked up is null", booolean);
             Assert.assertEquals(expected, booolean);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
index 2f897d2..f41ac76 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
@@ -462,7 +462,7 @@ public class SetterInjectionStatefulBean implements SessionBean {
 
     public void lookupBooleanEntry() throws TestFailureException {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
 
             Assert.assertNotNull("The Boolean looked up is null", boooleanField);
             Assert.assertEquals(expected, boooleanField);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java
index a898bfa..bca0b1f 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java
@@ -236,7 +236,7 @@ public class AnnotatedFieldInjectionStatelessBean {
 
     public void lookupBooleanEntry() throws TestFailureException {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
 
             Assert.assertNotNull("The Boolean looked up is null", booolean);
             Assert.assertEquals(expected, booolean);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
index 7e41460..5408a27 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
@@ -277,7 +277,7 @@ public class ContextLookupStatelessBean implements javax.ejb.SessionBean {
     public void lookupBooleanEntry() throws TestFailureException {
         try {
             try {
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ejbContext.lookup("stateless/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java
index 3404d35..74bf87c 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java
@@ -259,7 +259,7 @@ public class ContextLookupStatelessPojoBean {
     public void lookupBooleanEntry() throws TestFailureException {
         try {
             try {
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) getSessionContext().lookup("stateless/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
index 95b3a41..6d16cde 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
@@ -343,7 +343,7 @@ public class EncStatelessBean implements javax.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Boolean expected = new Boolean(true);
+                final Boolean expected = Boolean.TRUE;
                 final Boolean actual = (Boolean) ctx.lookup("java:comp/env/stateless/references/Boolean");
 
                 Assert.assertNotNull("The Boolean looked up is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
index 7069980..a2285fd 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
@@ -216,7 +216,7 @@ public class FieldInjectionStatelessBean implements SessionBean {
 
     public void lookupBooleanEntry() throws TestFailureException {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
 
             Assert.assertNotNull("The Boolean looked up is null", booolean);
             Assert.assertEquals(expected, booolean);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java
index c18baa7..92a2e7f 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java
@@ -427,7 +427,7 @@ public class SetterInjectionStatelessBean implements SessionBean {
 
     public void lookupBooleanEntry() throws TestFailureException {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
 
             Assert.assertNotNull("The Boolean looked up is null", boooleanField);
             Assert.assertEquals(expected, boooleanField);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRmiIiopTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRmiIiopTests.java
index 395315d..c8474c9 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRmiIiopTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpRmiIiopTests.java
@@ -132,7 +132,7 @@ public class BmpRmiIiopTests extends BmpTestClient {
 
     public void test07_returnBooleanObject() {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
             final Boolean actual = ejbObject.returnBooleanObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -152,7 +152,7 @@ public class BmpRmiIiopTests extends BmpTestClient {
 
     public void test09_returnBooleanObjectArray() {
         try {
-            final Boolean[] expected = {new Boolean(true), new Boolean(false), new Boolean(true)};
+            final Boolean[] expected = {Boolean.TRUE, Boolean.FALSE, Boolean.TRUE};
             final Boolean[] actual = ejbObject.returnBooleanObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRmiIiopTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRmiIiopTests.java
index 3d13f15..a626ebe 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRmiIiopTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpRmiIiopTests.java
@@ -132,7 +132,7 @@ public class CmpRmiIiopTests extends CmpTestClient {
 
     public void test07_returnBooleanObject() {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
             final Boolean actual = ejbObject.returnBooleanObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -152,7 +152,7 @@ public class CmpRmiIiopTests extends CmpTestClient {
 
     public void test09_returnBooleanObjectArray() {
         try {
-            final Boolean[] expected = {new Boolean(true), new Boolean(false), new Boolean(true)};
+            final Boolean[] expected = {Boolean.TRUE, Boolean.FALSE, Boolean.TRUE};
             final Boolean[] actual = ejbObject.returnBooleanObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java
index 01d1264..ca7dbe1 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2RmiIiopTests.java
@@ -136,7 +136,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient {
 
     public void test07_returnBooleanObject() {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
             final Boolean actual = ejbObject.returnBooleanObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -156,7 +156,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient {
 
     public void test09_returnBooleanObjectArray() {
         try {
-            final Boolean[] expected = {new Boolean(true), new Boolean(false), new Boolean(true)};
+            final Boolean[] expected = {Boolean.TRUE, Boolean.FALSE, Boolean.TRUE};
             final Boolean[] actual = ejbObject.returnBooleanObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java
index 58f0981..514b8ba 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonBeanTxTests.java
@@ -181,7 +181,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase
             final Account expected = new Account("123-45-6789", "Joe", "Cool", 40000);
             Account actual = new Account();
 
-            ejbObject.openAccount(expected, new Boolean(false));
+            ejbObject.openAccount(expected, Boolean.FALSE);
             actual = ejbObject.retreiveAccount(expected.getSsn());
 
             assertNotNull("The transaction was not commited.  The record is null", actual);
@@ -205,7 +205,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase
         // Try and add the account in a transaction.  This should fail and 
         // throw a RollbackException
         try {
-            ejbObject.openAccount(expected, new Boolean(true));
+            ejbObject.openAccount(expected, Boolean.TRUE);
             fail("A javax.transaction.RollbackException should have been thrown.");
         } catch (final RollbackException re) {
             // Good.

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java
index 4f91994..85721b7 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRmiIiopTests.java
@@ -132,7 +132,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
 
     public void test07_returnBooleanObject() {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
             final Boolean actual = ejbObject.returnBooleanObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -152,7 +152,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
 
     public void test09_returnBooleanObjectArray() {
         try {
-            final Boolean[] expected = {new Boolean(true), new Boolean(false), new Boolean(true)};
+            final Boolean[] expected = {Boolean.TRUE, Boolean.FALSE, Boolean.TRUE};
             final Boolean[] actual = ejbObject.returnBooleanObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java
index 58c21e4..4fc3721 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulBeanTxTests.java
@@ -181,7 +181,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase {
             final Account expected = new Account("123-45-6789", "Joe", "Cool", 40000);
             Account actual = new Account();
 
-            ejbObject.openAccount(expected, new Boolean(false));
+            ejbObject.openAccount(expected, Boolean.FALSE);
             actual = ejbObject.retreiveAccount(expected.getSsn());
 
             assertNotNull("The transaction was not commited.  The record is null", actual);
@@ -205,7 +205,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase {
         // Try and add the account in a transaction.  This should fail and 
         // throw a RollbackException
         try {
-            ejbObject.openAccount(expected, new Boolean(true));
+            ejbObject.openAccount(expected, Boolean.TRUE);
             fail("A javax.transaction.RollbackException should have been thrown.");
         } catch (final RollbackException re) {
             // Good.

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java
index 934f6b9..f688e37 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRmiIiopTests.java
@@ -132,7 +132,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient {
 
     public void test07_returnBooleanObject() {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
             final Boolean actual = ejbObject.returnBooleanObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -152,7 +152,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient {
 
     public void test09_returnBooleanObjectArray() {
         try {
-            final Boolean[] expected = {new Boolean(true), new Boolean(false), new Boolean(true)};
+            final Boolean[] expected = {Boolean.TRUE, Boolean.FALSE, Boolean.TRUE};
             final Boolean[] actual = ejbObject.returnBooleanObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java
index 4dc98b5..73515db 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessBeanTxTests.java
@@ -181,7 +181,7 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase
             final Account expected = new Account("123-45-6789", "Joe", "Cool", 40000);
             Account actual = new Account();
 
-            ejbObject.openAccount(expected, new Boolean(false));
+            ejbObject.openAccount(expected, Boolean.FALSE);
             actual = ejbObject.retreiveAccount(expected.getSsn());
 
             assertNotNull("The transaction was not commited.  The record is null", actual);
@@ -205,7 +205,7 @@ public class StatelessBeanTxTests extends org.apache.openejb.test.NamedTestCase
         // Try and add the account in a transaction.  This should fail and 
         // throw a RollbackException
         try {
-            ejbObject.openAccount(expected, new Boolean(true));
+            ejbObject.openAccount(expected, Boolean.TRUE);
             fail("A javax.transaction.RollbackException should have been thrown.");
         } catch (final RollbackException re) {
             // Good.

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java
index d72996d..bc3d7e2 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRmiIiopTests.java
@@ -133,7 +133,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient {
 
     public void test07_returnBooleanObject() {
         try {
-            final Boolean expected = new Boolean(true);
+            final Boolean expected = Boolean.TRUE;
             final Boolean actual = ejbObject.returnBooleanObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -153,7 +153,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient {
 
     public void test09_returnBooleanObjectArray() {
         try {
-            final Boolean[] expected = {new Boolean(true), new Boolean(false), new Boolean(true)};
+            final Boolean[] expected = {Boolean.TRUE, Boolean.FALSE, Boolean.TRUE};
             final Boolean[] actual = ejbObject.returnBooleanObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistrationTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistrationTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistrationTest.java
index 99edc4e..18ab6b9 100644
--- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistrationTest.java
+++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistrationTest.java
@@ -20,7 +20,6 @@ import org.apache.openejb.jee.WebApp;
 import org.apache.openejb.junit.ApplicationComposer;
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.observer.Observes;
-import org.apache.openejb.server.cxf.rs.event.ExtensionProviderRegistration;
 import org.apache.openejb.testing.Classes;
 import org.apache.openejb.testing.Configuration;
 import org.apache.openejb.testing.EnableServices;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ServerCreatedTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ServerCreatedTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ServerCreatedTest.java
index 100a7ab..a67836e 100644
--- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ServerCreatedTest.java
+++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/event/ServerCreatedTest.java
@@ -19,7 +19,6 @@ package org.apache.openejb.server.cxf.rs.event;
 import org.apache.openejb.jee.WebApp;
 import org.apache.openejb.junit.ApplicationComposer;
 import org.apache.openejb.observer.Observes;
-import org.apache.openejb.server.cxf.rs.event.ServerCreated;
 import org.apache.openejb.testing.Classes;
 import org.apache.openejb.testing.Configuration;
 import org.apache.openejb.testing.EnableServices;

http://git-wip-us.apache.org/repos/asf/tomee/blob/fc14d71d/server/openejb-server/src/main/java/org/apache/openejb/server/ServerServiceFilter.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/ServerServiceFilter.java b/server/openejb-server/src/main/java/org/apache/openejb/server/ServerServiceFilter.java
index 071c2cc..66d74f9 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/ServerServiceFilter.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/ServerServiceFilter.java
@@ -17,8 +17,6 @@
 package org.apache.openejb.server;
 
 import org.apache.openejb.monitoring.Managed;
-import org.apache.openejb.server.ServerService;
-import org.apache.openejb.server.ServiceException;
 
 import java.io.InputStream;
 import java.io.OutputStream;