You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2026/03/03 06:16:07 UTC

(tomee) branch tomee-10.x updated (7bd9744e15 -> e7b077b368)

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a change to branch tomee-10.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


    from 7bd9744e15 Small adjustments after cherry-picking changes from main. Some EE API versions were wrongly overridden in the examples leading to CI failures,
     new f70ac1be87 Remove unnecessary boxing and unboxing
     new 3c6e59b93e Simplify removal loops with Collection.removeIf
     new e7b077b368 Correct frequent spelling problems - occured -> occurred - opperations -> operations - programatically -> programmatically - hanlder -> handler - primitve -> primitive - exeption -> exception - spedified -> specified - preformance -> performance - wrappering -> wrapping - aquire -> acquire - senario -> scenario - Virtural -> Virtual - others...

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../arquillian/common/TomEEConfiguration.java      |  2 +-
 .../main/java/org/apache/ziplock/maven/Mvn.java    |  2 +-
 .../java/org/apache/openejb/ClassLoaderUtil.java   |  4 ++--
 .../src/main/java/org/apache/openejb/Injector.java |  2 +-
 .../openejb/assembler/classic/CmpJarBuilder.java   |  2 +-
 .../classic/EntityManagerFactoryCallable.java      |  2 +-
 .../openejb/assembler/classic/JndiEncBuilder.java  |  2 +-
 .../openejb/assembler/classic/MethodInfoUtil.java  |  2 +-
 .../org/apache/openejb/cdi/OpenEJBLifecycle.java   |  6 ++---
 .../apache/openejb/cdi/OptimizedLoaderService.java |  2 +-
 .../main/java/org/apache/openejb/cdi/Proxys.java   |  2 +-
 .../org/apache/openejb/cdi/WebappBeanManager.java  |  2 +-
 .../apache/openejb/classloader/WebAppEnricher.java |  4 ++--
 .../org/apache/openejb/config/ConfigUtils.java     |  4 ++--
 .../apache/openejb/config/DeploymentsResolver.java |  2 +-
 .../openejb/config/GeneratedClientModules.java     |  2 +-
 .../org/apache/openejb/config/NewLoaderLogic.java  |  4 ++--
 .../apache/openejb/config/OpenEjb2Conversion.java  |  2 +-
 .../apache/openejb/config/sys/ObjectFactory.java   |  2 +-
 .../apache/openejb/core/ConnectorReference.java    |  2 +-
 .../java/org/apache/openejb/core/EnvProps.java     |  2 +-
 .../org/apache/openejb/core/cmp/CmpContainer.java  |  8 +++----
 .../openejb/core/cmp/ComplexKeyGenerator.java      |  2 +-
 .../openejb/core/cmp/SimpleKeyGenerator.java       |  2 +-
 .../openejb/core/cmp/cmp2/Cmp1Generator.java       |  2 +-
 .../openejb/core/cmp/cmp2/Cmp2Generator.java       |  2 +-
 .../org/apache/openejb/core/cmp/cmp2/Cmp2Util.java |  6 ++---
 .../openejb/core/entity/EntityContainer.java       | 10 ++++-----
 .../openejb/core/entity/EntityInstanceManager.java |  2 +-
 .../openejb/core/ivm/naming/ClassReference.java    |  2 +-
 .../core/ivm/naming/InitContextFactory.java        |  2 +-
 .../core/ivm/naming/JaxWsServiceReference.java     |  2 +-
 .../openejb/core/ivm/naming/JndiReference.java     |  2 +-
 .../org/apache/openejb/core/managed/Instance.java  |  2 +-
 .../openejb/core/managed/ManagedContainer.java     | 14 ++++++------
 .../apache/openejb/core/managed/SimpleCache.java   | 18 +++++++--------
 .../apache/openejb/core/mdb/EndpointHandler.java   |  2 +-
 .../openejb/core/mdb/MdbInstanceFactory.java       |  4 ++--
 .../java/org/apache/openejb/core/mdb/State.java    |  4 ++--
 .../openejb/core/security/jaas/CDILoginModule.java |  2 +-
 .../openejb/core/singleton/SingletonContainer.java |  4 ++--
 .../org/apache/openejb/core/stateful/Instance.java |  2 +-
 .../apache/openejb/core/stateful/SimpleCache.java  | 20 ++++++++---------
 .../openejb/core/stateful/StatefulContainer.java   | 14 ++++++------
 .../openejb/core/timer/EjbTimerServiceImpl.java    | 12 +++++-----
 .../openejb/core/timer/MemoryTimerStore.java       | 20 ++++++++---------
 .../core/transaction/JtaTransactionPolicy.java     | 18 +++++++--------
 .../core/transaction/SimpleWorkManager.java        |  2 +-
 .../core/transaction/TransactionPolicy.java        |  6 ++---
 .../core/transaction/TransactionPolicyFactory.java |  2 +-
 .../core/webservices/PortAddressRegistryImpl.java  |  2 +-
 .../openejb/core/webservices/ProviderWrapper.java  |  2 +-
 .../java/org/apache/openejb/log/LoggerCreator.java |  2 +-
 .../org/apache/openejb/log/logger/Slf4jLogger.java |  2 +-
 .../math/stat/descriptive/moment/Skewness.java     |  2 +-
 .../org/apache/openejb/persistence/JtaQuery.java   |  2 +-
 .../openejb/resource/activemq/ActiveMQFactory.java |  2 +-
 .../jdbc/managed/local/LocalXAResource.java        |  2 +-
 .../jdbc/managed/local/ManagedConnection.java      |  2 +-
 .../java/org/apache/openejb/util/JarExtractor.java |  2 +-
 .../java/org/apache/openejb/util/Messages.java     |  2 +-
 .../main/java/org/apache/openejb/util/Pool.java    | 12 +++++-----
 .../java/org/apache/openejb/util/URISupport.java   |  2 +-
 .../java/org/apache/openejb/util/UrlCache.java     |  4 ++--
 .../apache/openejb/util/proxy/ClassDefiner.java    |  6 ++---
 .../openejb/util/resources/Messages.properties     |  4 ++--
 .../src/main/resources/schema/openejb-jar.xsd      |  4 ++--
 .../resource/jdbc/DynamicDataSourceTest.java       |  2 +-
 ...sConfigFlowDefinitionFlowCallFlowReference.java |  2 +-
 .../org/apache/openejb/jee/KeyedCollection.java    |  2 +-
 .../java/org/apache/openejb/jee/ObjectFactory.java |  2 +-
 .../org/apache/openejb/jee/bval/ObjectFactory.java |  2 +-
 .../org/apache/openejb/jee/jba/ObjectFactory.java  |  2 +-
 .../apache/openejb/jee/jba/cmp/ObjectFactory.java  |  2 +-
 .../org/apache/openejb/jee/jpa/ObjectFactory.java  |  2 +-
 .../apache/openejb/jee/jpa/unit/ObjectFactory.java |  2 +-
 .../apache/openejb/jee/oejb2/ObjectFactory.java    |  2 +-
 .../apache/openejb/jee/oejb3/ObjectFactory.java    |  2 +-
 .../org/apache/openejb/jee/sun/ObjectFactory.java  |  2 +-
 .../openejb/jee/was/v6/common/ObjectFactory.java   |  2 +-
 .../jee/was/v6/commonbnd/ObjectFactory.java        |  2 +-
 .../openejb/jee/was/v6/ecore/ObjectFactory.java    |  2 +-
 .../openejb/jee/was/v6/ejb/ObjectFactory.java      |  2 +-
 .../openejb/jee/was/v6/ejbbnd/ObjectFactory.java   |  2 +-
 .../openejb/jee/was/v6/java/ObjectFactory.java     |  2 +-
 .../was/v6/webservice/clientbnd/ObjectFactory.java |  2 +-
 .../openejb/jee/was/v6/wsclient/ObjectFactory.java |  2 +-
 .../openejb/jee/was/v6/xmi/ObjectFactory.java      |  2 +-
 .../org/apache/openejb/jee/wls/ObjectFactory.java  |  2 +-
 .../openejb/jpa/integration/MakeTxLookup.java      |  4 ++--
 .../org/apache/openejb/junit/ContextConfig.java    |  4 ++--
 .../org/apache/openejb/junit/context/Util.java     |  4 ++--
 docs/admin/configuration/server.adoc               |  2 +-
 .../cdi/inject/dynamic/FinalizePayment.java        | 14 ++++++------
 .../superbiz/executor/ManagedScheduledService.java |  4 ++--
 .../dynamicdatasourcerouting/DeterminedRouter.java |  2 +-
 examples/pojo-webservice/soapui.log                |  6 ++---
 .../main/java/jug/client/util/CommandManager.java  |  2 +-
 .../main/java/org/superbiz/event/MyListener.java   |  2 +-
 .../src/main/java/org/foo/SingletonC.java          |  2 +-
 .../apache/openejb/test/beans/EmployeeBean.java    | 10 ++++-----
 .../openejb/test/beans/ShoppingCartBean.java       |  2 +-
 .../test/entity/bmp/AllowedOperationsBmpBean.java  |  8 +++----
 .../test/entity/bmp/BasicBmp2DataSourcesBean.java  | 12 +++++-----
 .../entity/bmp/BasicBmp2DataSourcesObject.java     |  4 ++--
 .../openejb/test/entity/bmp/BasicBmpBean.java      | 10 ++++-----
 .../openejb/test/entity/bmp/BasicBmpObject.java    |  4 ++--
 .../test/entity/bmp/ContextLookupBmpBean.java      | 18 +++++++--------
 .../apache/openejb/test/entity/bmp/EncBmpBean.java | 18 +++++++--------
 .../openejb/test/entity/bmp/RmiIiopBmpBean.java    |  4 ++--
 .../test/entity/cmp/AllowedOperationsCmp2Bean.java |  4 ++--
 .../test/entity/cmp/AllowedOperationsCmpBean.java  |  4 ++--
 .../openejb/test/entity/cmp/BasicCmp2Bean.java     |  4 ++--
 .../openejb/test/entity/cmp/BasicCmp2PojoBean.java |  4 ++--
 .../openejb/test/entity/cmp/BasicCmpBean.java      |  4 ++--
 .../openejb/test/entity/cmp/BasicCmpObject.java    |  4 ++--
 .../openejb/test/entity/cmp/ComplexCmp2Bean.java   |  4 ++--
 .../openejb/test/entity/cmp/ComplexCmpBean.java    |  4 ++--
 .../openejb/test/entity/cmp/ComplexCmpObject.java  |  4 ++--
 .../test/entity/cmp/ContextLookupCmpBean.java      | 14 ++++++------
 .../openejb/test/entity/cmp/EncCmp2Bean.java       | 14 ++++++------
 .../apache/openejb/test/entity/cmp/EncCmpBean.java | 14 ++++++------
 .../openejb/test/entity/cmp/UnknownCmp2Bean.java   |  4 ++--
 .../openejb/test/entity/cmp/UnknownCmpBean.java    |  4 ++--
 .../openejb/test/entity/cmp/UnknownCmpObject.java  |  4 ++--
 .../org/apache/openejb/test/mdb/BasicMdbBean.java  |  4 ++--
 .../apache/openejb/test/mdb/BasicMdbObject.java    |  4 ++--
 .../AnnotatedFieldInjectionSingletonBean.java      | 14 ++++++------
 .../openejb/test/singleton/BasicSingletonBean.java |  4 ++--
 .../singleton/BasicSingletonBusinessLocal.java     |  4 ++--
 .../singleton/BasicSingletonBusinessRemote.java    |  4 ++--
 .../test/singleton/BasicSingletonLocalObject.java  |  4 ++--
 .../test/singleton/BasicSingletonObject.java       |  4 ++--
 .../test/singleton/BasicSingletonPojoBean.java     |  4 ++--
 .../test/singleton/BeanTxSingletonBean.java        |  2 +-
 .../test/singleton/ContextLookupSingletonBean.java | 14 ++++++------
 .../singleton/ContextLookupSingletonPojoBean.java  | 14 ++++++------
 .../openejb/test/singleton/EncSingletonBean.java   | 14 ++++++------
 .../singleton/FieldInjectionSingletonBean.java     | 14 ++++++------
 .../singleton/SetterInjectionSingletonBean.java    | 14 ++++++------
 .../AnnotatedFieldInjectionStatefulBean.java       | 14 ++++++------
 .../openejb/test/stateful/BMTStatefulBean.java     |  4 ++--
 .../openejb/test/stateful/BasicStatefulBean.java   |  4 ++--
 .../test/stateful/BasicStatefulBusinessLocal.java  |  4 ++--
 .../test/stateful/BasicStatefulBusinessRemote.java |  4 ++--
 .../test/stateful/BasicStatefulLocalObject.java    |  4 ++--
 .../openejb/test/stateful/BasicStatefulObject.java |  4 ++--
 .../test/stateful/BasicStatefulPojoBean.java       |  4 ++--
 .../openejb/test/stateful/BeanTxStatefulBean.java  |  2 +-
 .../test/stateful/ContextLookupStatefulBean.java   | 14 ++++++------
 .../stateful/ContextLookupStatefulPojoBean.java    | 14 ++++++------
 .../openejb/test/stateful/EncStatefulBean.java     | 14 ++++++------
 .../test/stateful/FieldInjectionStatefulBean.java  | 14 ++++++------
 .../stateful/PersistenceContextStatefulBean.java   | 12 +++++-----
 .../test/stateful/SetterInjectionStatefulBean.java | 14 ++++++------
 .../AnnotatedFieldInjectionStatelessBean.java      | 14 ++++++------
 .../openejb/test/stateless/BasicStatelessBean.java |  4 ++--
 .../stateless/BasicStatelessBusinessLocal.java     |  4 ++--
 .../stateless/BasicStatelessBusinessRemote.java    |  4 ++--
 .../test/stateless/BasicStatelessLocalObject.java  |  4 ++--
 .../test/stateless/BasicStatelessObject.java       |  4 ++--
 .../test/stateless/BasicStatelessPojoBean.java     |  4 ++--
 .../test/stateless/BeanTxStatelessBean.java        |  2 +-
 .../test/stateless/ContextLookupStatelessBean.java | 14 ++++++------
 .../stateless/ContextLookupStatelessPojoBean.java  | 14 ++++++------
 .../openejb/test/stateless/EncStatelessBean.java   | 14 ++++++------
 .../stateless/FieldInjectionStatelessBean.java     | 14 ++++++------
 .../stateless/SetterInjectionStatelessBean.java    | 14 ++++++------
 .../java/org/apache/openejb/test/RiTestServer.java |  2 +-
 .../test/entity/bmp/BmpAllowedOperationsTests.java |  2 +-
 .../openejb/test/entity/bmp/BmpRmiIiopTests.java   |  8 +++----
 .../test/entity/cmp/CmpAllowedOperationsTests.java |  2 +-
 .../openejb/test/entity/cmp/CmpRmiIiopTests.java   |  8 +++----
 .../entity/cmp2/Cmp2AllowedOperationsTests.java    |  2 +-
 .../openejb/test/entity/cmp2/Cmp2RmiIiopTests.java |  8 +++----
 .../openejb/test/entity/cmr/CmrMappingTests.java   |  8 +++----
 .../test/entity/cmr/OneToManyComplexPkTests.java   | 26 +++++++++++-----------
 .../openejb/test/entity/cmr/OneToManyTests.java    | 26 +++++++++++-----------
 .../test/entity/cmr/OneToOneComplexPkTests.java    |  2 +-
 .../openejb/test/entity/cmr/OneToOneTests.java     |  2 +-
 .../org/apache/openejb/test/mdb/MdbTestSuite.java  |  2 +-
 .../BMTSingletonAllowedOperationsTests.java        |  2 +-
 .../singleton/SingletonAllowedOperationsTests.java |  2 +-
 .../test/singleton/SingletonBeanTxTests.java       | 10 ++++-----
 .../SingletonLocalBusinessIntfcTests.java          |  2 +-
 .../SingletonRemoteBusinessIntfcTests.java         |  2 +-
 .../test/singleton/SingletonRmiIiopTests.java      |  8 +++----
 .../BMTStatefulAllowedOperationsTests.java         |  2 +-
 .../stateful/StatefulAllowedOperationsTests.java   |  2 +-
 .../openejb/test/stateful/StatefulBeanTxTests.java | 14 ++++++------
 .../stateful/StatefulLocalBusinessIntfcTests.java  |  2 +-
 .../stateful/StatefulRemoteBusinessIntfcTests.java |  2 +-
 .../test/stateful/StatefulRmiIiopTests.java        |  8 +++----
 .../BMTStatelessAllowedOperationsTests.java        |  2 +-
 .../stateless/StatelessAllowedOperationsTests.java |  2 +-
 .../StatelessLocalBusinessIntfcTests.java          |  2 +-
 .../StatelessRemoteBusinessIntfcTests.java         |  2 +-
 .../test/stateless/StatelessRmiIiopTests.java      |  8 +++----
 .../stateful/SecondStatefulInterceptedBean.java    |  2 +-
 .../test/stateful/StatefulInterceptedBean.java     |  2 +-
 .../stateful/ThirdStatefulInterceptedBean.java     |  2 +-
 .../stateless/SecondStatelessInterceptedBean.java  |  2 +-
 .../stateless/ThirdStatelessInterceptedBean.java   |  2 +-
 .../openejb/maven/plugins/TomEEEmbeddedMojo.java   |  6 ++---
 .../jwt/bval/JwtValidationGenerator.java           |  2 +-
 .../microprofile/jwt/bval/ValidationGenerator.java |  2 +-
 .../jwt/principal/JWTCallerPrincipal.java          |  4 ++--
 .../java/org/apache/openejb/client/Client.java     |  4 ++--
 .../openejb/client/ClientInjectionProcessor.java   |  4 ++--
 .../org/apache/openejb/client/ClientSecurity.java  | 10 ++++-----
 .../openejb/client/JaxWsProviderWrapper.java       |  4 ++--
 .../org/apache/openejb/server/cli/CliRunnable.java |  2 +-
 .../openejb/server/cxf/rs/CdiResourceProvider.java |  2 +-
 .../client/WebServiceInjectionConfigurator.java    |  2 +-
 .../openejb/server/cxf/pojo/PojoEndpoint.java      |  8 +------
 .../openejb/server/ejbd/ClientObjectFactory.java   | 16 ++++++-------
 .../openejb/server/ejbd/EjbRequestHandler.java     |  2 +-
 .../openejb/server/hessian/HessianServer.java      |  2 +-
 .../apache/openejb/server/httpd/HttpRequest.java   |  2 +-
 .../openejb/server/httpd/HttpRequestImpl.java      |  6 ++---
 .../server/discovery/MulticastPulseAgent.java      |  2 +-
 .../apache/openejb/server/discovery/Tracker.java   |  2 +-
 .../openejb/server/SimpleServiceManager.java       |  2 +-
 .../server/auth/StartWithIPAddressPermission.java  |  4 ++--
 .../catalina/deployment/TomcatWebappDeployer.java  |  7 +-----
 .../java/org/apache/tomee/embedded/Container.java  |  9 ++------
 .../apache/tomee/jaxrs/ReloadingLoaderTest.java    |  2 +-
 .../org/apache/tomee/loader/filter/Filters.java    |  8 +------
 .../myfaces/TomEEFacesConfigResourceProvider.java  |  8 +------
 .../myfaces/TomEEMyFacesContainerInitializer.java  |  8 +------
 230 files changed, 598 insertions(+), 632 deletions(-)


(tomee) 01/03: Remove unnecessary boxing and unboxing

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-10.x
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit f70ac1be87aa975e48c6d95ecf9dfd417e09d287
Author: Martin Wiesner <ma...@hs-heilbronn.de>
AuthorDate: Sun Mar 1 19:30:06 2026 +0100

    Remove unnecessary boxing and unboxing
    
    (cherry picked from commit dbd45d18bb0de684a0fa8ecf6a0747d32211cd43)
---
 .../apache/openejb/util/proxy/ClassDefiner.java    |  2 +-
 .../apache/openejb/test/beans/EmployeeBean.java    | 10 ++++-----
 .../test/entity/bmp/AllowedOperationsBmpBean.java  |  4 ++--
 .../test/entity/bmp/BasicBmp2DataSourcesBean.java  |  8 +++----
 .../openejb/test/entity/bmp/BasicBmpBean.java      |  6 ++---
 .../test/entity/bmp/ContextLookupBmpBean.java      | 18 +++++++--------
 .../apache/openejb/test/entity/bmp/EncBmpBean.java | 18 +++++++--------
 .../openejb/test/entity/bmp/RmiIiopBmpBean.java    |  4 ++--
 .../test/entity/cmp/ContextLookupCmpBean.java      | 14 ++++++------
 .../openejb/test/entity/cmp/EncCmp2Bean.java       | 14 ++++++------
 .../apache/openejb/test/entity/cmp/EncCmpBean.java | 14 ++++++------
 .../AnnotatedFieldInjectionSingletonBean.java      | 14 ++++++------
 .../test/singleton/BeanTxSingletonBean.java        |  2 +-
 .../test/singleton/ContextLookupSingletonBean.java | 14 ++++++------
 .../singleton/ContextLookupSingletonPojoBean.java  | 14 ++++++------
 .../openejb/test/singleton/EncSingletonBean.java   | 14 ++++++------
 .../singleton/FieldInjectionSingletonBean.java     | 14 ++++++------
 .../singleton/SetterInjectionSingletonBean.java    | 14 ++++++------
 .../AnnotatedFieldInjectionStatefulBean.java       | 14 ++++++------
 .../openejb/test/stateful/BeanTxStatefulBean.java  |  2 +-
 .../test/stateful/ContextLookupStatefulBean.java   | 14 ++++++------
 .../stateful/ContextLookupStatefulPojoBean.java    | 14 ++++++------
 .../openejb/test/stateful/EncStatefulBean.java     | 14 ++++++------
 .../test/stateful/FieldInjectionStatefulBean.java  | 14 ++++++------
 .../test/stateful/SetterInjectionStatefulBean.java | 14 ++++++------
 .../AnnotatedFieldInjectionStatelessBean.java      | 14 ++++++------
 .../test/stateless/BeanTxStatelessBean.java        |  2 +-
 .../test/stateless/ContextLookupStatelessBean.java | 14 ++++++------
 .../stateless/ContextLookupStatelessPojoBean.java  | 14 ++++++------
 .../openejb/test/stateless/EncStatelessBean.java   | 14 ++++++------
 .../stateless/FieldInjectionStatelessBean.java     | 14 ++++++------
 .../stateless/SetterInjectionStatelessBean.java    | 14 ++++++------
 .../openejb/test/entity/bmp/BmpRmiIiopTests.java   |  8 +++----
 .../openejb/test/entity/cmp/CmpRmiIiopTests.java   |  8 +++----
 .../openejb/test/entity/cmp2/Cmp2RmiIiopTests.java |  8 +++----
 .../openejb/test/entity/cmr/CmrMappingTests.java   |  8 +++----
 .../test/entity/cmr/OneToManyComplexPkTests.java   | 26 +++++++++++-----------
 .../openejb/test/entity/cmr/OneToManyTests.java    | 26 +++++++++++-----------
 .../test/entity/cmr/OneToOneComplexPkTests.java    |  2 +-
 .../openejb/test/entity/cmr/OneToOneTests.java     |  2 +-
 .../SingletonLocalBusinessIntfcTests.java          |  2 +-
 .../SingletonRemoteBusinessIntfcTests.java         |  2 +-
 .../test/singleton/SingletonRmiIiopTests.java      |  8 +++----
 .../stateful/StatefulLocalBusinessIntfcTests.java  |  2 +-
 .../stateful/StatefulRemoteBusinessIntfcTests.java |  2 +-
 .../test/stateful/StatefulRmiIiopTests.java        |  8 +++----
 .../StatelessLocalBusinessIntfcTests.java          |  2 +-
 .../StatelessRemoteBusinessIntfcTests.java         |  2 +-
 .../test/stateless/StatelessRmiIiopTests.java      |  8 +++----
 .../jwt/principal/JWTCallerPrincipal.java          |  2 +-
 .../java/org/apache/openejb/client/Client.java     |  4 ++--
 .../server/auth/StartWithIPAddressPermission.java  |  4 ++--
 52 files changed, 252 insertions(+), 252 deletions(-)

diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java
index 0540c98633..33531e1eca 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java
@@ -93,7 +93,7 @@ public class ClassDefiner implements DefiningClassService, InstantiatingClassSer
                                            final Class<?> originalClass, final ProtectionDomain protectionDomain) {
         try {
             return (Class<?>) CLASS_LOADER_DEFINE_CLASS.invoke(
-                    loader, className, b, Integer.valueOf(0), Integer.valueOf(b.length), protectionDomain);
+                    loader, className, b, 0, b.length, protectionDomain);
         } catch (final Exception e) {
             throw e instanceof RuntimeException ? ((RuntimeException) e) : new RuntimeException(e);
         }
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java
index c71271e2c4..854b5d0e59 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java
@@ -48,7 +48,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean {
             try {
                 final PreparedStatement stmt = con.prepareStatement("select * from Employees where EmployeeID = ?");
                 try {
-                    stmt.setInt(1, primaryKey.intValue());
+                    stmt.setInt(1, primaryKey);
                     final ResultSet rs = stmt.executeQuery();
                     found = rs.next();
                 } finally {
@@ -85,7 +85,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean {
                     final ResultSet rs = stmt.executeQuery("select EmployeeID from Employees");
                     keys = new java.util.Vector();
                     while (rs.next()) {
-                        keys.addElement(new Integer(rs.getInt("EmployeeID")));
+                        keys.addElement(rs.getInt("EmployeeID"));
                     }
                 } finally {
                     stmt.close();
@@ -132,7 +132,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean {
                 con.close();
             }
 
-            return new Integer(id);
+            return id;
 
         } catch (final Exception e) {
             e.printStackTrace();
@@ -167,7 +167,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean {
                 final PreparedStatement stmt = con.prepareStatement("select * from Employees where EmployeeID = ?");
                 try {
                     final Integer primaryKey = (Integer) ejbContext.getPrimaryKey();
-                    stmt.setInt(1, primaryKey.intValue());
+                    stmt.setInt(1, primaryKey);
                     final ResultSet rs = stmt.executeQuery();
                     while (rs.next()) {
                         lastName = rs.getString("LastName");
@@ -232,7 +232,7 @@ public class EmployeeBean implements jakarta.ejb.EntityBean {
                 final PreparedStatement stmt = con.prepareStatement("delete from Employees where EmployeeID = ?");
                 try {
                     final Integer primaryKey = (Integer) ejbContext.getPrimaryKey();
-                    stmt.setInt(1, primaryKey.intValue());
+                    stmt.setInt(1, primaryKey);
                     stmt.executeUpdate();
                 } finally {
                     stmt.close();
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
index 8eec80e0bb..e399491525 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
@@ -80,7 +80,7 @@ public class AllowedOperationsBmpBean implements jakarta.ejb.EntityBean {
      */
     public Integer ejbFindByPrimaryKey(final Integer primaryKey) {
         testAllowedOperations("ejbFind");
-        return new Integer(-1);
+        return -1;
     }
 
     /**
@@ -89,7 +89,7 @@ public class AllowedOperationsBmpBean implements jakarta.ejb.EntityBean {
     public Integer ejbCreateObject(final String name) throws CreateException {
         testAllowedOperations("ejbCreate");
 
-        return new Integer(-1);
+        return -1;
     }
 
     public void ejbPostCreateObject(final String name) throws CreateException {
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java
index 79d3c4f481..34b36b4a08 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java
@@ -89,7 +89,7 @@ public class BasicBmp2DataSourcesBean implements jakarta.ejb.EntityBean {
             try {
                 final PreparedStatement stmt = con.prepareStatement("select * from entity where id = ?");
                 try {
-                    stmt.setInt(1, primaryKey.intValue());
+                    stmt.setInt(1, primaryKey);
                     found = stmt.executeQuery().next();
                 } finally {
                     stmt.close();
@@ -172,7 +172,7 @@ public class BasicBmp2DataSourcesBean implements jakarta.ejb.EntityBean {
             }
 
 
-            return new Integer(primaryKey);
+            return primaryKey;
 
         } catch (final Exception e) {
             e.printStackTrace();
@@ -253,7 +253,7 @@ public class BasicBmp2DataSourcesBean implements jakarta.ejb.EntityBean {
                 final PreparedStatement stmt = con.prepareStatement("select * from entity where id = ?");
                 try {
                     final Integer primaryKey = (Integer) ejbContext.getPrimaryKey();
-                    stmt.setInt(1, primaryKey.intValue());
+                    stmt.setInt(1, primaryKey);
                     final ResultSet rs = stmt.executeQuery();
                     while (rs.next()) {
                         lastName = rs.getString("last_name");
@@ -334,7 +334,7 @@ public class BasicBmp2DataSourcesBean implements jakarta.ejb.EntityBean {
                 final PreparedStatement stmt = con.prepareStatement("delete from entity where id = ?");
                 try {
                     final Integer primaryKey = (Integer) ejbContext.getPrimaryKey();
-                    stmt.setInt(1, primaryKey.intValue());
+                    stmt.setInt(1, primaryKey);
                     stmt.executeUpdate();
                 } finally {
                     stmt.close();
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
index 4ecc743fa8..3dddde501b 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
@@ -109,7 +109,7 @@ public class BasicBmpBean implements jakarta.ejb.EntityBean {
             try {
                 final PreparedStatement stmt = con.prepareStatement("select * from entity where id = ?");
                 try {
-                    stmt.setInt(1, primaryKey.intValue());
+                    stmt.setInt(1, primaryKey);
                     found = stmt.executeQuery().next();
                 } finally {
                     stmt.close();
@@ -146,7 +146,7 @@ public class BasicBmpBean implements jakarta.ejb.EntityBean {
                 try {
                     stmt.setString(1, lastName);
                     final ResultSet set = stmt.executeQuery();
-                    while (set.next()) keys.add(new Integer(set.getInt("id")));
+                    while (set.next()) keys.add(set.getInt("id"));
                 } finally {
                     stmt.close();
                 }
@@ -211,7 +211,7 @@ public class BasicBmpBean implements jakarta.ejb.EntityBean {
                 con.close();
             }
 
-            return new Integer(primaryKey);
+            return primaryKey;
 
         } catch (final Exception e) {
             e.printStackTrace();
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 0df85af336..75035955e7 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
@@ -77,7 +77,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean {
      */
     public Integer ejbFindByPrimaryKey(final Integer primaryKey)
         throws jakarta.ejb.FinderException {
-        return new Integer(-1);
+        return -1;
     }
 
     /**
@@ -90,7 +90,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean {
      */
     public Integer ejbCreate(final String name)
         throws jakarta.ejb.CreateException {
-        return new Integer(-1);
+        return -1;
     }
 
     public void ejbPostCreate(final String name)
@@ -226,7 +226,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean {
     public void lookupDoubleEntry() throws TestFailureException {
         try {
             try {
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ejbContext.lookup("entity/bmp/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -243,7 +243,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean {
     public void lookupLongEntry() throws TestFailureException {
         try {
             try {
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ejbContext.lookup("entity/bmp/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -260,7 +260,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean {
     public void lookupFloatEntry() throws TestFailureException {
         try {
             try {
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ejbContext.lookup("entity/bmp/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -277,7 +277,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean {
     public void lookupIntegerEntry() throws TestFailureException {
         try {
             try {
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ejbContext.lookup("entity/bmp/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -294,7 +294,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean {
     public void lookupShortEntry() throws TestFailureException {
         try {
             try {
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ejbContext.lookup("entity/bmp/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -328,7 +328,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean {
     public void lookupByteEntry() throws TestFailureException {
         try {
             try {
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ejbContext.lookup("entity/bmp/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -346,7 +346,7 @@ public class ContextLookupBmpBean implements jakarta.ejb.EntityBean {
     public void lookupCharacterEntry() throws TestFailureException {
         try {
             try {
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ejbContext.lookup("entity/bmp/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 1e83eaafcc..716cc9a278 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
@@ -79,7 +79,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean {
      */
     public Integer ejbFindByPrimaryKey(final Integer primaryKey)
         throws jakarta.ejb.FinderException {
-        return new Integer(-1);
+        return -1;
     }
 
     /**
@@ -92,7 +92,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean {
      */
     public Integer ejbCreate(final String name)
         throws jakarta.ejb.CreateException {
-        return new Integer(-1);
+        return -1;
     }
 
     public void ejbPostCreate(final String name)
@@ -259,7 +259,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ctx.lookup("java:comp/env/entity/bmp/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -279,7 +279,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ctx.lookup("java:comp/env/entity/bmp/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -299,7 +299,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ctx.lookup("java:comp/env/entity/bmp/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -319,7 +319,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ctx.lookup("java:comp/env/entity/bmp/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -339,7 +339,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ctx.lookup("java:comp/env/entity/bmp/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -379,7 +379,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ctx.lookup("java:comp/env/entity/bmp/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -400,7 +400,7 @@ public class EncBmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ctx.lookup("java:comp/env/entity/bmp/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/RmiIiopBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/RmiIiopBmpBean.java
index 39388f6be1..4733e6dadc 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/RmiIiopBmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/RmiIiopBmpBean.java
@@ -62,7 +62,7 @@ public class RmiIiopBmpBean implements jakarta.ejb.EntityBean {
      */
     public Integer ejbFindByPrimaryKey(final Integer primaryKey)
         throws jakarta.ejb.FinderException {
-        return new Integer(-1);
+        return -1;
     }
 
     /**
@@ -75,7 +75,7 @@ public class RmiIiopBmpBean implements jakarta.ejb.EntityBean {
      */
     public Integer ejbCreate(final String name)
         throws jakarta.ejb.CreateException {
-        return new Integer(-1);
+        return -1;
     }
 
     public void ejbPostCreate(final String name)
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 9387af8fd9..da0ba2a5f1 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
@@ -204,7 +204,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean {
     public void lookupDoubleEntry() throws TestFailureException {
         try {
             try {
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ejbContext.lookup("entity/cmp/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -221,7 +221,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean {
     public void lookupLongEntry() throws TestFailureException {
         try {
             try {
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ejbContext.lookup("entity/cmp/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -238,7 +238,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean {
     public void lookupFloatEntry() throws TestFailureException {
         try {
             try {
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ejbContext.lookup("entity/cmp/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -255,7 +255,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean {
     public void lookupIntegerEntry() throws TestFailureException {
         try {
             try {
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ejbContext.lookup("entity/cmp/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -272,7 +272,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean {
     public void lookupShortEntry() throws TestFailureException {
         try {
             try {
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ejbContext.lookup("entity/cmp/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -306,7 +306,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean {
     public void lookupByteEntry() throws TestFailureException {
         try {
             try {
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ejbContext.lookup("entity/cmp/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -323,7 +323,7 @@ public class ContextLookupCmpBean implements jakarta.ejb.EntityBean {
     public void lookupCharacterEntry() throws TestFailureException {
         try {
             try {
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ejbContext.lookup("entity/cmp/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 bb734fffd4..9ca12972be 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
@@ -239,7 +239,7 @@ public abstract class EncCmp2Bean implements EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ctx.lookup("java:comp/env/entity/cmp/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -259,7 +259,7 @@ public abstract class EncCmp2Bean implements EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ctx.lookup("java:comp/env/entity/cmp/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -279,7 +279,7 @@ public abstract class EncCmp2Bean implements EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ctx.lookup("java:comp/env/entity/cmp/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -299,7 +299,7 @@ public abstract class EncCmp2Bean implements EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ctx.lookup("java:comp/env/entity/cmp/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -319,7 +319,7 @@ public abstract class EncCmp2Bean implements EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ctx.lookup("java:comp/env/entity/cmp/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -359,7 +359,7 @@ public abstract class EncCmp2Bean implements EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ctx.lookup("java:comp/env/entity/cmp/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -379,7 +379,7 @@ public abstract class EncCmp2Bean implements EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ctx.lookup("java:comp/env/entity/cmp/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 b20ece2013..0a098996cb 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
@@ -238,7 +238,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ctx.lookup("java:comp/env/entity/cmp/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -258,7 +258,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ctx.lookup("java:comp/env/entity/cmp/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -278,7 +278,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ctx.lookup("java:comp/env/entity/cmp/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -298,7 +298,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ctx.lookup("java:comp/env/entity/cmp/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -318,7 +318,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ctx.lookup("java:comp/env/entity/cmp/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -358,7 +358,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ctx.lookup("java:comp/env/entity/cmp/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -378,7 +378,7 @@ public class EncCmpBean implements jakarta.ejb.EntityBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ctx.lookup("java:comp/env/entity/cmp/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 f0fb0d9f8a..ac27171f90 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
@@ -187,7 +187,7 @@ public class AnnotatedFieldInjectionSingletonBean {
 
     public void lookupDoubleEntry() throws TestFailureException {
         try {
-            final Double expected = new Double(1.0D);
+            final Double expected = 1.0D;
 
             Assert.assertNotNull("The Double looked up is null", doouble);
             Assert.assertEquals(expected, doouble);
@@ -199,7 +199,7 @@ public class AnnotatedFieldInjectionSingletonBean {
 
     public void lookupLongEntry() throws TestFailureException {
         try {
-            final Long expected = new Long(1L);
+            final Long expected = 1L;
 
             Assert.assertNotNull("The Long looked up is null", loong);
             Assert.assertEquals(expected, loong);
@@ -210,7 +210,7 @@ public class AnnotatedFieldInjectionSingletonBean {
 
     public void lookupFloatEntry() throws TestFailureException {
         try {
-            final Float expected = new Float(1.0F);
+            final Float expected = 1.0F;
 
             Assert.assertNotNull("The Float looked up is null", flooat);
             Assert.assertEquals(expected, flooat);
@@ -221,7 +221,7 @@ public class AnnotatedFieldInjectionSingletonBean {
 
     public void lookupIntegerEntry() throws TestFailureException {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
 
             Assert.assertNotNull("The Integer looked up is null", inteeger);
             Assert.assertEquals(expected, inteeger);
@@ -233,7 +233,7 @@ public class AnnotatedFieldInjectionSingletonBean {
 
     public void lookupShortEntry() throws TestFailureException {
         try {
-            final Short expected = new Short((short) 1);
+            final Short expected = (short) 1;
 
             Assert.assertNotNull("The Short looked up is null", shoort);
             Assert.assertEquals(expected, shoort);
@@ -255,7 +255,7 @@ public class AnnotatedFieldInjectionSingletonBean {
 
     public void lookupByteEntry() throws TestFailureException {
         try {
-            final Byte expected = new Byte((byte) 1);
+            final Byte expected = (byte) 1;
 
             Assert.assertNotNull("The Byte looked up is null", byyte);
             Assert.assertEquals(expected, byyte);
@@ -266,7 +266,7 @@ public class AnnotatedFieldInjectionSingletonBean {
 
     public void lookupCharacterEntry() throws TestFailureException {
         try {
-            final Character expected = new Character('D');
+            final Character expected = 'D';
 
             Assert.assertNotNull("The Character looked up is null", chaaracter);
             Assert.assertEquals(expected, chaaracter);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BeanTxSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BeanTxSingletonBean.java
index 114d02e229..b5200bbf0f 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BeanTxSingletonBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BeanTxSingletonBean.java
@@ -100,7 +100,7 @@ public class BeanTxSingletonBean implements jakarta.ejb.SessionBean {
                 }
 
                 /*[3] Commit or Rollback the transaction */
-                if (rollback.booleanValue()) ut.setRollbackOnly();
+                if (rollback) ut.setRollbackOnly();
 
                 /*[4] Commit or Rollback the transaction */
                 ut.commit();
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 3462ff8f3e..1b732d7817 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
@@ -202,7 +202,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean {
     public void lookupDoubleEntry() throws TestFailureException {
         try {
             try {
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ejbContext.lookup("singleton/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -219,7 +219,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean {
     public void lookupLongEntry() throws TestFailureException {
         try {
             try {
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ejbContext.lookup("singleton/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -236,7 +236,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean {
     public void lookupFloatEntry() throws TestFailureException {
         try {
             try {
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ejbContext.lookup("singleton/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -253,7 +253,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean {
     public void lookupIntegerEntry() throws TestFailureException {
         try {
             try {
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ejbContext.lookup("singleton/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -270,7 +270,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean {
     public void lookupShortEntry() throws TestFailureException {
         try {
             try {
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ejbContext.lookup("singleton/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -304,7 +304,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean {
     public void lookupByteEntry() throws TestFailureException {
         try {
             try {
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ejbContext.lookup("singleton/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -321,7 +321,7 @@ public class ContextLookupSingletonBean implements jakarta.ejb.SessionBean {
     public void lookupCharacterEntry() throws TestFailureException {
         try {
             try {
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ejbContext.lookup("singleton/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 11ff68ee2e..44eeb1617c 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
@@ -184,7 +184,7 @@ public class ContextLookupSingletonPojoBean {
     public void lookupDoubleEntry() throws TestFailureException {
         try {
             try {
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) getSessionContext().lookup("singleton/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -201,7 +201,7 @@ public class ContextLookupSingletonPojoBean {
     public void lookupLongEntry() throws TestFailureException {
         try {
             try {
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) getSessionContext().lookup("singleton/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -218,7 +218,7 @@ public class ContextLookupSingletonPojoBean {
     public void lookupFloatEntry() throws TestFailureException {
         try {
             try {
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) getSessionContext().lookup("singleton/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -235,7 +235,7 @@ public class ContextLookupSingletonPojoBean {
     public void lookupIntegerEntry() throws TestFailureException {
         try {
             try {
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) getSessionContext().lookup("singleton/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -252,7 +252,7 @@ public class ContextLookupSingletonPojoBean {
     public void lookupShortEntry() throws TestFailureException {
         try {
             try {
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) getSessionContext().lookup("singleton/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -286,7 +286,7 @@ public class ContextLookupSingletonPojoBean {
     public void lookupByteEntry() throws TestFailureException {
         try {
             try {
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) getSessionContext().lookup("singleton/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -303,7 +303,7 @@ public class ContextLookupSingletonPojoBean {
     public void lookupCharacterEntry() throws TestFailureException {
         try {
             try {
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) getSessionContext().lookup("singleton/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 d00e810a50..d39f43d370 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
@@ -243,7 +243,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ctx.lookup("java:comp/env/singleton/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -263,7 +263,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ctx.lookup("java:comp/env/singleton/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -283,7 +283,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ctx.lookup("java:comp/env/singleton/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -303,7 +303,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ctx.lookup("java:comp/env/singleton/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -323,7 +323,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ctx.lookup("java:comp/env/singleton/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -363,7 +363,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ctx.lookup("java:comp/env/singleton/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -383,7 +383,7 @@ public class EncSingletonBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ctx.lookup("java:comp/env/singleton/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 59493a17c2..34021591e3 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
@@ -159,7 +159,7 @@ public class FieldInjectionSingletonBean implements SessionBean {
 
     public void lookupDoubleEntry() throws TestFailureException {
         try {
-            final Double expected = new Double(1.0D);
+            final Double expected = 1.0D;
 
             Assert.assertNotNull("The Double looked up is null", doouble);
             Assert.assertEquals(expected, doouble);
@@ -171,7 +171,7 @@ public class FieldInjectionSingletonBean implements SessionBean {
 
     public void lookupLongEntry() throws TestFailureException {
         try {
-            final Long expected = new Long(1L);
+            final Long expected = 1L;
 
             Assert.assertNotNull("The Long looked up is null", loong);
             Assert.assertEquals(expected, loong);
@@ -182,7 +182,7 @@ public class FieldInjectionSingletonBean implements SessionBean {
 
     public void lookupFloatEntry() throws TestFailureException {
         try {
-            final Float expected = new Float(1.0F);
+            final Float expected = 1.0F;
 
             Assert.assertNotNull("The Float looked up is null", flooat);
             Assert.assertEquals(expected, flooat);
@@ -193,7 +193,7 @@ public class FieldInjectionSingletonBean implements SessionBean {
 
     public void lookupIntegerEntry() throws TestFailureException {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
 
             Assert.assertNotNull("The Integer looked up is null", inteeger);
             Assert.assertEquals(expected, inteeger);
@@ -205,7 +205,7 @@ public class FieldInjectionSingletonBean implements SessionBean {
 
     public void lookupShortEntry() throws TestFailureException {
         try {
-            final Short expected = new Short((short) 1);
+            final Short expected = (short) 1;
 
             Assert.assertNotNull("The Short looked up is null", shoort);
             Assert.assertEquals(expected, shoort);
@@ -227,7 +227,7 @@ public class FieldInjectionSingletonBean implements SessionBean {
 
     public void lookupByteEntry() throws TestFailureException {
         try {
-            final Byte expected = new Byte((byte) 1);
+            final Byte expected = (byte) 1;
 
             Assert.assertNotNull("The Byte looked up is null", byyte);
             Assert.assertEquals(expected, byyte);
@@ -238,7 +238,7 @@ public class FieldInjectionSingletonBean implements SessionBean {
 
     public void lookupCharacterEntry() throws TestFailureException {
         try {
-            final Character expected = new Character('D');
+            final Character expected = 'D';
 
             Assert.assertNotNull("The Character looked up is null", chaaracter);
             Assert.assertEquals(expected, chaaracter);
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 c64adef9b2..53178e13fb 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
@@ -377,7 +377,7 @@ public class SetterInjectionSingletonBean implements SessionBean {
 
     public void lookupDoubleEntry() throws TestFailureException {
         try {
-            final Double expected = new Double(1.0D);
+            final Double expected = 1.0D;
 
             Assert.assertNotNull("The Double looked up is null", dooubleField);
             Assert.assertEquals(expected, dooubleField);
@@ -389,7 +389,7 @@ public class SetterInjectionSingletonBean implements SessionBean {
 
     public void lookupLongEntry() throws TestFailureException {
         try {
-            final Long expected = new Long(1L);
+            final Long expected = 1L;
 
             Assert.assertNotNull("The Long looked up is null", loongField);
             Assert.assertEquals(expected, loongField);
@@ -400,7 +400,7 @@ public class SetterInjectionSingletonBean implements SessionBean {
 
     public void lookupFloatEntry() throws TestFailureException {
         try {
-            final Float expected = new Float(1.0F);
+            final Float expected = 1.0F;
 
             Assert.assertNotNull("The Float looked up is null", flooatField);
             Assert.assertEquals(expected, flooatField);
@@ -411,7 +411,7 @@ public class SetterInjectionSingletonBean implements SessionBean {
 
     public void lookupIntegerEntry() throws TestFailureException {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
 
             Assert.assertNotNull("The Integer looked up is null", inteegerField);
             Assert.assertEquals(expected, inteegerField);
@@ -423,7 +423,7 @@ public class SetterInjectionSingletonBean implements SessionBean {
 
     public void lookupShortEntry() throws TestFailureException {
         try {
-            final Short expected = new Short((short) 1);
+            final Short expected = (short) 1;
 
             Assert.assertNotNull("The Short looked up is null", shoortField);
             Assert.assertEquals(expected, shoortField);
@@ -445,7 +445,7 @@ public class SetterInjectionSingletonBean implements SessionBean {
 
     public void lookupByteEntry() throws TestFailureException {
         try {
-            final Byte expected = new Byte((byte) 1);
+            final Byte expected = (byte) 1;
 
             Assert.assertNotNull("The Byte looked up is null", byyteField);
             Assert.assertEquals(expected, byyteField);
@@ -456,7 +456,7 @@ public class SetterInjectionSingletonBean implements SessionBean {
 
     public void lookupCharacterEntry() throws TestFailureException {
         try {
-            final Character expected = new Character('D');
+            final Character expected = 'D';
 
             Assert.assertNotNull("The Character looked up is null", chaaracterField);
             Assert.assertEquals(expected, chaaracterField);
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 ca9ec95a8a..b1085fbe3a 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
@@ -184,7 +184,7 @@ public class AnnotatedFieldInjectionStatefulBean {
 
     public void lookupDoubleEntry() throws TestFailureException {
         try {
-            final Double expected = new Double(1.0D);
+            final Double expected = 1.0D;
 
             Assert.assertNotNull("The Double looked up is null", doouble);
             Assert.assertEquals(expected, doouble);
@@ -196,7 +196,7 @@ public class AnnotatedFieldInjectionStatefulBean {
 
     public void lookupLongEntry() throws TestFailureException {
         try {
-            final Long expected = new Long(1L);
+            final Long expected = 1L;
 
             Assert.assertNotNull("The Long looked up is null", loong);
             Assert.assertEquals(expected, loong);
@@ -207,7 +207,7 @@ public class AnnotatedFieldInjectionStatefulBean {
 
     public void lookupFloatEntry() throws TestFailureException {
         try {
-            final Float expected = new Float(1.0F);
+            final Float expected = 1.0F;
 
             Assert.assertNotNull("The Float looked up is null", flooat);
             Assert.assertEquals(expected, flooat);
@@ -218,7 +218,7 @@ public class AnnotatedFieldInjectionStatefulBean {
 
     public void lookupIntegerEntry() throws TestFailureException {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
 
             Assert.assertNotNull("The Integer looked up is null", inteeger);
             Assert.assertEquals(expected, inteeger);
@@ -230,7 +230,7 @@ public class AnnotatedFieldInjectionStatefulBean {
 
     public void lookupShortEntry() throws TestFailureException {
         try {
-            final Short expected = new Short((short) 1);
+            final Short expected = (short) 1;
 
             Assert.assertNotNull("The Short looked up is null", shoort);
             Assert.assertEquals(expected, shoort);
@@ -252,7 +252,7 @@ public class AnnotatedFieldInjectionStatefulBean {
 
     public void lookupByteEntry() throws TestFailureException {
         try {
-            final Byte expected = new Byte((byte) 1);
+            final Byte expected = (byte) 1;
 
             Assert.assertNotNull("The Byte looked up is null", byyte);
             Assert.assertEquals(expected, byyte);
@@ -263,7 +263,7 @@ public class AnnotatedFieldInjectionStatefulBean {
 
     public void lookupCharacterEntry() throws TestFailureException {
         try {
-            final Character expected = new Character('D');
+            final Character expected = 'D';
 
             Assert.assertNotNull("The Character looked up is null", chaaracter);
             Assert.assertEquals(expected, chaaracter);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java
index 6a5d641588..8467d13161 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BeanTxStatefulBean.java
@@ -123,7 +123,7 @@ public class BeanTxStatefulBean implements jakarta.ejb.SessionBean {
                 }
 
                 /*[3] Commit or Rollback the transaction */
-                if (rollback.booleanValue()) ut.setRollbackOnly();
+                if (rollback) ut.setRollbackOnly();
 
                 /*[4] Commit or Rollback the transaction */
                 ut.commit();
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 c4d106fd87..f7fd6eca16 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
@@ -223,7 +223,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi
     public void lookupDoubleEntry() throws TestFailureException {
         try {
             try {
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ejbContext.lookup("stateful/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -240,7 +240,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi
     public void lookupLongEntry() throws TestFailureException {
         try {
             try {
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ejbContext.lookup("stateful/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -257,7 +257,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi
     public void lookupFloatEntry() throws TestFailureException {
         try {
             try {
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ejbContext.lookup("stateful/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -274,7 +274,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi
     public void lookupIntegerEntry() throws TestFailureException {
         try {
             try {
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ejbContext.lookup("stateful/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -291,7 +291,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi
     public void lookupShortEntry() throws TestFailureException {
         try {
             try {
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ejbContext.lookup("stateful/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -325,7 +325,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi
     public void lookupByteEntry() throws TestFailureException {
         try {
             try {
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ejbContext.lookup("stateful/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -342,7 +342,7 @@ public class ContextLookupStatefulBean implements jakarta.ejb.SessionBean, Sessi
     public void lookupCharacterEntry() throws TestFailureException {
         try {
             try {
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ejbContext.lookup("stateful/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 dc913b9673..22c77370ac 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
@@ -206,7 +206,7 @@ public class ContextLookupStatefulPojoBean {
     public void lookupDoubleEntry() throws TestFailureException {
         try {
             try {
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ejbContext.lookup("stateful/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -223,7 +223,7 @@ public class ContextLookupStatefulPojoBean {
     public void lookupLongEntry() throws TestFailureException {
         try {
             try {
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ejbContext.lookup("stateful/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -240,7 +240,7 @@ public class ContextLookupStatefulPojoBean {
     public void lookupFloatEntry() throws TestFailureException {
         try {
             try {
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ejbContext.lookup("stateful/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -257,7 +257,7 @@ public class ContextLookupStatefulPojoBean {
     public void lookupIntegerEntry() throws TestFailureException {
         try {
             try {
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ejbContext.lookup("stateful/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -274,7 +274,7 @@ public class ContextLookupStatefulPojoBean {
     public void lookupShortEntry() throws TestFailureException {
         try {
             try {
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ejbContext.lookup("stateful/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -308,7 +308,7 @@ public class ContextLookupStatefulPojoBean {
     public void lookupByteEntry() throws TestFailureException {
         try {
             try {
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ejbContext.lookup("stateful/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -325,7 +325,7 @@ public class ContextLookupStatefulPojoBean {
     public void lookupCharacterEntry() throws TestFailureException {
         try {
             try {
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ejbContext.lookup("stateful/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 917606a9d2..0a12e5f2aa 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
@@ -258,7 +258,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ctx.lookup("java:comp/env/stateful/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -278,7 +278,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ctx.lookup("java:comp/env/stateful/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -298,7 +298,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ctx.lookup("java:comp/env/stateful/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -318,7 +318,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ctx.lookup("java:comp/env/stateful/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -338,7 +338,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ctx.lookup("java:comp/env/stateful/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -378,7 +378,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ctx.lookup("java:comp/env/stateful/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -398,7 +398,7 @@ public class EncStatefulBean implements jakarta.ejb.SessionBean, SessionSynchron
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ctx.lookup("java:comp/env/stateful/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 50d85e2f3f..3b31a143ed 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
@@ -180,7 +180,7 @@ public class FieldInjectionStatefulBean implements SessionBean {
 
     public void lookupDoubleEntry() throws TestFailureException {
         try {
-            final Double expected = new Double(1.0D);
+            final Double expected = 1.0D;
 
             Assert.assertNotNull("The Double looked up is null", doouble);
             Assert.assertEquals(expected, doouble);
@@ -192,7 +192,7 @@ public class FieldInjectionStatefulBean implements SessionBean {
 
     public void lookupLongEntry() throws TestFailureException {
         try {
-            final Long expected = new Long(1L);
+            final Long expected = 1L;
 
             Assert.assertNotNull("The Long looked up is null", loong);
             Assert.assertEquals(expected, loong);
@@ -203,7 +203,7 @@ public class FieldInjectionStatefulBean implements SessionBean {
 
     public void lookupFloatEntry() throws TestFailureException {
         try {
-            final Float expected = new Float(1.0F);
+            final Float expected = 1.0F;
 
             Assert.assertNotNull("The Float looked up is null", flooat);
             Assert.assertEquals(expected, flooat);
@@ -214,7 +214,7 @@ public class FieldInjectionStatefulBean implements SessionBean {
 
     public void lookupIntegerEntry() throws TestFailureException {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
 
             Assert.assertNotNull("The Integer looked up is null", inteeger);
             Assert.assertEquals(expected, inteeger);
@@ -226,7 +226,7 @@ public class FieldInjectionStatefulBean implements SessionBean {
 
     public void lookupShortEntry() throws TestFailureException {
         try {
-            final Short expected = new Short((short) 1);
+            final Short expected = (short) 1;
 
             Assert.assertNotNull("The Short looked up is null", shoort);
             Assert.assertEquals(expected, shoort);
@@ -248,7 +248,7 @@ public class FieldInjectionStatefulBean implements SessionBean {
 
     public void lookupByteEntry() throws TestFailureException {
         try {
-            final Byte expected = new Byte((byte) 1);
+            final Byte expected = (byte) 1;
 
             Assert.assertNotNull("The Byte looked up is null", byyte);
             Assert.assertEquals(expected, byyte);
@@ -259,7 +259,7 @@ public class FieldInjectionStatefulBean implements SessionBean {
 
     public void lookupCharacterEntry() throws TestFailureException {
         try {
-            final Character expected = new Character('D');
+            final Character expected = 'D';
 
             Assert.assertNotNull("The Character looked up is null", chaaracter);
             Assert.assertEquals(expected, chaaracter);
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 4664be16c6..1fd4129029 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
@@ -405,7 +405,7 @@ public class SetterInjectionStatefulBean implements SessionBean {
 
     public void lookupDoubleEntry() throws TestFailureException {
         try {
-            final Double expected = new Double(1.0D);
+            final Double expected = 1.0D;
 
             Assert.assertNotNull("The Double looked up is null", dooubleField);
             Assert.assertEquals(expected, dooubleField);
@@ -417,7 +417,7 @@ public class SetterInjectionStatefulBean implements SessionBean {
 
     public void lookupLongEntry() throws TestFailureException {
         try {
-            final Long expected = new Long(1L);
+            final Long expected = 1L;
 
             Assert.assertNotNull("The Long looked up is null", loongField);
             Assert.assertEquals(expected, loongField);
@@ -428,7 +428,7 @@ public class SetterInjectionStatefulBean implements SessionBean {
 
     public void lookupFloatEntry() throws TestFailureException {
         try {
-            final Float expected = new Float(1.0F);
+            final Float expected = 1.0F;
 
             Assert.assertNotNull("The Float looked up is null", flooatField);
             Assert.assertEquals(expected, flooatField);
@@ -439,7 +439,7 @@ public class SetterInjectionStatefulBean implements SessionBean {
 
     public void lookupIntegerEntry() throws TestFailureException {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
 
             Assert.assertNotNull("The Integer looked up is null", inteegerField);
             Assert.assertEquals(expected, inteegerField);
@@ -451,7 +451,7 @@ public class SetterInjectionStatefulBean implements SessionBean {
 
     public void lookupShortEntry() throws TestFailureException {
         try {
-            final Short expected = new Short((short) 1);
+            final Short expected = (short) 1;
 
             Assert.assertNotNull("The Short looked up is null", shoortField);
             Assert.assertEquals(expected, shoortField);
@@ -473,7 +473,7 @@ public class SetterInjectionStatefulBean implements SessionBean {
 
     public void lookupByteEntry() throws TestFailureException {
         try {
-            final Byte expected = new Byte((byte) 1);
+            final Byte expected = (byte) 1;
 
             Assert.assertNotNull("The Byte looked up is null", byyteField);
             Assert.assertEquals(expected, byyteField);
@@ -484,7 +484,7 @@ public class SetterInjectionStatefulBean implements SessionBean {
 
     public void lookupCharacterEntry() throws TestFailureException {
         try {
-            final Character expected = new Character('D');
+            final Character expected = 'D';
 
             Assert.assertNotNull("The Character looked up is null", chaaracterField);
             Assert.assertEquals(expected, chaaracterField);
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 ef3da986db..9052134251 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
@@ -179,7 +179,7 @@ public class AnnotatedFieldInjectionStatelessBean {
 
     public void lookupDoubleEntry() throws TestFailureException {
         try {
-            final Double expected = new Double(1.0D);
+            final Double expected = 1.0D;
 
             Assert.assertNotNull("The Double looked up is null", doouble);
             Assert.assertEquals(expected, doouble);
@@ -191,7 +191,7 @@ public class AnnotatedFieldInjectionStatelessBean {
 
     public void lookupLongEntry() throws TestFailureException {
         try {
-            final Long expected = new Long(1L);
+            final Long expected = 1L;
 
             Assert.assertNotNull("The Long looked up is null", loong);
             Assert.assertEquals(expected, loong);
@@ -202,7 +202,7 @@ public class AnnotatedFieldInjectionStatelessBean {
 
     public void lookupFloatEntry() throws TestFailureException {
         try {
-            final Float expected = new Float(1.0F);
+            final Float expected = 1.0F;
 
             Assert.assertNotNull("The Float looked up is null", flooat);
             Assert.assertEquals(expected, flooat);
@@ -213,7 +213,7 @@ public class AnnotatedFieldInjectionStatelessBean {
 
     public void lookupIntegerEntry() throws TestFailureException {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
 
             Assert.assertNotNull("The Integer looked up is null", inteeger);
             Assert.assertEquals(expected, inteeger);
@@ -225,7 +225,7 @@ public class AnnotatedFieldInjectionStatelessBean {
 
     public void lookupShortEntry() throws TestFailureException {
         try {
-            final Short expected = new Short((short) 1);
+            final Short expected = (short) 1;
 
             Assert.assertNotNull("The Short looked up is null", shoort);
             Assert.assertEquals(expected, shoort);
@@ -247,7 +247,7 @@ public class AnnotatedFieldInjectionStatelessBean {
 
     public void lookupByteEntry() throws TestFailureException {
         try {
-            final Byte expected = new Byte((byte) 1);
+            final Byte expected = (byte) 1;
 
             Assert.assertNotNull("The Byte looked up is null", byyte);
             Assert.assertEquals(expected, byyte);
@@ -258,7 +258,7 @@ public class AnnotatedFieldInjectionStatelessBean {
 
     public void lookupCharacterEntry() throws TestFailureException {
         try {
-            final Character expected = new Character('D');
+            final Character expected = 'D';
 
             Assert.assertNotNull("The Character looked up is null", chaaracter);
             Assert.assertEquals(expected, chaaracter);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java
index b4f2283428..4c5013ec83 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java
@@ -100,7 +100,7 @@ public class BeanTxStatelessBean implements jakarta.ejb.SessionBean {
                 }
 
                 /*[3] Commit or Rollback the transaction */
-                if (rollback.booleanValue()) ut.setRollbackOnly();
+                if (rollback) ut.setRollbackOnly();
 
                 /*[4] Commit or Rollback the transaction */
                 ut.commit();
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 c807c35e21..63bf6f3a06 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
@@ -192,7 +192,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean {
     public void lookupDoubleEntry() throws TestFailureException {
         try {
             try {
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ejbContext.lookup("stateless/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -209,7 +209,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean {
     public void lookupLongEntry() throws TestFailureException {
         try {
             try {
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ejbContext.lookup("stateless/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -226,7 +226,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean {
     public void lookupFloatEntry() throws TestFailureException {
         try {
             try {
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ejbContext.lookup("stateless/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -243,7 +243,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean {
     public void lookupIntegerEntry() throws TestFailureException {
         try {
             try {
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ejbContext.lookup("stateless/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -260,7 +260,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean {
     public void lookupShortEntry() throws TestFailureException {
         try {
             try {
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ejbContext.lookup("stateless/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -294,7 +294,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean {
     public void lookupByteEntry() throws TestFailureException {
         try {
             try {
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ejbContext.lookup("stateless/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -311,7 +311,7 @@ public class ContextLookupStatelessBean implements jakarta.ejb.SessionBean {
     public void lookupCharacterEntry() throws TestFailureException {
         try {
             try {
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ejbContext.lookup("stateless/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 1e772808f1..05b8551ee8 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
@@ -174,7 +174,7 @@ public class ContextLookupStatelessPojoBean {
     public void lookupDoubleEntry() throws TestFailureException {
         try {
             try {
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) getSessionContext().lookup("stateless/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -191,7 +191,7 @@ public class ContextLookupStatelessPojoBean {
     public void lookupLongEntry() throws TestFailureException {
         try {
             try {
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) getSessionContext().lookup("stateless/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -208,7 +208,7 @@ public class ContextLookupStatelessPojoBean {
     public void lookupFloatEntry() throws TestFailureException {
         try {
             try {
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) getSessionContext().lookup("stateless/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -225,7 +225,7 @@ public class ContextLookupStatelessPojoBean {
     public void lookupIntegerEntry() throws TestFailureException {
         try {
             try {
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) getSessionContext().lookup("stateless/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -242,7 +242,7 @@ public class ContextLookupStatelessPojoBean {
     public void lookupShortEntry() throws TestFailureException {
         try {
             try {
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) getSessionContext().lookup("stateless/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -276,7 +276,7 @@ public class ContextLookupStatelessPojoBean {
     public void lookupByteEntry() throws TestFailureException {
         try {
             try {
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) getSessionContext().lookup("stateless/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -293,7 +293,7 @@ public class ContextLookupStatelessPojoBean {
     public void lookupCharacterEntry() throws TestFailureException {
         try {
             try {
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) getSessionContext().lookup("stateless/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 d6b135a36a..0ead9b554a 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
@@ -243,7 +243,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Double expected = new Double(1.0D);
+                final Double expected = 1.0D;
                 final Double actual = (Double) ctx.lookup("java:comp/env/stateless/references/Double");
 
                 Assert.assertNotNull("The Double looked up is null", actual);
@@ -263,7 +263,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Long expected = new Long(1L);
+                final Long expected = 1L;
                 final Long actual = (Long) ctx.lookup("java:comp/env/stateless/references/Long");
 
                 Assert.assertNotNull("The Long looked up is null", actual);
@@ -283,7 +283,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Float expected = new Float(1.0F);
+                final Float expected = 1.0F;
                 final Float actual = (Float) ctx.lookup("java:comp/env/stateless/references/Float");
 
                 Assert.assertNotNull("The Float looked up is null", actual);
@@ -303,7 +303,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Integer expected = new Integer(1);
+                final Integer expected = 1;
                 final Integer actual = (Integer) ctx.lookup("java:comp/env/stateless/references/Integer");
 
                 Assert.assertNotNull("The Integer looked up is null", actual);
@@ -323,7 +323,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Short expected = new Short((short) 1);
+                final Short expected = (short) 1;
                 final Short actual = (Short) ctx.lookup("java:comp/env/stateless/references/Short");
 
                 Assert.assertNotNull("The Short looked up is null", actual);
@@ -363,7 +363,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Byte expected = new Byte((byte) 1);
+                final Byte expected = (byte) 1;
                 final Byte actual = (Byte) ctx.lookup("java:comp/env/stateless/references/Byte");
 
                 Assert.assertNotNull("The Byte looked up is null", actual);
@@ -383,7 +383,7 @@ public class EncStatelessBean implements jakarta.ejb.SessionBean {
                 final InitialContext ctx = new InitialContext();
                 Assert.assertNotNull("The InitialContext is null", ctx);
 
-                final Character expected = new Character('D');
+                final Character expected = 'D';
                 final Character actual = (Character) ctx.lookup("java:comp/env/stateless/references/Character");
 
                 Assert.assertNotNull("The Character looked up is null", actual);
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 d2b070fd5d..40cd63ec4a 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
@@ -159,7 +159,7 @@ public class FieldInjectionStatelessBean implements SessionBean {
 
     public void lookupDoubleEntry() throws TestFailureException {
         try {
-            final Double expected = new Double(1.0D);
+            final Double expected = 1.0D;
 
             Assert.assertNotNull("The Double looked up is null", doouble);
             Assert.assertEquals(expected, doouble);
@@ -171,7 +171,7 @@ public class FieldInjectionStatelessBean implements SessionBean {
 
     public void lookupLongEntry() throws TestFailureException {
         try {
-            final Long expected = new Long(1L);
+            final Long expected = 1L;
 
             Assert.assertNotNull("The Long looked up is null", loong);
             Assert.assertEquals(expected, loong);
@@ -182,7 +182,7 @@ public class FieldInjectionStatelessBean implements SessionBean {
 
     public void lookupFloatEntry() throws TestFailureException {
         try {
-            final Float expected = new Float(1.0F);
+            final Float expected = 1.0F;
 
             Assert.assertNotNull("The Float looked up is null", flooat);
             Assert.assertEquals(expected, flooat);
@@ -193,7 +193,7 @@ public class FieldInjectionStatelessBean implements SessionBean {
 
     public void lookupIntegerEntry() throws TestFailureException {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
 
             Assert.assertNotNull("The Integer looked up is null", inteeger);
             Assert.assertEquals(expected, inteeger);
@@ -205,7 +205,7 @@ public class FieldInjectionStatelessBean implements SessionBean {
 
     public void lookupShortEntry() throws TestFailureException {
         try {
-            final Short expected = new Short((short) 1);
+            final Short expected = (short) 1;
 
             Assert.assertNotNull("The Short looked up is null", shoort);
             Assert.assertEquals(expected, shoort);
@@ -227,7 +227,7 @@ public class FieldInjectionStatelessBean implements SessionBean {
 
     public void lookupByteEntry() throws TestFailureException {
         try {
-            final Byte expected = new Byte((byte) 1);
+            final Byte expected = (byte) 1;
 
             Assert.assertNotNull("The Byte looked up is null", byyte);
             Assert.assertEquals(expected, byyte);
@@ -238,7 +238,7 @@ public class FieldInjectionStatelessBean implements SessionBean {
 
     public void lookupCharacterEntry() throws TestFailureException {
         try {
-            final Character expected = new Character('D');
+            final Character expected = 'D';
 
             Assert.assertNotNull("The Character looked up is null", chaaracter);
             Assert.assertEquals(expected, chaaracter);
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 ae92269057..615030edf4 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
@@ -370,7 +370,7 @@ public class SetterInjectionStatelessBean implements SessionBean {
 
     public void lookupDoubleEntry() throws TestFailureException {
         try {
-            final Double expected = new Double(1.0D);
+            final Double expected = 1.0D;
 
             Assert.assertNotNull("The Double looked up is null", dooubleField);
             Assert.assertEquals(expected, dooubleField);
@@ -382,7 +382,7 @@ public class SetterInjectionStatelessBean implements SessionBean {
 
     public void lookupLongEntry() throws TestFailureException {
         try {
-            final Long expected = new Long(1L);
+            final Long expected = 1L;
 
             Assert.assertNotNull("The Long looked up is null", loongField);
             Assert.assertEquals(expected, loongField);
@@ -393,7 +393,7 @@ public class SetterInjectionStatelessBean implements SessionBean {
 
     public void lookupFloatEntry() throws TestFailureException {
         try {
-            final Float expected = new Float(1.0F);
+            final Float expected = 1.0F;
 
             Assert.assertNotNull("The Float looked up is null", flooatField);
             Assert.assertEquals(expected, flooatField);
@@ -404,7 +404,7 @@ public class SetterInjectionStatelessBean implements SessionBean {
 
     public void lookupIntegerEntry() throws TestFailureException {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
 
             Assert.assertNotNull("The Integer looked up is null", inteegerField);
             Assert.assertEquals(expected, inteegerField);
@@ -416,7 +416,7 @@ public class SetterInjectionStatelessBean implements SessionBean {
 
     public void lookupShortEntry() throws TestFailureException {
         try {
-            final Short expected = new Short((short) 1);
+            final Short expected = (short) 1;
 
             Assert.assertNotNull("The Short looked up is null", shoortField);
             Assert.assertEquals(expected, shoortField);
@@ -438,7 +438,7 @@ public class SetterInjectionStatelessBean implements SessionBean {
 
     public void lookupByteEntry() throws TestFailureException {
         try {
-            final Byte expected = new Byte((byte) 1);
+            final Byte expected = (byte) 1;
 
             Assert.assertNotNull("The Byte looked up is null", byyteField);
             Assert.assertEquals(expected, byyteField);
@@ -449,7 +449,7 @@ public class SetterInjectionStatelessBean implements SessionBean {
 
     public void lookupCharacterEntry() throws TestFailureException {
         try {
-            final Character expected = new Character('D');
+            final Character expected = 'D';
 
             Assert.assertNotNull("The Character looked up is null", chaaracterField);
             Assert.assertEquals(expected, chaaracterField);
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 dfa3a1195d..6067461fc7 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
@@ -76,7 +76,7 @@ public class BmpRmiIiopTests extends BmpTestClient {
 
     public void test03_returnCharacterObject() {
         try {
-            final Character expected = new Character('1');
+            final Character expected = '1';
             final Character actual = ejbObject.returnCharacterObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -96,7 +96,7 @@ public class BmpRmiIiopTests extends BmpTestClient {
 
     public void test05_returnCharacterObjectArray() {
         try {
-            final Character[] expected = {new Character('1'), new Character('2'), new Character('3')};
+            final Character[] expected = {'1', '2', '3'};
             final Character[] actual = ejbObject.returnCharacterObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
@@ -296,7 +296,7 @@ public class BmpRmiIiopTests extends BmpTestClient {
 
     public void test19_returnIntegerObject() {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
             final Integer actual = ejbObject.returnIntegerObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -316,7 +316,7 @@ public class BmpRmiIiopTests extends BmpTestClient {
 
     public void test21_returnIntegerObjectArray() {
         try {
-            final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)};
+            final Integer[] expected = {1, 2, 3};
             final Integer[] actual = ejbObject.returnIntegerObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
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 6b5b17e8b5..ff739588c2 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
@@ -76,7 +76,7 @@ public class CmpRmiIiopTests extends CmpTestClient {
 
     public void test03_returnCharacterObject() {
         try {
-            final Character expected = new Character('1');
+            final Character expected = '1';
             final Character actual = ejbObject.returnCharacterObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -96,7 +96,7 @@ public class CmpRmiIiopTests extends CmpTestClient {
 
     public void test05_returnCharacterObjectArray() {
         try {
-            final Character[] expected = {new Character('1'), new Character('2'), new Character('3')};
+            final Character[] expected = {'1', '2', '3'};
             final Character[] actual = ejbObject.returnCharacterObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
@@ -296,7 +296,7 @@ public class CmpRmiIiopTests extends CmpTestClient {
 
     public void test19_returnIntegerObject() {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
             final Integer actual = ejbObject.returnIntegerObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -316,7 +316,7 @@ public class CmpRmiIiopTests extends CmpTestClient {
 
     public void test21_returnIntegerObjectArray() {
         try {
-            final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)};
+            final Integer[] expected = {1, 2, 3};
             final Integer[] actual = ejbObject.returnIntegerObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
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 27ba6ab0e1..2d16d7808a 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
@@ -80,7 +80,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient {
 
     public void test03_returnCharacterObject() {
         try {
-            final Character expected = new Character('1');
+            final Character expected = '1';
             final Character actual = ejbObject.returnCharacterObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -100,7 +100,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient {
 
     public void test05_returnCharacterObjectArray() {
         try {
-            final Character[] expected = {new Character('1'), new Character('2'), new Character('3')};
+            final Character[] expected = {'1', '2', '3'};
             final Character[] actual = ejbObject.returnCharacterObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
@@ -300,7 +300,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient {
 
     public void test19_returnIntegerObject() {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
             final Integer actual = ejbObject.returnIntegerObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -320,7 +320,7 @@ public class Cmp2RmiIiopTests extends Cmp2TestClient {
 
     public void test21_returnIntegerObjectArray() {
         try {
-            final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)};
+            final Integer[] expected = {1, 2, 3};
             final Integer[] actual = ejbObject.returnIntegerObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java
index 16dc07b597..69be07da74 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java
@@ -60,10 +60,10 @@ public class CmrMappingTests extends AbstractCMRTest {
 
     protected void setUp() throws Exception {
         super.setUp();
-        compoundPK_20_10 = new Integer(20);
-        compoundPK_20_10_field1 = new Integer(10);
-        compoundPK_20_20 = new Integer(20);
-        compoundPK_20_20_field1 = new Integer(20);
+        compoundPK_20_10 = 20;
+        compoundPK_20_10_field1 = 10;
+        compoundPK_20_20 = 20;
+        compoundPK_20_20_field1 = 20;
 
         oneInverseHome = (OneInverseSideLocalHome) initialContext.lookup("java:openejb/local/client/tests/entity/cmp2/OneInverseSideBean/EJBHomeLocal");
         oneOwningHome = (OneOwningSideLocalHome) initialContext.lookup("java:openejb/local/client/tests/entity/cmp2/OneOwningSideBean/EJBHomeLocal");
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java
index f486cc7ad0..6b0da67d1a 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyComplexPkTests.java
@@ -312,7 +312,7 @@ public class OneToManyComplexPkTests extends AbstractCMRTest {
         resetDB();
         beginTransaction();
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
+            final ArtistLocal artist = findArtist(1);
             final Set songs = artist.getComposed();
 
             try {
@@ -337,8 +337,8 @@ public class OneToManyComplexPkTests extends AbstractCMRTest {
         Set songs;
         SongLocal newSong;
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
-            newSong = createSong(new Integer(33));
+            final ArtistLocal artist = findArtist(1);
+            newSong = createSong(33);
             songs = artist.getComposed();
         } finally {
             completeTransaction();
@@ -349,9 +349,9 @@ public class OneToManyComplexPkTests extends AbstractCMRTest {
         assertEquals(2, songs.size());
         for (final Iterator iter = songs.iterator(); iter.hasNext(); ) {
             final SongLocal song = (SongLocal) iter.next();
-            if (song.getId().equals(new Integer(11))) {
+            if (song.getId().equals(11)) {
                 assertEquals("value11", song.getName());
-            } else if (song.getId().equals(new Integer(22))) {
+            } else if (song.getId().equals(22)) {
                 assertEquals("value22", song.getName());
             } else {
                 fail();
@@ -393,8 +393,8 @@ public class OneToManyComplexPkTests extends AbstractCMRTest {
         Set songs;
         SongLocal newSong;
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
-            newSong = createSong(new Integer(33));
+            final ArtistLocal artist = findArtist(1);
+            newSong = createSong(33);
             songs = artist.getComposed();
         } finally {
             completeTransaction();
@@ -407,9 +407,9 @@ public class OneToManyComplexPkTests extends AbstractCMRTest {
             assertEquals(2, songs.size());
             for (final Iterator iter = songs.iterator(); iter.hasNext(); ) {
                 final SongLocal song = (SongLocal) iter.next();
-                if (song.getId().equals(new Integer(11))) {
+                if (song.getId().equals(11)) {
                     assertEquals("value11", song.getName());
-                } else if (song.getId().equals(new Integer(22))) {
+                } else if (song.getId().equals(22)) {
                     assertEquals("value22", song.getName());
                 } else {
                     fail();
@@ -452,8 +452,8 @@ public class OneToManyComplexPkTests extends AbstractCMRTest {
         resetDB();
         beginTransaction();
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
-            final SongLocal song = findSong(new Integer(11));
+            final ArtistLocal artist = findArtist(1);
+            final SongLocal song = findSong(11);
             final Set songs = artist.getComposed();
             assertFalse(songs.isEmpty());
             assertEquals(2, songs.size());
@@ -477,8 +477,8 @@ public class OneToManyComplexPkTests extends AbstractCMRTest {
         resetDB();
         beginTransaction();
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
-            final SongLocal song = findSong(new Integer(11));
+            final ArtistLocal artist = findArtist(1);
+            final SongLocal song = findSong(11);
             final Set games = artist.getComposed();
             assertFalse(games.isEmpty());
             assertEquals(2, games.size());
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java
index 0a37e96db3..5a2d01fc0a 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToManyTests.java
@@ -311,7 +311,7 @@ public class OneToManyTests extends AbstractCMRTest {
         resetDB();
         beginTransaction();
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
+            final ArtistLocal artist = findArtist(1);
             final Set songs = artist.getComposed();
 
             try {
@@ -336,8 +336,8 @@ public class OneToManyTests extends AbstractCMRTest {
         Set songs;
         SongLocal newSong;
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
-            newSong = createSong(new Integer(33));
+            final ArtistLocal artist = findArtist(1);
+            newSong = createSong(33);
             songs = artist.getComposed();
         } finally {
             completeTransaction();
@@ -348,9 +348,9 @@ public class OneToManyTests extends AbstractCMRTest {
         assertEquals(2, songs.size());
         for (final Iterator iter = songs.iterator(); iter.hasNext(); ) {
             final SongLocal song = (SongLocal) iter.next();
-            if (song.getId().equals(new Integer(11))) {
+            if (song.getId().equals(11)) {
                 assertEquals("value11", song.getName());
-            } else if (song.getId().equals(new Integer(22))) {
+            } else if (song.getId().equals(22)) {
                 assertEquals("value22", song.getName());
             } else {
                 fail();
@@ -392,8 +392,8 @@ public class OneToManyTests extends AbstractCMRTest {
         Set songs;
         SongLocal newSong;
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
-            newSong = createSong(new Integer(33));
+            final ArtistLocal artist = findArtist(1);
+            newSong = createSong(33);
             songs = artist.getComposed();
         } finally {
             completeTransaction();
@@ -406,9 +406,9 @@ public class OneToManyTests extends AbstractCMRTest {
             assertEquals(2, songs.size());
             for (final Iterator iter = songs.iterator(); iter.hasNext(); ) {
                 final SongLocal song = (SongLocal) iter.next();
-                if (song.getId().equals(new Integer(11))) {
+                if (song.getId().equals(11)) {
                     assertEquals("value11", song.getName());
-                } else if (song.getId().equals(new Integer(22))) {
+                } else if (song.getId().equals(22)) {
                     assertEquals("value22", song.getName());
                 } else {
                     fail();
@@ -451,8 +451,8 @@ public class OneToManyTests extends AbstractCMRTest {
         resetDB();
         beginTransaction();
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
-            final SongLocal song = findSong(new Integer(11));
+            final ArtistLocal artist = findArtist(1);
+            final SongLocal song = findSong(11);
             final Set songs = artist.getComposed();
             assertFalse(songs.isEmpty());
             assertEquals(2, songs.size());
@@ -476,8 +476,8 @@ public class OneToManyTests extends AbstractCMRTest {
         resetDB();
         beginTransaction();
         try {
-            final ArtistLocal artist = findArtist(new Integer(1));
-            final SongLocal song = findSong(new Integer(11));
+            final ArtistLocal artist = findArtist(1);
+            final SongLocal song = findSong(11);
             final Set games = artist.getComposed();
             assertFalse(games.isEmpty());
             assertEquals(2, games.size());
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java
index 1ca7927b5a..e6d1675627 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneComplexPkTests.java
@@ -237,7 +237,7 @@ public class OneToOneComplexPkTests extends AbstractCMRTest {
         try {
             final LicenseLocal license = findLicense(11);
 
-            license.setPoints(new Integer(2));
+            license.setPoints(2);
 
             final PersonLocal person = license.getPerson();
             assertEquals(new Integer(2), person.getId());
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java
index 397388bb5c..c79fcfd16b 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/OneToOneTests.java
@@ -235,7 +235,7 @@ public class OneToOneTests extends AbstractCMRTest {
         try {
             final LicenseLocal license = findLicense(11);
 
-            license.setPoints(new Integer(2));
+            license.setPoints(2);
 
             final PersonLocal person = license.getPerson();
             assertEquals(new Integer(2), person.getId());
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonLocalBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonLocalBusinessIntfcTests.java
index 81ce89582b..30966dec3e 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonLocalBusinessIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonLocalBusinessIntfcTests.java
@@ -47,7 +47,7 @@ public class SingletonLocalBusinessIntfcTests extends SingletonTestClient {
         }
 
         try {
-            final Integer expected = new Integer(42);
+            final Integer expected = 42;
             final Object actual = businessLocal.echo(expected);
             assertSame("pass by reference", expected, actual);
         } catch (final Exception e) {
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteBusinessIntfcTests.java
index 9d7d221075..fdd2f85c93 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteBusinessIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonRemoteBusinessIntfcTests.java
@@ -47,7 +47,7 @@ public class SingletonRemoteBusinessIntfcTests extends SingletonTestClient {
         }
 
         try {
-            final Integer expected = new Integer(42);
+            final Integer expected = 42;
             final Object actual = businessRemote.echo(expected);
             assertEquals(expected, actual);
             assertNotSame("pass by value", expected, actual);
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 5c92761f0b..a9e9fa36f9 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
@@ -75,7 +75,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
 /*-------------------------------------------------*/
     public void test03_returnCharacterObject() {
         try {
-            final Character expected = new Character('1');
+            final Character expected = '1';
             final Character actual = ejbObject.returnCharacterObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -95,7 +95,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
 
     public void test05_returnCharacterObjectArray() {
         try {
-            final Character[] expected = {new Character('1'), new Character('2'), new Character('3')};
+            final Character[] expected = {'1', '2', '3'};
             final Character[] actual = ejbObject.returnCharacterObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
@@ -295,7 +295,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
 
     public void test19_returnIntegerObject() {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
             final Integer actual = ejbObject.returnIntegerObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -315,7 +315,7 @@ public class SingletonRmiIiopTests extends SingletonTestClient {
 
     public void test21_returnIntegerObjectArray() {
         try {
-            final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)};
+            final Integer[] expected = {1, 2, 3};
             final Integer[] actual = ejbObject.returnIntegerObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalBusinessIntfcTests.java
index fad89d75f1..95484aa496 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalBusinessIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulLocalBusinessIntfcTests.java
@@ -47,7 +47,7 @@ public class StatefulLocalBusinessIntfcTests extends StatefulTestClient {
         }
 
         try {
-            final Integer expected = new Integer(42);
+            final Integer expected = 42;
             final Object actual = businessLocal.echo(expected);
             assertSame("pass by reference", expected, actual);
         } catch (final Exception e) {
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteBusinessIntfcTests.java
index a9752d5bce..faecd23e72 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteBusinessIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulRemoteBusinessIntfcTests.java
@@ -47,7 +47,7 @@ public class StatefulRemoteBusinessIntfcTests extends StatefulTestClient {
         }
 
         try {
-            final Integer expected = new Integer(42);
+            final Integer expected = 42;
             final Object actual = businessRemote.echo(expected);
             assertEquals(expected, actual);
             assertNotSame("pass by value", expected, actual);
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 cc13bb29c0..cc72aaf36c 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
@@ -76,7 +76,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient {
 
     public void test03_returnCharacterObject() {
         try {
-            final Character expected = new Character('1');
+            final Character expected = '1';
             final Character actual = ejbObject.returnCharacterObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -96,7 +96,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient {
 
     public void test05_returnCharacterObjectArray() {
         try {
-            final Character[] expected = {new Character('1'), new Character('2'), new Character('3')};
+            final Character[] expected = {'1', '2', '3'};
             final Character[] actual = ejbObject.returnCharacterObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
@@ -296,7 +296,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient {
 
     public void test19_returnIntegerObject() {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
             final Integer actual = ejbObject.returnIntegerObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -316,7 +316,7 @@ public class StatefulRmiIiopTests extends StatefulTestClient {
 
     public void test21_returnIntegerObjectArray() {
         try {
-            final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)};
+            final Integer[] expected = {1, 2, 3};
             final Integer[] actual = ejbObject.returnIntegerObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalBusinessIntfcTests.java
index 74c9dfe0d7..ce86bc67aa 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalBusinessIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalBusinessIntfcTests.java
@@ -47,7 +47,7 @@ public class StatelessLocalBusinessIntfcTests extends StatelessTestClient {
         }
 
         try {
-            final Integer expected = new Integer(42);
+            final Integer expected = 42;
             final Object actual = businessLocal.echo(expected);
             assertSame("pass by reference", expected, actual);
         } catch (final Exception e) {
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteBusinessIntfcTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteBusinessIntfcTests.java
index d358764e5e..2cf8767f2d 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteBusinessIntfcTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessRemoteBusinessIntfcTests.java
@@ -47,7 +47,7 @@ public class StatelessRemoteBusinessIntfcTests extends StatelessTestClient {
         }
 
         try {
-            final Integer expected = new Integer(42);
+            final Integer expected = 42;
             final Object actual = businessRemote.echo(expected);
             assertEquals(expected, actual);
             assertNotSame("pass by value", expected, actual);
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 53fed5f1c8..f1954f1a9e 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
@@ -76,7 +76,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient {
 /*-------------------------------------------------*/
     public void test03_returnCharacterObject() {
         try {
-            final Character expected = new Character('1');
+            final Character expected = '1';
             final Character actual = ejbObject.returnCharacterObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -96,7 +96,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient {
 
     public void test05_returnCharacterObjectArray() {
         try {
-            final Character[] expected = {new Character('1'), new Character('2'), new Character('3')};
+            final Character[] expected = {'1', '2', '3'};
             final Character[] actual = ejbObject.returnCharacterObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
@@ -296,7 +296,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient {
 
     public void test19_returnIntegerObject() {
         try {
-            final Integer expected = new Integer(1);
+            final Integer expected = 1;
             final Integer actual = ejbObject.returnIntegerObject(expected);
             assertEquals(expected, actual);
         } catch (final Exception e) {
@@ -316,7 +316,7 @@ public class StatelessRmiIiopTests extends StatelessTestClient {
 
     public void test21_returnIntegerObjectArray() {
         try {
-            final Integer[] expected = {new Integer(1), new Integer(2), new Integer(3)};
+            final Integer[] expected = {1, 2, 3};
             final Integer[] actual = ejbObject.returnIntegerObjectArray(expected);
 
             assertNotNull("The array returned is null", actual);
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java
index 7f5df24686..a29b61e22e 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java
@@ -291,7 +291,7 @@ public class JWTCallerPrincipal implements JsonWebToken {
                 builder.add(entry.getKey(), value);
 
             } else if (entryValue instanceof Boolean) {
-                final boolean flag = ((Boolean) entryValue).booleanValue();
+                final boolean flag = (Boolean) entryValue;
                 builder.add(entry.getKey(), flag);
 
             } else if (entryValue instanceof String) {
diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java b/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
index 1c797ed36b..8d19769722 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
@@ -75,7 +75,7 @@ public class Client {
 
     public Client() {
         final String retryValue = System.getProperty("openejb.client.requestretry", getRetry() + "");
-        retry = Boolean.valueOf(retryValue);
+        retry = Boolean.parseBoolean(retryValue);
 
         observers.addObserver(new EventLogger());
         observers.fireEvent(new ClientVersion());
@@ -465,7 +465,7 @@ public class Client {
     //openejb.client.connection.strategy
 
     private boolean getRetry() {
-        return retry = Boolean.valueOf(System.getProperty("openejb.client.requestretry", retry + ""));
+        return retry = Boolean.parseBoolean(System.getProperty("openejb.client.requestretry", retry + ""));
     }
 
     private static final Map<ServerMetaData, Context> contexts = new ConcurrentHashMap<>();
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
index 063cb0fa18..5b433d7f01 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
@@ -55,14 +55,14 @@ public class StartWithIPAddressPermission implements IPAddressPermission {
                 if (value < 0 || 255 < value) {
                     throw new IllegalArgumentException("byte #" + i + " is not valid.");
                 }
-                tmpBytes[i] = new Byte((byte) value);
+                tmpBytes[i] = (byte) value;
                 size++;
             }
         }
 
         bytes = new byte[size];
         for (int i = 0; i < bytes.length; i++) {
-            bytes[i] = tmpBytes[i].byteValue();
+            bytes[i] = tmpBytes[i];
         }
     }
 


(tomee) 03/03: Correct frequent spelling problems - occured -> occurred - opperations -> operations - programatically -> programmatically - hanlder -> handler - primitve -> primitive - exeption -> exception - spedified -> specified - preformance -> performance - wrappering -> wrapping - aquire -> acquire - senario -> scenario - Virtural -> Virtual - others...

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-10.x
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit e7b077b368fc4eefb12818ea73e62e99f719ccbe
Author: Martin Wiesner <ma...@hs-heilbronn.de>
AuthorDate: Mon Mar 2 21:47:07 2026 +0100

    Correct frequent spelling problems
    - occured -> occurred
    - opperations -> operations
    - programatically -> programmatically
    - hanlder -> handler
    - primitve -> primitive
    - exeption -> exception
    - spedified -> specified
    - preformance -> performance
    - wrappering -> wrapping
    - aquire -> acquire
    - senario -> scenario
    - Virtural -> Virtual
    - others...
    
    (cherry picked from commit 376287aef6f0b088e9ccc996d18d2739675acc8e)
---
 .../arquillian/common/TomEEConfiguration.java        |  2 +-
 .../src/main/java/org/apache/ziplock/maven/Mvn.java  |  2 +-
 .../java/org/apache/openejb/ClassLoaderUtil.java     |  4 ++--
 .../src/main/java/org/apache/openejb/Injector.java   |  2 +-
 .../openejb/assembler/classic/CmpJarBuilder.java     |  2 +-
 .../classic/EntityManagerFactoryCallable.java        |  2 +-
 .../openejb/assembler/classic/JndiEncBuilder.java    |  2 +-
 .../openejb/assembler/classic/MethodInfoUtil.java    |  2 +-
 .../org/apache/openejb/cdi/OpenEJBLifecycle.java     |  6 +++---
 .../apache/openejb/cdi/OptimizedLoaderService.java   |  2 +-
 .../src/main/java/org/apache/openejb/cdi/Proxys.java |  2 +-
 .../org/apache/openejb/cdi/WebappBeanManager.java    |  2 +-
 .../apache/openejb/classloader/WebAppEnricher.java   |  4 ++--
 .../java/org/apache/openejb/config/ConfigUtils.java  |  4 ++--
 .../apache/openejb/config/DeploymentsResolver.java   |  2 +-
 .../openejb/config/GeneratedClientModules.java       |  2 +-
 .../org/apache/openejb/config/NewLoaderLogic.java    |  4 ++--
 .../apache/openejb/config/OpenEjb2Conversion.java    |  2 +-
 .../org/apache/openejb/config/sys/ObjectFactory.java |  2 +-
 .../org/apache/openejb/core/ConnectorReference.java  |  2 +-
 .../main/java/org/apache/openejb/core/EnvProps.java  |  2 +-
 .../org/apache/openejb/core/cmp/CmpContainer.java    |  8 ++++----
 .../apache/openejb/core/cmp/ComplexKeyGenerator.java |  2 +-
 .../apache/openejb/core/cmp/SimpleKeyGenerator.java  |  2 +-
 .../apache/openejb/core/cmp/cmp2/Cmp1Generator.java  |  2 +-
 .../apache/openejb/core/cmp/cmp2/Cmp2Generator.java  |  2 +-
 .../org/apache/openejb/core/cmp/cmp2/Cmp2Util.java   |  6 +++---
 .../apache/openejb/core/entity/EntityContainer.java  | 10 +++++-----
 .../openejb/core/entity/EntityInstanceManager.java   |  2 +-
 .../openejb/core/ivm/naming/ClassReference.java      |  2 +-
 .../openejb/core/ivm/naming/InitContextFactory.java  |  2 +-
 .../core/ivm/naming/JaxWsServiceReference.java       |  2 +-
 .../openejb/core/ivm/naming/JndiReference.java       |  2 +-
 .../org/apache/openejb/core/managed/Instance.java    |  2 +-
 .../openejb/core/managed/ManagedContainer.java       | 14 +++++++-------
 .../org/apache/openejb/core/managed/SimpleCache.java | 18 +++++++++---------
 .../org/apache/openejb/core/mdb/EndpointHandler.java |  2 +-
 .../apache/openejb/core/mdb/MdbInstanceFactory.java  |  4 ++--
 .../main/java/org/apache/openejb/core/mdb/State.java |  4 ++--
 .../openejb/core/security/jaas/CDILoginModule.java   |  2 +-
 .../openejb/core/singleton/SingletonContainer.java   |  4 ++--
 .../org/apache/openejb/core/stateful/Instance.java   |  2 +-
 .../apache/openejb/core/stateful/SimpleCache.java    | 20 ++++++++++----------
 .../openejb/core/stateful/StatefulContainer.java     | 14 +++++++-------
 .../openejb/core/timer/EjbTimerServiceImpl.java      | 12 ++++++------
 .../apache/openejb/core/timer/MemoryTimerStore.java  | 20 ++++++++++----------
 .../core/transaction/JtaTransactionPolicy.java       | 18 +++++++++---------
 .../openejb/core/transaction/SimpleWorkManager.java  |  2 +-
 .../openejb/core/transaction/TransactionPolicy.java  |  6 +++---
 .../core/transaction/TransactionPolicyFactory.java   |  2 +-
 .../core/webservices/PortAddressRegistryImpl.java    |  2 +-
 .../openejb/core/webservices/ProviderWrapper.java    |  2 +-
 .../java/org/apache/openejb/log/LoggerCreator.java   |  2 +-
 .../org/apache/openejb/log/logger/Slf4jLogger.java   |  2 +-
 .../math/stat/descriptive/moment/Skewness.java       |  2 +-
 .../org/apache/openejb/persistence/JtaQuery.java     |  2 +-
 .../openejb/resource/activemq/ActiveMQFactory.java   |  2 +-
 .../resource/jdbc/managed/local/LocalXAResource.java |  2 +-
 .../jdbc/managed/local/ManagedConnection.java        |  2 +-
 .../java/org/apache/openejb/util/JarExtractor.java   |  2 +-
 .../main/java/org/apache/openejb/util/Messages.java  |  2 +-
 .../src/main/java/org/apache/openejb/util/Pool.java  | 12 ++++++------
 .../java/org/apache/openejb/util/URISupport.java     |  2 +-
 .../main/java/org/apache/openejb/util/UrlCache.java  |  4 ++--
 .../org/apache/openejb/util/proxy/ClassDefiner.java  |  4 ++--
 .../openejb/util/resources/Messages.properties       |  4 ++--
 .../src/main/resources/schema/openejb-jar.xsd        |  4 ++--
 .../openejb/resource/jdbc/DynamicDataSourceTest.java |  2 +-
 ...cesConfigFlowDefinitionFlowCallFlowReference.java |  2 +-
 .../java/org/apache/openejb/jee/KeyedCollection.java |  2 +-
 .../java/org/apache/openejb/jee/ObjectFactory.java   |  2 +-
 .../org/apache/openejb/jee/bval/ObjectFactory.java   |  2 +-
 .../org/apache/openejb/jee/jba/ObjectFactory.java    |  2 +-
 .../apache/openejb/jee/jba/cmp/ObjectFactory.java    |  2 +-
 .../org/apache/openejb/jee/jpa/ObjectFactory.java    |  2 +-
 .../apache/openejb/jee/jpa/unit/ObjectFactory.java   |  2 +-
 .../org/apache/openejb/jee/oejb2/ObjectFactory.java  |  2 +-
 .../org/apache/openejb/jee/oejb3/ObjectFactory.java  |  2 +-
 .../org/apache/openejb/jee/sun/ObjectFactory.java    |  2 +-
 .../openejb/jee/was/v6/common/ObjectFactory.java     |  2 +-
 .../openejb/jee/was/v6/commonbnd/ObjectFactory.java  |  2 +-
 .../openejb/jee/was/v6/ecore/ObjectFactory.java      |  2 +-
 .../apache/openejb/jee/was/v6/ejb/ObjectFactory.java |  2 +-
 .../openejb/jee/was/v6/ejbbnd/ObjectFactory.java     |  2 +-
 .../openejb/jee/was/v6/java/ObjectFactory.java       |  2 +-
 .../was/v6/webservice/clientbnd/ObjectFactory.java   |  2 +-
 .../openejb/jee/was/v6/wsclient/ObjectFactory.java   |  2 +-
 .../apache/openejb/jee/was/v6/xmi/ObjectFactory.java |  2 +-
 .../org/apache/openejb/jee/wls/ObjectFactory.java    |  2 +-
 .../apache/openejb/jpa/integration/MakeTxLookup.java |  4 ++--
 .../java/org/apache/openejb/junit/ContextConfig.java |  4 ++--
 .../java/org/apache/openejb/junit/context/Util.java  |  4 ++--
 docs/admin/configuration/server.adoc                 |  2 +-
 .../superbiz/cdi/inject/dynamic/FinalizePayment.java | 14 +++++++-------
 .../superbiz/executor/ManagedScheduledService.java   |  4 ++--
 .../dynamicdatasourcerouting/DeterminedRouter.java   |  2 +-
 examples/pojo-webservice/soapui.log                  |  6 +++---
 .../main/java/jug/client/util/CommandManager.java    |  2 +-
 .../src/main/java/org/superbiz/event/MyListener.java |  2 +-
 .../src/main/java/org/foo/SingletonC.java            |  2 +-
 .../apache/openejb/test/beans/ShoppingCartBean.java  |  2 +-
 .../test/entity/bmp/AllowedOperationsBmpBean.java    |  4 ++--
 .../test/entity/bmp/BasicBmp2DataSourcesBean.java    |  4 ++--
 .../test/entity/bmp/BasicBmp2DataSourcesObject.java  |  4 ++--
 .../apache/openejb/test/entity/bmp/BasicBmpBean.java |  4 ++--
 .../openejb/test/entity/bmp/BasicBmpObject.java      |  4 ++--
 .../test/entity/cmp/AllowedOperationsCmp2Bean.java   |  4 ++--
 .../test/entity/cmp/AllowedOperationsCmpBean.java    |  4 ++--
 .../openejb/test/entity/cmp/BasicCmp2Bean.java       |  4 ++--
 .../openejb/test/entity/cmp/BasicCmp2PojoBean.java   |  4 ++--
 .../apache/openejb/test/entity/cmp/BasicCmpBean.java |  4 ++--
 .../openejb/test/entity/cmp/BasicCmpObject.java      |  4 ++--
 .../openejb/test/entity/cmp/ComplexCmp2Bean.java     |  4 ++--
 .../openejb/test/entity/cmp/ComplexCmpBean.java      |  4 ++--
 .../openejb/test/entity/cmp/ComplexCmpObject.java    |  4 ++--
 .../openejb/test/entity/cmp/UnknownCmp2Bean.java     |  4 ++--
 .../openejb/test/entity/cmp/UnknownCmpBean.java      |  4 ++--
 .../openejb/test/entity/cmp/UnknownCmpObject.java    |  4 ++--
 .../org/apache/openejb/test/mdb/BasicMdbBean.java    |  4 ++--
 .../org/apache/openejb/test/mdb/BasicMdbObject.java  |  4 ++--
 .../openejb/test/singleton/BasicSingletonBean.java   |  4 ++--
 .../test/singleton/BasicSingletonBusinessLocal.java  |  4 ++--
 .../test/singleton/BasicSingletonBusinessRemote.java |  4 ++--
 .../test/singleton/BasicSingletonLocalObject.java    |  4 ++--
 .../openejb/test/singleton/BasicSingletonObject.java |  4 ++--
 .../test/singleton/BasicSingletonPojoBean.java       |  4 ++--
 .../openejb/test/stateful/BMTStatefulBean.java       |  4 ++--
 .../openejb/test/stateful/BasicStatefulBean.java     |  4 ++--
 .../test/stateful/BasicStatefulBusinessLocal.java    |  4 ++--
 .../test/stateful/BasicStatefulBusinessRemote.java   |  4 ++--
 .../test/stateful/BasicStatefulLocalObject.java      |  4 ++--
 .../openejb/test/stateful/BasicStatefulObject.java   |  4 ++--
 .../openejb/test/stateful/BasicStatefulPojoBean.java |  4 ++--
 .../stateful/PersistenceContextStatefulBean.java     | 12 ++++++------
 .../openejb/test/stateless/BasicStatelessBean.java   |  4 ++--
 .../test/stateless/BasicStatelessBusinessLocal.java  |  4 ++--
 .../test/stateless/BasicStatelessBusinessRemote.java |  4 ++--
 .../test/stateless/BasicStatelessLocalObject.java    |  4 ++--
 .../openejb/test/stateless/BasicStatelessObject.java |  4 ++--
 .../test/stateless/BasicStatelessPojoBean.java       |  4 ++--
 .../java/org/apache/openejb/test/RiTestServer.java   |  2 +-
 .../test/entity/bmp/BmpAllowedOperationsTests.java   |  2 +-
 .../test/entity/cmp/CmpAllowedOperationsTests.java   |  2 +-
 .../test/entity/cmp2/Cmp2AllowedOperationsTests.java |  2 +-
 .../org/apache/openejb/test/mdb/MdbTestSuite.java    |  2 +-
 .../BMTSingletonAllowedOperationsTests.java          |  2 +-
 .../singleton/SingletonAllowedOperationsTests.java   |  2 +-
 .../openejb/test/singleton/SingletonBeanTxTests.java | 10 +++++-----
 .../stateful/BMTStatefulAllowedOperationsTests.java  |  2 +-
 .../stateful/StatefulAllowedOperationsTests.java     |  2 +-
 .../openejb/test/stateful/StatefulBeanTxTests.java   | 14 +++++++-------
 .../BMTStatelessAllowedOperationsTests.java          |  2 +-
 .../stateless/StatelessAllowedOperationsTests.java   |  2 +-
 .../test/stateful/SecondStatefulInterceptedBean.java |  2 +-
 .../test/stateful/StatefulInterceptedBean.java       |  2 +-
 .../test/stateful/ThirdStatefulInterceptedBean.java  |  2 +-
 .../stateless/SecondStatelessInterceptedBean.java    |  2 +-
 .../stateless/ThirdStatelessInterceptedBean.java     |  2 +-
 .../openejb/maven/plugins/TomEEEmbeddedMojo.java     |  6 +++---
 .../jwt/bval/JwtValidationGenerator.java             |  2 +-
 .../microprofile/jwt/bval/ValidationGenerator.java   |  2 +-
 .../jwt/principal/JWTCallerPrincipal.java            |  2 +-
 .../openejb/client/ClientInjectionProcessor.java     |  4 ++--
 .../org/apache/openejb/client/ClientSecurity.java    | 10 +++++-----
 .../apache/openejb/client/JaxWsProviderWrapper.java  |  4 ++--
 .../org/apache/openejb/server/cli/CliRunnable.java   |  2 +-
 .../openejb/server/cxf/rs/CdiResourceProvider.java   |  2 +-
 .../cxf/client/WebServiceInjectionConfigurator.java  |  2 +-
 .../openejb/server/ejbd/ClientObjectFactory.java     | 16 ++++++++--------
 .../openejb/server/ejbd/EjbRequestHandler.java       |  2 +-
 .../apache/openejb/server/hessian/HessianServer.java |  2 +-
 .../org/apache/openejb/server/httpd/HttpRequest.java |  2 +-
 .../apache/openejb/server/httpd/HttpRequestImpl.java |  6 +++---
 .../server/discovery/MulticastPulseAgent.java        |  2 +-
 .../org/apache/openejb/server/discovery/Tracker.java |  2 +-
 .../apache/openejb/server/SimpleServiceManager.java  |  2 +-
 .../org/apache/tomee/jaxrs/ReloadingLoaderTest.java  |  2 +-
 177 files changed, 339 insertions(+), 339 deletions(-)

diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
index e84204e7d6..8f789c0bce 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
@@ -40,7 +40,7 @@ public class TomEEConfiguration implements ContainerConfiguration {
     protected String appWorkingDir = System.getProperty("java.io.tmpdir") + "/arquillian-tomee-app-working-dir-" + ProcessHandle.current().pid();
     protected String host = "localhost";
     protected String stopHost = "localhost"; // generally localhost but host (http) can be different
-    protected String stopCommand = "SHUTDOWN"; // default one - can be overriden in server.xml
+    protected String stopCommand = "SHUTDOWN"; // default one - can be overridden in server.xml
     protected String serverXml;
     protected String portRange = ""; // only used if port < 0, empty means whatever, can be "1024-65535"
     protected String preloadClasses; // just a client classloader.loadClass(), value is comma separated qualified names. Useful with maven resolver for instance
diff --git a/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java b/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
index 9a021420a3..5ff8c09035 100644
--- a/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
+++ b/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
@@ -204,7 +204,7 @@ public final class Mvn {
     }
 
     /**
-     * Server war without tests clases.
+     * Server war without tests classes.
      *
      * @return create a war with src/main/resources, src/main/webapp and all compile, runtime and test dependencies
      */
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
index 5073c0857e..249d5d87ca 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
@@ -329,7 +329,7 @@ public class ClassLoaderUtil {
     /**
      * Cleans well known class loader leaks in VMs and libraries.  There is a lot of bad code out there and this method
      * will clear up the know problems.  This method should only be called when the class loader will no longer be used.
-     * It this method is called two often it can have a serious impact on preformance.
+     * It this method is called two often it can have a serious impact on performance.
      */
     public static void clearClassLoaderCaches() {
         clearSunSoftCache(ObjectInputStream.class, "subclassAudits");
@@ -484,7 +484,7 @@ public class ClassLoaderUtil {
      * Clears the caches maintained by the SunVM object stream implementation.
      * This method uses reflection and setAccessable to obtain access to the Sun cache.
      * The cache Class synchronizes upon itself for access to the cache Map.
-     * This method completely clears the class loader cache which will impact preformance of object serialization.
+     * This method completely clears the class loader cache which will impact performance of object serialization.
      *
      * @param clazz     the name of the class containing the cache field
      * @param fieldName the name of the cache field
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/Injector.java b/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
index 96f6568517..7f7151f45e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/Injector.java
@@ -74,7 +74,7 @@ public class Injector {
         try {
             OWBInjector.inject(context.getWebBeansContext().getBeanManagerImpl(), object, null);
         } catch (final Throwable t) {
-            logger().warning("an error occured while injecting the class '" + object.getClass().getName() + "': " + t.getMessage());
+            logger().warning("an error occurred while injecting the class '" + object.getClass().getName() + "': " + t.getMessage());
         } finally {
             ThreadContext.exit(oldContext);
         }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java
index d323e74102..efe8904461 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java
@@ -147,7 +147,7 @@ public class CmpJarBuilder {
      * @throws IOException
      */
     private Entry generateClass(final JarOutputStream jarOutputStream, final EntityBeanInfo entityBeanInfo) throws IOException {
-        // don't generate if there is aleady an implementation class
+        // don't generate if there is already an implementation class
         final String cmpImplClass = CmpUtil.getCmpImplClassName(entityBeanInfo.abstractSchemaName, entityBeanInfo.ejbClass);
         final String entryName = cmpImplClass.replace(".", "/") + ".class";
         if (entries.contains(entryName) || tempClassLoader.getResource(entryName) != null) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
index a2c79dfc26..e6dde5908a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
@@ -100,7 +100,7 @@ public class EntityManagerFactoryCallable implements Callable<EntityManagerFacto
 
             customizeProperties(properties);
 
-            // ensure no tx is there cause a managed connection would fail if the provider setAutocCommit(true) and some hib* have this good idea
+            // ensure no tx is there cause a managed connection would fail if the provider setAutoCommit(true) and some hib* have this good idea
             final Transaction transaction;
             if (unitInfo.isLazilyInitialized()) {
                 transaction = OpenEJB.getTransactionManager().suspend();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
index 11f0bee598..776706dff6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
@@ -537,7 +537,7 @@ public class JndiEncBuilder {
     }
 
     // we don't want to bind globally a global resource multiple times in the Assembler
-    // if the datasource if defined globally in the currently deployed app originAppname hould not be null
+    // if the datasource if defined globally in the currently deployed app originAppname should not be null
     private boolean isNotGobalOrIsHoldByThisApp(final ResourceInfo info, final JndiScope scope) {
         return !info.jndiName.startsWith("global/")
             || info.originAppName != null && info.originAppName.equals(moduleId) && JndiScope.global.equals(scope);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
index 9537676118..c5ba8afcf9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
@@ -47,7 +47,7 @@ public class MethodInfoUtil {
      * Finds the nearest java.lang.reflect.Method with the given NamedMethodInfo
      * Callbacks can be private so class.getMethod() cannot be used.  Searching
      * starts by looking in the specified class, if the method is not found searching continues with
-     * the immediate parent and continues recurssively until the method is found or java.lang.Object
+     * the immediate parent and continues recursively until the method is found or java.lang.Object
      * is reached.  If the method is not found a IllegalStateException is thrown.
      *
      * @param clazz
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
index 3f4073a463..26815bb7f9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
@@ -137,7 +137,7 @@ public class OpenEJBLifecycle implements ContainerLifecycle {
         final StartupObject stuff = (StartupObject) startupObject;
         final ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
 
-        // Initalize Application Context
+        // Initialize Application Context
         logger.info("OpenWebBeans Container is starting...");
 
         final long begin = System.currentTimeMillis();
@@ -162,7 +162,7 @@ public class OpenEJBLifecycle implements ContainerLifecycle {
             //Configure EJB Deployments
             cdiPlugin.configureDeployments(stuff.getBeanContexts());
 
-            //Resournce Injection Service
+            //Resource Injection Service
             final CdiResourceInjectionService injectionService = (CdiResourceInjectionService) webBeansContext.getService(ResourceInjectionService.class);
             // todo use startupObject allDeployments to find Comp in priority (otherwise we can keep N times comps and loose time at injection time
             injectionService.setAppContext(stuff.getAppContext(), stuff.getBeanContexts() != null ? stuff.getBeanContexts() : Collections.<BeanContext>emptyList());
@@ -344,7 +344,7 @@ public class OpenEJBLifecycle implements ContainerLifecycle {
             WebBeansFinder.clearInstances(WebBeansUtil.getCurrentClassLoader());
 
         } catch (final Exception e) {
-            logger.error("An error occured while stopping the container.", e);
+            logger.error("An error occurred while stopping the container.", e);
         }
 
     }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
index ce528b557a..815eba8f0d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
@@ -170,7 +170,7 @@ public class OptimizedLoaderService implements LoaderService {
         }
     }
 
-    // mainly intended to avoid conflicts between internal and overrided spec extensions
+    // mainly intended to avoid conflicts between internal and overridden spec extensions
     private boolean isFiltered(final Collection<Extension> extensions, final Extension next) {
         final ClassLoader containerLoader = ParentClassLoaderFinder.Helper.get();
         final Class<? extends Extension> extClass = next.getClass();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/Proxys.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/Proxys.java
index 73e25aaeb3..9ba6da55c0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/Proxys.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/Proxys.java
@@ -28,7 +28,7 @@ import java.util.Collection;
 
 import static java.util.Arrays.asList;
 
-// some helper reused accross several modules
+// some helper reused across several modules
 public final class Proxys {
     public static <T> T threadLocalProxy(final Class<T> type, final ThreadLocal<? extends T> threadLocal, final T defaultValue) {
         return (T) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
index e4702f4a08..652344c295 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
@@ -91,7 +91,7 @@ public class WebappBeanManager extends BeanManagerImpl {
             return parentBm.getInjectableReference(injectionPoint, ctx);
         }
 
-        // we can do it cause there is caching but we shouldn't - easy way to overide OWB actually
+        // we can do it cause there is caching but we shouldn't - easy way to override OWB actually
         final Bean<Object> injectedBean = (Bean<Object>)getInjectionResolver().getInjectionPointBean(injectionPoint);
         try {
             if (parentBm != null && injectedBean != null && injectedBean == parentBm.getInjectionResolver().getInjectionPointBean(injectionPoint)) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/classloader/WebAppEnricher.java b/container/openejb-core/src/main/java/org/apache/openejb/classloader/WebAppEnricher.java
index 1748a9cfcf..91e85f879c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/classloader/WebAppEnricher.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/classloader/WebAppEnricher.java
@@ -21,7 +21,7 @@ import java.net.URL;
 
 public interface WebAppEnricher {
     /**
-     * @param webappClassLaoder the webapp classloader, can be null
+     * @param webappClassLoader the webapp classloader, can be null
      */
-    URL[] enrichment(final ClassLoader webappClassLaoder);
+    URL[] enrichment(final ClassLoader webappClassLoader);
 }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
index 2bc214d896..ddcf2159c8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
@@ -171,7 +171,7 @@ public class ConfigUtils {
 
                     /* 
                      * If the jar entry is already there, no need 
-                     * to add it to the config or go any futher.
+                     * to add it to the config or go any further.
                      */
                     if (jar.equals(target)) {
                         return false;
@@ -191,7 +191,7 @@ public class ConfigUtils {
                      * If a dir entry is already there, the jar
                      * will be loaded automatically.  No need 
                      * to add it explicitly to the config or go
-                     * any futher.
+                     * any further.
                      */
                     if (jarDir != null && jarDir.equals(target)) {
                         return false;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
index b0ef7e8b0b..849226bf24 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
@@ -215,7 +215,7 @@ public class DeploymentsResolver implements DeploymentFilterable {
      */
     public static List<URL> loadFromClasspath(final ClassLoader classLoader) {
         final ClasspathSearcher searchResult = new ClasspathSearcher().loadUrls(classLoader);
-        if (searchResult.prefiltered == null || searchResult.urlSet == null) { // an error occured
+        if (searchResult.prefiltered == null || searchResult.urlSet == null) { // an error occurred
             return new ArrayList<>(); // allow iterator to fully work compared to emptyList()
         }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/GeneratedClientModules.java b/container/openejb-core/src/main/java/org/apache/openejb/config/GeneratedClientModules.java
index 3fa83c943a..b08043785d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/GeneratedClientModules.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/GeneratedClientModules.java
@@ -67,7 +67,7 @@ public class GeneratedClientModules {
             for (final ClientModule clientModule : clientModules) {
                 // we automatically add a ClientModule to every EjbModule
                 // if there didn't turn out to be any clients in the module
-                // just ingore it and remove it from the clientModule list
+                // just ignore it and remove it from the clientModule list
                 final boolean haveMainClassAndDescriptor = clientModule.getMainClass() != null && clientModule.getApplicationClient() != null;
                 final boolean haveAnnotatedClients = clientModule.getLocalClients().size() > 0 || clientModule.getRemoteClients().size() > 0;
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
index e0b1e3cc1b..766e732ebe 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
@@ -466,8 +466,8 @@ public class NewLoaderLogic {
 
             if (!userSuppliedClasspathFilter) {
 
-                logger.info("Applying buildin classpath excludes");
-                timer.event("buildin excludes");
+                logger.info("Applying building classpath excludes");
+                timer.event("building excludes");
                 urlSet = applyBuiltinExcludes(urlSet);
 
             }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
index b7e6e7d3f3..0133a10a71 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
@@ -395,7 +395,7 @@ public class OpenEjb2Conversion implements DynamicDeployer {
                     }
                 }
 
-                // For one-to-one, make sure that the field to recieve the FK
+                // For one-to-one, make sure that the field to receive the FK
                 // is marked as the owning field
                 if (field instanceof OneToOne left) {
                     final OneToOne right = (OneToOne) left.getRelatedField();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java
index 89bf7fc272..0c983ab2e1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java
@@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlRegistry;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.config.sys package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java
index 43b3015448..7c86f0ccc5 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java
@@ -24,7 +24,7 @@ import jakarta.resource.ResourceException;
 import jakarta.resource.spi.ConnectionManager;
 import jakarta.resource.spi.ManagedConnectionFactory;
 /*
-  This reference object is used for wrappering ManagedConnectionFactory objects that
+  This reference object is used for wrapping ManagedConnectionFactory objects that
   manufacture resource specific connection factories. When the getObject( ) method is 
   invoked the factory is created and passed back as the return value.
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/EnvProps.java b/container/openejb-core/src/main/java/org/apache/openejb/core/EnvProps.java
index 22badf8f0e..31cd0f7a4b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/EnvProps.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/EnvProps.java
@@ -42,7 +42,7 @@ public class EnvProps {
     * copy operation so that arguments and return values are passed by reference as a performance optimization.
     * Simply setting the org.apache.openejb.core.EnvProps.INTRA_VM_COPY property to FALSE will cause
     * IntraVM to bypass the copy operations; arguments and return values will be passed by reference not value. 
-    * This property is, by default, alwasy TRUE but it can be changed to FALSE by setting it as a System property
+    * This property is, by default, always TRUE, but it can be changed to FALSE by setting it as a System property
     * or a property of the Property argument when invoking OpenEJB.init(props).
     */
     public static final String INTRA_VM_COPY = "org/openejb/core/ivm/BaseEjbProxyHandler/INTRA_VM_COPY";
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
index ecc3705bfa..784e3386bc 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
@@ -638,8 +638,8 @@ public class CmpContainer implements RpcContainer {
                 // method executes in the same transaction context as the previous ejbCreate(...) method."
                 //
                 // The bean is first insterted using db.create( ) and then after ejbPostCreate( ) its
-                // updated using db.update(). This protocol allows for visablity of the bean after ejbCreate
-                // within the current trasnaction.
+                // updated using db.update(). This protocol allows for visibility of the bean after ejbCreate
+                // within the current transaction.
             } finally {
                 ThreadContext.exit(oldContext);
             }
@@ -729,7 +729,7 @@ public class CmpContainer implements RpcContainer {
                 }
             } else {
                 if (results.size() != 1) {
-                    throw new ObjectNotFoundException("A Enteprise bean with deployment_id = " +
+                    throw new ObjectNotFoundException("An Enterprise bean with deployment_id = " +
                         beanContext.getDeploymentID() +
                         (args != null && args.length >= 1 ? " and primarykey = " + args[0] : "") +
                         " Does not exist");
@@ -823,7 +823,7 @@ public class CmpContainer implements RpcContainer {
     public int update(final BeanContext beanContext, final String methodSignature, final Object... args) throws FinderException {
         final String signature = beanContext.getAbstractSchemaName() + "." + methodSignature;
 
-        // exectue the update query
+        // execute the update query
         return cmpEngine.executeUpdateQuery(beanContext, signature, args);
     }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java
index 8f38974fd5..18ebf089ff 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java
@@ -37,7 +37,7 @@ public class ComplexKeyGenerator extends AbstractKeyGenerator {
             if (isValidPkField(pkObjectField)) {
                 final Field entityBeanField = getField(entityBeanClass, pkObjectField.getName());
                 if (!isValidPkField(entityBeanField)) {
-                    throw new OpenEJBException("Invalid primray key field: " + entityBeanField);
+                    throw new OpenEJBException("Invalid primary key field: " + entityBeanField);
                 }
                 final PkField pkField = new PkField(entityBeanField, pkObjectField);
                 fields.add(pkField);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java
index eb55b754ca..e1f4cd1952 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/SimpleKeyGenerator.java
@@ -28,7 +28,7 @@ public class SimpleKeyGenerator extends AbstractKeyGenerator {
     public SimpleKeyGenerator(final Class beanClass, final String pkField) throws OpenEJBException {
         this.pkField = getField(beanClass, pkField);
         if (!isValidPkField(this.pkField)) {
-            throw new OpenEJBException("Invalid primray key field: " + pkField);
+            throw new OpenEJBException("Invalid primary key field: " + pkField);
         }
     }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
index 47f712f42c..412fb43310 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
@@ -38,7 +38,7 @@ public class Cmp1Generator implements Opcodes {
      * Constructor for a CMP1 class generator.
      *
      * @param cmpImplClass The name of the generated implementation class.
-     * @param beanClass    The source Bean class we're wrappering.
+     * @param beanClass    The source Bean class we're wrapping.
      */
     public Cmp1Generator(final String cmpImplClass, final Class beanClass) {
         beanClassName = Type.getInternalName(beanClass);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
index 4afb4143bd..e506934046 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
@@ -832,7 +832,7 @@ public class Cmp2Generator implements Opcodes {
     /**
      * Generate the OpenEJB_addCmr logic for an individual
      * CMR field.  Each CMR field has a test against the
-     * property name, which is passed to the wrappering
+     * property name, which is passed to the wrapping
      * addCmr method.  This results in a series of
      * if blocks for each defined CMD property.
      *
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java
index 78475f635a..6b15ec363b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java
@@ -51,7 +51,7 @@ public class Cmp2Util {
             return null;
         }
         if (!(handler.container instanceof CmpContainer container)) {
-            throw new IllegalArgumentException("Proxy is not connected to a CMP container but is conect to " + handler.container.getClass().getName());
+            throw new IllegalArgumentException("Proxy is not connected to a CMP container but is connected to " + handler.container.getClass().getName());
         }
         final Bean entity = (Bean) container.getEjbInstance(handler.getBeanContext(), handler.primaryKey);
         return entity;
@@ -67,7 +67,7 @@ public class Cmp2Util {
             return null;
         }
         if (!(handler.container instanceof CmpContainer container)) {
-            throw new IllegalArgumentException("Proxy is not connected to a CMP container but is conect to " + handler.container.getClass().getName());
+            throw new IllegalArgumentException("Proxy is not connected to a CMP container but is connected to " + handler.container.getClass().getName());
         }
         final Bean entity = (Bean) container.getEjbInstance(handler.getBeanContext(), handler.primaryKey);
         return entity;
@@ -83,7 +83,7 @@ public class Cmp2Util {
 
         // get the cmp container
         if (!(beanContext.getContainer() instanceof CmpContainer)) {
-            throw new IllegalArgumentException("Proxy is not connected to a CMP container but is conect to " + beanContext.getContainer().getClass().getName());
+            throw new IllegalArgumentException("Proxy is not connected to a CMP container but is connected to " + beanContext.getContainer().getClass().getName());
         }
 
         final Proxy proxy = (Proxy) EjbObjectProxyHandler.createProxy(beanContext, primaryKey, InterfaceType.EJB_LOCAL_HOME, beanContext.getLocalInterface());
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
index 7919eacca5..31593d2526 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
@@ -315,7 +315,7 @@ public class EntityContainer implements RpcContainer {
         * According to section 9.1.5.1 of the EJB 1.1 specification, the "ejbPostCreate(...)
         * method executes in the same transaction context as the previous ejbCreate(...) method."
         *
-        * For this reason the TransactionScopeHandler methods usally preformed by the invoke( )
+        * For this reason the TransactionScopeHandler methods usually preformed by the invoke( )
         * operation must be handled here along with the call explicitly.
         * This ensures that the afterInvoke() is not processed between the ejbCreate and ejbPostCreate methods to
         * ensure that the ejbPostCreate executes in the same transaction context of the ejbCreate.
@@ -356,9 +356,9 @@ public class EntityContainer implements RpcContainer {
                 // According to section 9.1.5.1 of the EJB 1.1 specification, the "ejbPostCreate(...)
                 // method executes in the same transaction context as the previous ejbCreate(...) method."
                 //
-                // The bean is first insterted using db.create( ) and then after ejbPostCreate( ) its
-                // updated using db.update(). This protocol allows for visablity of the bean after ejbCreate
-                // within the current trasnaction.
+                // The bean is first inserted using db.create( ) and then after ejbPostCreate( ) its
+                // updated using db.update(). This protocol allows for visibility of the bean after ejbCreate
+                // within the current transaction.
             } finally {
                 ThreadContext.exit(oldContext);
             }
@@ -476,7 +476,7 @@ public class EntityContainer implements RpcContainer {
                 try {
                     instanceManager.discardInstance(callContext, bean);
                 } catch (final SystemException e1) {
-                    logger.error("The instance manager encountered an unkown system exception while trying to discard the entity instance with primary key " +
+                    logger.error("The instance manager encountered an unknown system exception while trying to discard the entity instance with primary key " +
                         callContext.getPrimaryKey());
                 }
             }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
index af11caccf2..0bdb1a4b5d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
@@ -557,7 +557,7 @@ public class EntityInstanceManager {
                 try {
                     bean.ejbStore();
                 } catch (final Exception re) {
-                    logger.error("Exception occured during ejbStore()", re);
+                    logger.error("Exception occurred during ejbStore()", re);
                     txPolicy.setRollbackOnly(re);
                 } finally {
                     ThreadContext.exit(oldCallContext);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ClassReference.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ClassReference.java
index 7255dce401..0e495af0aa 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ClassReference.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ClassReference.java
@@ -32,7 +32,7 @@ public class ClassReference extends Reference {
         try {
             return classLoader.loadClass(className);
         } catch (final ClassNotFoundException e) {
-            throw new NamingException("Erorr loading class: " + className);
+            throw new NamingException("Error loading class: " + className);
         }
     }
 }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
index d45e57c903..f79a674f49 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
@@ -90,7 +90,7 @@ public class InitContextFactory implements InitialContextFactory {
             OpenEJB.init(props);
 
         } catch (final Exception e) {
-            throw new NamingException("Cannot initailize OpenEJB", e);
+            throw new NamingException("Cannot initialize OpenEJB", e);
         }
     }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java
index 31bfa9441c..d63706bb76 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java
@@ -194,7 +194,7 @@ public class JaxWsServiceReference extends Reference {
         WebServiceFeature[] features(QName qname, Properties properties);
 
         /**
-         * Note: it is recommanded to use same key type as in features() impl (ie qname)
+         * Note: it is recommendd to use same key type as in features() impl (ie qname)
          *
          * @param port the client instance
          * @param properties configuration of the application
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java
index 1eb6759ba8..bbc4c5876a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java
@@ -63,7 +63,7 @@ public class JndiReference extends Reference {
         synchronized (externalContext) {
             /* According to the JNDI SPI specification multiple threads may not access the same JNDI 
             Context *instance* concurrently. Since we don't know the origines of the federated context we must
-            synchonrize access to it.  JNDI SPI Sepecifiation 1.2 Section 2.2
+            synchronize access to it.  JNDI SPI Specification 1.2 Section 2.2
             */
             return externalContext.lookup(jndiName);
         }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/Instance.java b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/Instance.java
index 99d24341bd..e00f02b897 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/Instance.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/Instance.java
@@ -51,7 +51,7 @@ public class Instance implements Serializable {
     private final ReentrantLock lock = new ReentrantLock();
 
     // todo if we keyed by an entity manager factory id we would not have to make this transient and rebuild the index below
-    // This would require that we crete an id and that we track it
+    // This would require that we create an id and that we track it
     // alternatively, we could use ImmutableArtifact with some read/write replace magic
     private Map<EntityManagerFactory, JtaEntityManagerRegistry.EntityManagerTracker> entityManagers;
     private final JtaEntityManagerRegistry.EntityManagerTracker[] entityManagerArray;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
index 4e2f904595..8920e314e7 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
@@ -541,7 +541,7 @@ public class ManagedContainer implements RpcContainer {
                         final InterceptorStack interceptorStack = new InterceptorStack(instance.bean, null, Operation.PRE_DESTROY, callbackInterceptors, instance.interceptors);
                         interceptorStack.invoke();
                     } catch (final Throwable callbackException) {
-                        final String logMessage = "An unexpected exception occured while invoking the preDestroy method on the removed Stateful SessionBean instance; " + callbackException.getClass().getName() + " " + callbackException.getMessage();
+                        final String logMessage = "An unexpected exception occurred while invoking the preDestroy method on the removed Stateful SessionBean instance; " + callbackException.getClass().getName() + " " + callbackException.getMessage();
 
                         /* [1] Log the exception or error */
                         logger.error(logMessage);
@@ -923,7 +923,7 @@ public class ManagedContainer implements RpcContainer {
                 interceptorStack.invoke();
 
             } catch (final Exception e) {
-                final String message = "An unexpected system exception occured while invoking the afterBegin method on the SessionSynchronization object";
+                final String message = "An unexpected system exception occurred while invoking the afterBegin method on the SessionSynchronization object";
 
                 // [1] Log the exception or error
                 logger.error(message, e);
@@ -969,7 +969,7 @@ public class ManagedContainer implements RpcContainer {
                 } catch (final InvalidateReferenceException e) {
                     // exception has alredy been handled
                 } catch (final Exception e) {
-                    final String message = "An unexpected system exception occured while invoking the beforeCompletion method on the SessionSynchronization object";
+                    final String message = "An unexpected system exception occurred while invoking the beforeCompletion method on the SessionSynchronization object";
 
                     // [1] Log the exception or error
                     logger.error(message, e);
@@ -1012,7 +1012,7 @@ public class ManagedContainer implements RpcContainer {
                 } catch (final InvalidateReferenceException inv) {
                     // exception has alredy been handled
                 } catch (final Throwable e) {
-                    final String message = "An unexpected system exception occured while invoking the afterCompletion method on the SessionSynchronization object";
+                    final String message = "An unexpected system exception occurred while invoking the afterCompletion method on the SessionSynchronization object";
 
                     // [1] Log the exception or error
                     logger.error(message, e);
@@ -1032,7 +1032,7 @@ public class ManagedContainer implements RpcContainer {
             }
 
             if (firstException != null) {
-                throw new OpenEJBRuntimeException("An unexpected system exception occured while invoking the afterCompletion method on the SessionSynchronization object", firstException);
+                throw new OpenEJBRuntimeException("An unexpected system exception occurred while invoking the afterCompletion method on the SessionSynchronization object", firstException);
             }
         }
     }
@@ -1075,7 +1075,7 @@ public class ManagedContainer implements RpcContainer {
                 interceptorStack.invoke();
 
             } catch (final Throwable e) {
-                logger.error("An unexpected exception occured while invoking the ejbPassivate method on the Stateful SessionBean instance", e);
+                logger.error("An unexpected exception occurred while invoking the ejbPassivate method on the Stateful SessionBean instance", e);
             } finally {
                 ThreadContext.exit(oldContext);
             }
@@ -1096,7 +1096,7 @@ public class ManagedContainer implements RpcContainer {
 
                 interceptorStack.invoke();
             } catch (final Throwable e) {
-                logger.error("An unexpected exception occured while invoking the ejbRemove method on the timed-out Stateful SessionBean instance", e);
+                logger.error("An unexpected exception occurred while invoking the ejbRemove method on the timed-out Stateful SessionBean instance", e);
             } finally {
                 logger.info("Removing the timed-out stateful session bean instance " + instance.primaryKey);
                 ThreadContext.exit(oldContext);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java
index 26db711dab..a3576abf8f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java
@@ -42,7 +42,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
     private final ConcurrentHashMap<K, Entry> cache = new ConcurrentHashMap<>();
 
     /**
-     * All values not in use in least resently used order
+     * All values not in use in least recently used order
      */
     private final Queue<Entry> lru = new LinkedBlockingQueue<>();
 
@@ -314,7 +314,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                         iterator.remove();
                         continue;
                     case REMOVED:
-                        // Entry was remmoved between get and lock
+                        // Entry was removed between get and lock
                         iterator.remove();
                         continue;
                 }
@@ -330,7 +330,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                         try {
                             listener.timedOut(entry.getValue());
                         } catch (final Exception e) {
-                            logger.error("An unexpected exception occured from timedOut callback", e);
+                            logger.error("An unexpected exception occurred from timedOut callback", e);
                         }
                     }
                 } else {
@@ -378,7 +378,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                             lru.remove(entry);
                             continue;
                         case REMOVED:
-                            // Entry was remmoved between get and lock
+                            // Entry was removed between get and lock
                             lru.remove(entry);
                             continue;
                     }
@@ -389,14 +389,14 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                     // there is a race condition where the item could get added back into the lru
                     lru.remove(entry);
 
-                    // if the entry is actually timed out we just destroy it; othewise it is written to disk
+                    // if the entry is actually timed out we just destroy it; otherwise it is written to disk
                     if (entry.isTimedOut()) {
                         entry.setState(EntryState.REMOVED);
                         if (listener != null) {
                             try {
                                 listener.timedOut(entry.getValue());
                             } catch (final Exception e) {
-                                logger.error("An unexpected exception occured from timedOut callback", e);
+                                logger.error("An unexpected exception occurred from timedOut callback", e);
                             }
                         }
                     } else {
@@ -435,7 +435,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
         try {
             value = (V) passivator.activate(key);
         } catch (final Exception e) {
-            logger.error("An unexpected exception occured while reading entries from disk", e);
+            logger.error("An unexpected exception occurred while reading entries from disk", e);
         }
 
         if (value == null) {
@@ -461,7 +461,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                     listener.beforeStore(entry.getValue());
                 } catch (final Exception e) {
                     iterator.remove();
-                    logger.error("An unexpected exception occured from beforeStore callback", e);
+                    logger.error("An unexpected exception occurred from beforeStore callback", e);
                 }
             }
 
@@ -475,7 +475,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
         try {
             passivator.passivate(entriesToStore);
         } catch (final Exception e) {
-            logger.error("An unexpected exception occured while writting the entries to disk", e);
+            logger.error("An unexpected exception occurred while writing the entries to disk", e);
         }
     }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java
index 6da962c39d..527ac673eb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java
@@ -72,7 +72,7 @@ public class EndpointHandler extends AbstractEndpointHandler {
         try {
             instance = instanceFactory.recreateInstance(instance);
         } catch (final UnavailableException e) {
-            // an error occured wile attempting to create the replacement instance
+            // an error occurred wile attempting to create the replacement instance
             // this endpoint is now failed
             state = State.RELEASED;
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
index 7cfbc92db0..27b86c7365 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
@@ -45,8 +45,8 @@ import java.util.List;
  * A MdbInstanceFactory creates instances of message driven beans for a single instance. This class differs from other
  * instance managers in OpenEJB as it doesn't do pooling and it creates instances for only a single EJB deployment.
  * </p>
- * The MdbContainer assumes that the resouce adapter is pooling message endpoints so a second level of pooling in the
- * container would be inefficient.  This is true of all known resouce adapters in opensource (ActiveMQ), so if this is
+ * The MdbContainer assumes that the resource adapter is pooling message endpoints so a second level of pooling in the
+ * container would be inefficient.  This is true of all known resource adapters in opensource (ActiveMQ), so if this is
  * a poor assumption for your resource adapter, contact the OpenEJB developers.
  * </p>
  * This class can optionally limit the number of bean instances and therefore the message endpoints available to the
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/State.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/State.java
index 285468a902..4a4a70c247 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/State.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/State.java
@@ -19,7 +19,7 @@ package org.apache.openejb.core.mdb;
 
 enum State {
     /**
-     * The handler has been initialized and is ready for invoation
+     * The handler has been initialized and is ready for invocation
      */
     NONE,
 
@@ -37,7 +37,7 @@ enum State {
 
     /**
      * The message delivery threw a system exception, and the next method called must be afterDelivery
-     * or release.  This state notified the afterDelivery method that the instace must be replaced with a new
+     * or release.  This state notified the afterDelivery method that the instance must be replaced with a new
      * instance.
      */
     SYSTEM_EXCEPTION,
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/CDILoginModule.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/CDILoginModule.java
index aaa896e169..405477f9a4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/CDILoginModule.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/CDILoginModule.java
@@ -46,7 +46,7 @@ import java.util.Set;
  * };
  *
  * Note: you can use instead of delegate &lt;appid&gt; to define a delegate by app.
- * Note 2: loginModuleAsCdiBean=true is recommanded only for @Dependent beans
+ * Note 2: loginModuleAsCdiBean=true is recommendd only for @Dependent beans
  * Note 3: delegate and cdiName can be used alone
  */
 public class CDILoginModule implements LoginModule {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
index fbc5d9ab53..d1b5ace583 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
@@ -250,7 +250,7 @@ public class SingletonContainer implements RpcContainer {
         final Duration accessTimeout = getAccessTimeout(beanContext, runMethod);
         final boolean read = jakarta.ejb.LockType.READ.equals(beanContext.getConcurrencyAttribute(runMethod));
 
-        final Lock lock = aquireLock(read, accessTimeout, instance, runMethod);
+        final Lock lock = acquireLock(read, accessTimeout, instance, runMethod);
 
         Object returnValue;
         try {
@@ -307,7 +307,7 @@ public class SingletonContainer implements RpcContainer {
         return accessTimeout;
     }
 
-    private Lock aquireLock(final boolean read, final Duration accessTimeout, final Instance instance, final Method runMethod) {
+    private Lock acquireLock(final boolean read, final Duration accessTimeout, final Instance instance, final Method runMethod) {
         final Lock lock;
         if (read) {
             lock = instance.lock.readLock();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/Instance.java b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/Instance.java
index 697ab8fc59..75522ecbf4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/Instance.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/Instance.java
@@ -50,7 +50,7 @@ public class Instance implements Serializable, Cache.TimeOut {
     private final LockFactory.StatefulLock lock;
 
     // todo if we keyed by an entity manager factory id we would not have to make this transient and rebuild the index below
-    // This would require that we crete an id and that we track it
+    // This would require that we create an id and that we track it
     // alternatively, we could use ImmutableArtifact with some read/write replace magic
     private Map<EntityManagerFactory, JtaEntityManagerRegistry.EntityManagerTracker> entityManagers;
     private final JtaEntityManagerRegistry.EntityManagerTracker[] entityManagerArray;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
index 561ba64e57..6919b22706 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
@@ -46,7 +46,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
     private final ConcurrentHashMap<K, Entry> cache = new ConcurrentHashMap<>();
 
     /**
-     * All values not in use in least resently used order
+     * All values not in use in least recently used order
      */
     private final Queue<Entry> lru = new LinkedBlockingQueue<>();
 
@@ -245,7 +245,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
 
             entry.lock.lock();
             try {
-                // verfiy state
+                // verify state
                 switch (entry.getState()) {
                     case AVAILABLE:
                         break;
@@ -291,7 +291,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
 
         entry.lock.lock();
         try {
-            // verfiy state
+            // verify state
             switch (entry.getState()) {
                 case AVAILABLE:
                     if (lru.contains(entry)) {
@@ -394,7 +394,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                         iterator.remove();
                         continue;
                     case REMOVED:
-                        // Entry was remmoved between get and lock
+                        // Entry was removed between get and lock
                         iterator.remove();
                         continue;
                 }
@@ -410,7 +410,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                         try {
                             listener.timedOut(entry.getValue());
                         } catch (final Exception e) {
-                            logger.error("An unexpected exception occured from timedOut callback", e);
+                            logger.error("An unexpected exception occurred from timedOut callback", e);
                         }
                     }
                 }
@@ -454,7 +454,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                             lru.remove(entry);
                             continue;
                         case REMOVED:
-                            // Entry was remmoved between get and lock
+                            // Entry was removed between get and lock
                             lru.remove(entry);
                             continue;
                     }
@@ -472,7 +472,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                             try {
                                 listener.timedOut(entry.getValue());
                             } catch (final Exception e) {
-                                logger.error("An unexpected exception occured from timedOut callback", e);
+                                logger.error("An unexpected exception occurred from timedOut callback", e);
                             }
                         }
                     } else {
@@ -511,7 +511,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
         try {
             value = (V) passivator.activate(key);
         } catch (final Exception e) {
-            logger.error("An unexpected exception occured while reading entries from disk", e);
+            logger.error("An unexpected exception occurred while reading entries from disk", e);
         }
 
         if (value == null) {
@@ -537,7 +537,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
                     listener.beforeStore(entry.getValue());
                 } catch (final Exception e) {
                     iterator.remove();
-                    logger.error("An unexpected exception occured from beforeStore callback", e);
+                    logger.error("An unexpected exception occurred from beforeStore callback", e);
                 }
             }
 
@@ -551,7 +551,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
         try {
             passivator.passivate(entriesToStore);
         } catch (final Exception e) {
-            logger.error("An unexpected exception occured while writting the entries to disk", e);
+            logger.error("An unexpected exception occurred while writing the entries to disk", e);
         }
     }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
index f4744e8d90..3a328b37c9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
@@ -628,7 +628,7 @@ public class StatefulContainer implements RpcContainer {
                             interceptorStack.invoke();
                         }
                     } catch (final Throwable t) {
-                        final String logMessage = "An unexpected exception occured while invoking the preDestroy method on the Stateful SessionBean instance: "
+                        final String logMessage = "An unexpected exception occurred while invoking the preDestroy method on the Stateful SessionBean instance: "
                             + (null != instance ? instance.bean.getClass().getName() : beanContext.getBeanClass().getName());
                         logger.error(logMessage, t);
 
@@ -1100,7 +1100,7 @@ public class StatefulContainer implements RpcContainer {
                 interceptorStack.invoke();
 
             } catch (final Exception e) {
-                final String message = "An unexpected system exception occured while invoking the afterBegin method on the SessionSynchronization object";
+                final String message = "An unexpected system exception occurred while invoking the afterBegin method on the SessionSynchronization object";
 
                 // [1] Log the exception or error
                 logger.error(message, e);
@@ -1146,7 +1146,7 @@ public class StatefulContainer implements RpcContainer {
                 } catch (final InvalidateReferenceException e) {
                     // exception has alredy been handled
                 } catch (final Exception e) {
-                    final String message = "An unexpected system exception occured while invoking the beforeCompletion method on the SessionSynchronization object";
+                    final String message = "An unexpected system exception occurred while invoking the beforeCompletion method on the SessionSynchronization object";
 
                     // [1] Log the exception or error
                     logger.error(message, e);
@@ -1189,7 +1189,7 @@ public class StatefulContainer implements RpcContainer {
                 } catch (final InvalidateReferenceException inv) {
                     // exception has alredy been handled
                 } catch (final Throwable e) {
-                    final String message = "An unexpected system exception occured while invoking the afterCompletion method on the SessionSynchronization object";
+                    final String message = "An unexpected system exception occurred while invoking the afterCompletion method on the SessionSynchronization object";
 
                     // [1] Log the exception or error
                     logger.error(message, e);
@@ -1209,7 +1209,7 @@ public class StatefulContainer implements RpcContainer {
             }
 
             if (firstException != null) {
-                throw new OpenEJBRuntimeException("An unexpected system exception occured while invoking the afterCompletion method on the SessionSynchronization object", firstException);
+                throw new OpenEJBRuntimeException("An unexpected system exception occurred while invoking the afterCompletion method on the SessionSynchronization object", firstException);
             }
         }
     }
@@ -1252,7 +1252,7 @@ public class StatefulContainer implements RpcContainer {
                 interceptorStack.invoke();
 
             } catch (final Throwable e) {
-                logger.error("An unexpected exception occured while invoking the ejbPassivate method on the Stateful SessionBean instance", e);
+                logger.error("An unexpected exception occurred while invoking the ejbPassivate method on the Stateful SessionBean instance", e);
             } finally {
                 ThreadContext.exit(oldContext);
             }
@@ -1273,7 +1273,7 @@ public class StatefulContainer implements RpcContainer {
 
                 interceptorStack.invoke();
             } catch (final Throwable e) {
-                logger.error("An unexpected exception occured while invoking the ejbRemove method on the timed-out Stateful SessionBean instance", e);
+                logger.error("An unexpected exception occurred while invoking the ejbRemove method on the timed-out Stateful SessionBean instance", e);
             } finally {
                 logger.info("Removing the timed-out stateful session bean instance " + instance.primaryKey);
                 ThreadContext.exit(oldContext);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
index 83b15896f9..5bd2f805f1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
@@ -337,7 +337,7 @@ public class EjbTimerServiceImpl implements EjbTimerService, Serializable {
             try {
                 data.stop();
             } catch (final EJBException ignored) {
-                log.warning("An error occured deleting trigger '" + key + "' on bean " + deployment.getDeploymentID());
+                log.warning("An error occurred deleting trigger '" + key + "' on bean " + deployment.getDeploymentID());
             }
         }
     }
@@ -809,7 +809,7 @@ public class EjbTimerServiceImpl implements EjbTimerService, Serializable {
                     try {
                         transactionManager.setRollbackOnly();
                     } catch (final SystemException e1) {
-                        log.warning("Exception occured while setting RollbackOnly for container transaction", e1);
+                        log.warning("Exception occurred while setting RollbackOnly for container transaction", e1);
                     }
                 } catch (final OpenEJBException e) {
                     retry = true;
@@ -822,7 +822,7 @@ public class EjbTimerServiceImpl implements EjbTimerService, Serializable {
                         try {
                             transactionManager.setRollbackOnly();
                         } catch (final SystemException e1) {
-                            log.warning("Exception occured while setting RollbackOnly for container transaction", e1);
+                            log.warning("Exception occurred while setting RollbackOnly for container transaction", e1);
                         }
                     }
                 } finally {
@@ -839,16 +839,16 @@ public class EjbTimerServiceImpl implements EjbTimerService, Serializable {
                             transactionManager.rollback();
                         }
                     } catch (final Exception e) {
-                        log.warning("Exception occured while completing container transaction", e);
+                        log.warning("Exception occurred while completing container transaction", e);
                     }
                 }
             }
             log.warning("Failed to execute ejbTimeout on " + timerData.getDeploymentId() + " successfully within " + retryAttempts + " attempts");
         } catch (final RuntimeException e) {
-            log.warning("RuntimeException occured while calling ejbTimeout", e);
+            log.warning("RuntimeException occurred while calling ejbTimeout", e);
             throw e;
         } catch (final Error e) {
-            log.warning("Error occured while calling ejbTimeout", e);
+            log.warning("Error occurred while calling ejbTimeout", e);
             throw e;
         } finally {
             thread.setContextClassLoader(loader);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java
index 90b8d8ceaf..989ff2e4e0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java
@@ -89,7 +89,7 @@ public class MemoryTimerStore implements TimerStore {
         return out;
     }
 
-    // used to re-register a TimerData, if a cancel() is rolledback...
+    // used to re-register a TimerData, if a cancel() is rolled back...
     @Override
     public void addTimerData(final TimerData timerData) throws TimerStoreException {
         getTasks().addTimerData(timerData);
@@ -187,11 +187,11 @@ public class MemoryTimerStore implements TimerStore {
         private final Map<Long, TimerData> add = new TreeMap<>();
         private final Set<Long> remove = new TreeSet<>();
         private final Lock lock = new ReentrantLock();
-        private final RuntimeException concurentException;
-        private final WeakReference<Transaction> tansactionReference;
+        private final RuntimeException concurrentException;
+        private final WeakReference<Transaction> transactionReference;
 
         /**
-         * This class is not designed to be multi-treaded under the assumption
+         * This class is not designed to be multithreaded under the assumption
          * that transactions are single-threaded and this view is only supposed
          * to be used within the transaction for which it was created.
          *
@@ -204,11 +204,11 @@ public class MemoryTimerStore implements TimerStore {
             // never let it go.  Any other threads attempting to invoke this object
             // will immediately throw an exception.
             lock.lock();
-            concurentException = new IllegalThreadStateException("Object can only be invoked by Thread[" + Thread.currentThread().getName() + "] in Transaction[" + transaction + "]");
-            concurentException.fillInStackTrace();
+            concurrentException = new IllegalThreadStateException("Object can only be invoked by Thread[" + Thread.currentThread().getName() + "] in Transaction[" + transaction + "]");
+            concurrentException.fillInStackTrace();
             try {
                 transaction.registerSynchronization(this);
-                tansactionReference = new WeakReference<>(transaction);
+                transactionReference = new WeakReference<>(transaction);
             } catch (final RollbackException e) {
                 throw new TimerStoreException("Transaction has been rolled back");
             } catch (final SystemException e) {
@@ -218,7 +218,7 @@ public class MemoryTimerStore implements TimerStore {
 
         private void checkThread() {
             if (!lock.tryLock()) {
-                throw new IllegalStateException("Illegal access by Thread[" + Thread.currentThread().getName() + "]", concurentException);
+                throw new IllegalStateException("Illegal access by Thread[" + Thread.currentThread().getName() + "]", concurrentException);
             }
         }
 
@@ -265,7 +265,7 @@ public class MemoryTimerStore implements TimerStore {
         public void afterCompletion(final int status) {
             checkThread();
 
-            // if the tx was not committed, there is nothign to update
+            // if the tx was not committed, there is nothing to update
             if (status != Status.STATUS_COMMITTED) {
                 return;
             }
@@ -276,7 +276,7 @@ public class MemoryTimerStore implements TimerStore {
             // remove work
             taskStore.keySet().removeAll(remove);
 
-            tasksByTransaction.remove(tansactionReference.get());
+            tasksByTransaction.remove(transactionReference.get());
         }
     }
 }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java
index 1dfcf2623e..27024ea206 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java
@@ -66,13 +66,13 @@ public abstract class JtaTransactionPolicy implements TransactionPolicy {
     public abstract Transaction getCurrentTransaction();
 
     public boolean isTransactionActive() {
-        final Transaction trasaction = getCurrentTransaction();
-        if (trasaction == null) {
+        final Transaction tx = getCurrentTransaction();
+        if (tx == null) {
             return false;
         }
 
         try {
-            final int status = trasaction.getStatus();
+            final int status = tx.getStatus();
             return status == Status.STATUS_ACTIVE || status == Status.STATUS_MARKED_ROLLBACK;
         } catch (final jakarta.transaction.SystemException e) {
             return false;
@@ -80,10 +80,10 @@ public abstract class JtaTransactionPolicy implements TransactionPolicy {
     }
 
     public boolean isRollbackOnly() {
-        final Transaction trasaction = getCurrentTransaction();
-        if (trasaction != null) {
+        final Transaction tx = getCurrentTransaction();
+        if (tx != null) {
             try {
-                final int status = trasaction.getStatus();
+                final int status = tx.getStatus();
                 return status == Status.STATUS_MARKED_ROLLBACK;
             } catch (final jakarta.transaction.SystemException e) {
                 return false;
@@ -99,9 +99,9 @@ public abstract class JtaTransactionPolicy implements TransactionPolicy {
 
     @Override
     public void setRollbackOnly(final Throwable reason) {
-        final Transaction trasaction = getCurrentTransaction();
-        if (trasaction != null) {
-            setRollbackOnly(trasaction, reason);
+        final Transaction tx = getCurrentTransaction();
+        if (tx != null) {
+            setRollbackOnly(tx, reason);
         } else {
             rollbackOnly = true;
         }
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleWorkManager.java b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleWorkManager.java
index 0323a53f35..be9a92cdb3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleWorkManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleWorkManager.java
@@ -106,7 +106,7 @@ public class SimpleWorkManager implements WorkManager {
             throw workRejectedException;
         }
 
-        // accecpt all other work
+        // accept all other work
         workListener.workAccepted(new WorkEvent(this, WorkEvent.WORK_ACCEPTED, work, null));
 
         // execute work
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
index 5ddfaff86c..e0348adb34 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
@@ -39,7 +39,7 @@ public interface TransactionPolicy {
     TransactionType getTransactionType();
 
     /**
-     * Is this a new transaction and not an inhreited transaction or no transaction?  Some
+     * Is this a new transaction and not an inherited transaction or no transaction?  Some
      * TransactionTypes, such as Required or Supported, use the caller's
      * transaction instead of starting a new transaction.  If there is no active
      * transaction (e.g., TransactionType is NotSupported), this method will
@@ -50,7 +50,7 @@ public interface TransactionPolicy {
 
 
     /**
-     * Is this policy running in an inhreited transaction?  Some
+     * Is this policy running in an inherited transaction?  Some
      * TransactionTypes, such as Required or Supported, use the caller's
      * transaction instead of starting a new transaction.  If there is no active
      * transaction (e.g., TransactionType is NotSupported), this method will
@@ -129,7 +129,7 @@ public interface TransactionPolicy {
 
     /**
      * Registers a listener for transaction synchronization events.  If there is
-     * an actual transaction active, the events are fired when the acutal
+     * an actual transaction active, the events are fired when the actual
      * transaction is commited; otherwise the events are fired when this
      * TransactionPolicy completes.
      *
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicyFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicyFactory.java
index 14d0cf3c7b..11657f0e4b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicyFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicyFactory.java
@@ -26,7 +26,7 @@ import org.apache.openejb.SystemException;
 public interface TransactionPolicyFactory {
     /**
      * Creates and begins a TransactionPolicy for the specified TransactionType.
-     * If this method returns successfully, the specfied transaction type is
+     * If this method returns successfully, the specified transaction type is
      * active and must be committed.
      *
      * @param type the desired type of transaction
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
index 1344bfd117..30fa7b3d49 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
@@ -137,7 +137,7 @@ public class PortAddressRegistryImpl implements PortAddressRegistry {
             }
         }
 
-        // check if there is a unique port with the specifiec interface
+        // check if there is a unique port with the specified interface
         if (referenceClassName != null) {
             final Map<String, PortAddress> interfacePorts = portsByInterface.get(referenceClassName);
             if (interfacePorts != null && interfacePorts.size() == 1) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
index a15b8b6391..d55b7bc5ba 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
@@ -386,7 +386,7 @@ public class ProviderWrapper extends Provider {
                 }
                 // no-op
             }
-        } catch (final Exception ingored) {
+        } catch (final Exception ignored) {
             // no-op
         }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/log/LoggerCreator.java b/container/openejb-core/src/main/java/org/apache/openejb/log/LoggerCreator.java
index c1fb803400..51207f3f7d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/log/LoggerCreator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/log/LoggerCreator.java
@@ -35,7 +35,7 @@ public class LoggerCreator implements Callable<Logger> {
     public LoggerCreator(final String channel) {
         name = channel;
 
-        // force eager init if config overrided
+        // force eager init if config overridden
         final Properties p = SystemInstance.get().getProperties();
         final String levelName = p.getProperty("logging.level." + channel);
         if (levelName != null) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java b/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
index 1e8fbad540..216b815494 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
  * <p>
  * Methods {@link java.util.logging.Logger#doSetParent(Logger)}, {@link java.util.logging.Logger#getParent()},
  * {@link java.util.logging.Logger#setUseParentHandlers(boolean)} and
- * {@link java.util.logging.Logger#getUseParentHandlers()} are not overrriden.
+ * {@link java.util.logging.Logger#getUseParentHandlers()} are not overridden.
  * </p>
  * <p>
  * Level mapping inspired by org.slf4j.bridge.SLF4JBridgeHandler:
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java b/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java
index 9a77e996f0..a42faaec5d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java
@@ -137,7 +137,7 @@ public class Skewness extends AbstractStorelessUnivariateStatistic implements Se
     }
 
     /**
-     * Returns the Skewness of the entries in the specifed portion of the
+     * Returns the Skewness of the entries in the specified portion of the
      * input array.
      * <p>
      * See {@link Skewness} for the definition used in the computation.</p>
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
index 72f75591e4..59fbab53b3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
@@ -34,7 +34,7 @@ import java.util.Set;
 
 /**
  * The JtaQuery is a wrapper around a query and and entity manager that automatically closes the entity managers
- * when the query is finished.  This implementation is only for non-transaction queryies
+ * when the query is finished.  This implementation is only for non-transaction queries
  */
 public class JtaQuery implements Query {
     private EntityManager entityManager;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQFactory.java
index 52da2af0d1..bc1b214386 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQFactory.java
@@ -88,7 +88,7 @@ public class ActiveMQFactory {
     }
 
     /**
-     * Returns the prefix metafile name of the poperties file that ActiveMQ should be
+     * Returns the prefix metafile name of the properties file that ActiveMQ should be
      * provided with. This file is located at META-INF/services/org/apache/activemq/broker/
      * and defines the BrokerFactoryHandler to load.
      *
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/LocalXAResource.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/LocalXAResource.java
index eea8dcaac8..798c9e8764 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/LocalXAResource.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/LocalXAResource.java
@@ -124,7 +124,7 @@ public class LocalXAResource implements XAResource {
 
         try {
             if (connection.isClosed()) {
-                throw new XAException("Conection is closed");
+                throw new XAException("Connection is closed");
             }
 
             if (!connection.isReadOnly()) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
index 4dda838153..d43f33b8eb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
@@ -174,7 +174,7 @@ public class ManagedConnection implements InvocationHandler {
                     if (xaConnection == null) {
                         try {
                             setAutoCommit(false);
-                        } catch (final SQLException xae) { // we are alreay in a transaction so this can't be called from a user perspective - some XA DataSource prevents it in their code
+                        } catch (final SQLException xae) { // we are already in a transaction so this can't be called from a user perspective - some XA DataSource prevents it in their code
                             final String message = "Can't set auto commit to false cause the XA datasource doesn't support it, this is likely an issue";
 
                             if (LOGGER.isDebugEnabled()) { // we don't want to print the exception by default
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java b/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
index 3fda77e52d..deaf4cb992 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
@@ -68,7 +68,7 @@ public class JarExtractor {
     }
 
     /**
-     * Extract the jar file into the specifiec destination directory.  If the destination directory
+     * Extract the jar file into the specified destination directory.  If the destination directory
      * already exists, the jar will not be unpacked.
      *
      * @param file           jar file to unpack
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
index 27efa7eab2..e15c68c8fb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
@@ -108,7 +108,7 @@ public class Messages {
             }
             return mf.format(args);
         } catch (final Exception except) {
-            return "An internal error occured while processing message " + message;
+            return "An internal error occurred while processing message " + message;
         }
     }
 
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
index 9ac70f5a2c..d286ffec24 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
@@ -54,7 +54,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
  * may be called.
  *
  * To simply fill the pool without a corresponding pop(), the add() method
- * must be used.  This method will attempt to aquire a permit to add to the pool.
+ * must be used.  This method will attempt to acquire a permit to add to the pool.
  *
  * @version $Rev$ $Date$
  */
@@ -215,7 +215,7 @@ public class Pool<T> {
      * A pop() call that returns null is considered successful.
      *
      * @param timeout time to block while waiting for an instance
-     * @param unit    unit of time dicated by the timeout
+     * @param unit    unit of time dictated by the timeout
      * @return an entry from the pool or null indicating permission to create and push() an instance into the pool
      * @throws InterruptedException  vm level thread interruption
      * @throws IllegalStateException if a permit could not be acquired
@@ -231,7 +231,7 @@ public class Pool<T> {
      * A pop() call that returns null is considered successful.
      *
      * @param timeout time to block while waiting for an instance
-     * @param unit    unit of time dicated by the timeout
+     * @param unit    unit of time dictated by the timeout
      * @param record  should this be reflected in the stats
      * @return an entry from the pool or null indicating permission to create and push() an instance into the pool
      * @throws InterruptedException  vm level thread interruption
@@ -275,7 +275,7 @@ public class Pool<T> {
     }
 
     /**
-     * Attempt to aquire a permit to add the object to the pool.
+     * Attempt to acquire a permit to add the object to the pool.
      *
      * @param obj object to add to the pool
      * @return true of the item as added
@@ -285,7 +285,7 @@ public class Pool<T> {
     }
 
     /**
-     * Attempt to aquire a permit to add the object to the pool.
+     * Attempt to acquire a permit to add the object to the pool.
      *
      * @param obj    object to add to the pool
      * @param offset creation time offset, used for maxAge
@@ -442,7 +442,7 @@ public class Pool<T> {
      * Used when a call to pop() was made that returned null
      * indicating that the caller has a permit to create an
      * object for this pool, but the caller will not be exercising
-     * that permit and wishes intstead to return "null" to the pool.
+     * that permit and wishes instead to return "null" to the pool.
      */
     public void discard() {
         discard(null);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java b/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
index 2557708813..bba1f47b41 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
@@ -337,7 +337,7 @@ public class URISupport {
     }
 
     /**
-     * Creates a URI from the original URI and the remaining paramaters
+     * Creates a URI from the original URI and the remaining parameters
      *
      * @throws URISyntaxException
      */
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java b/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
index 53b1e00894..0fb99db4f6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
@@ -76,7 +76,7 @@ public class UrlCache {
         while (!locationStack.isEmpty()) {
             final URL url = locationStack.removeFirst();
 
-            // Skip any duplicate urls in the claspath
+            // Skip any duplicate urls in the classpath
             if (cachedUrls.contains(url)) {
                 continue;
             }
@@ -233,7 +233,7 @@ public class UrlCache {
         if (success) {
             // add cache file to cache
             appCache.put(url, cacheFile);
-            logger.debug("Coppied jar file to " + cacheFile);
+            logger.debug("Copied jar file to " + cacheFile);
             return cacheFile;
         } else {
             // clean up failed copy
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java
index 33531e1eca..49791ce954 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ClassDefiner.java
@@ -67,8 +67,8 @@ public class ClassDefiner implements DefiningClassService, InstantiatingClassSer
         DEFINE_CLASS = defineClass;
     }
 
-    // needs to be public because OpenWebBeans will instanciate it as a service to call the
-    // implmemented methods at the bottom of the class
+    // needs to be public because OpenWebBeans will instantiate it as a service to call the
+    // implemented methods at the bottom of the class
     public ClassDefiner() {
         // no-op
     }
diff --git a/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties b/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
index e3fa47370d..4fb52bf409 100644
--- a/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
+++ b/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
@@ -28,7 +28,7 @@ startup.noSecurityManagerInstalled=No SecurityManager installed. Installing defa
 startup.couldNotInstalllDefaultSecurityManager=Could not install default SecurityManager: {0}: {1}
 startup.noInitializationProperties=No initialization properties were passed in, using system properties instead.
 startup.noApplicationServerSpecified=No ApplicationServer was specified!  The container system will only be accessible by same-vm clients via the IntraVm Server.
-startup.deprecatedPropertyName=Deprecated: The propery name "{0}" is deprecated and will be removed in a future version of OpenEJB, please use the property name "openejb.assembler" instead.
+startup.deprecatedPropertyName=Deprecated: The property name "{0}" is deprecated and will be removed in a future version of OpenEJB, please use the property name "openejb.assembler" instead.
 startup.instantiatingAssemblerClass=Instantiating assembler class {0}
 startup.assemblerCannotBeInstantiated=OpenEJB has encountered a fatal error and cannot be started: Assembler cannot be instantiated.
 startup.openejbEncounteredUnexpectedError=OpenEJB has encountered a fatal error and cannot be started: OpenEJB encountered an unexpected error while attempting to instantiate the assembler.
@@ -47,7 +47,7 @@ startup.securityService=SecurityService   : {0}
 startup.assemblerReturnedNullTransactionManager=OpenEJB has encountered a fatal error and cannot be started: The Assembler returned a null transaction manager.
 startup.transactionManager=TransactionManager: {0}
 startup.ready=OpenEJB Container System ready.
-startup.noContainersConfigured=Attemtped to access containers where none are configured.
+startup.noContainersConfigured=Attempted to access containers where none are configured.
 startup.scrapeFailedForModule=Unable to scrape for @Stateful, @Stateless or @MessageDriven annotations. Invalid EjbModule URL: {0}
 startup.scrapeFailedForClientModule=Unable to scrape for @LocalClient or @RemoteClient annotations.  ClientModule: {0}
 startup.scrapeFailedForClientModule.url=Unable to scrape for @LocalClient or @RemoteClient annotations.  Invalid ClientModule URL: {0}
diff --git a/container/openejb-core/src/main/resources/schema/openejb-jar.xsd b/container/openejb-core/src/main/resources/schema/openejb-jar.xsd
index 46171c78c9..cc885fdafd 100644
--- a/container/openejb-core/src/main/resources/schema/openejb-jar.xsd
+++ b/container/openejb-core/src/main/resources/schema/openejb-jar.xsd
@@ -37,7 +37,7 @@
     ejb-name:       The name of the ejb as it is in the ejb-name element in the
                     bean's ejb-jar.xml.  This name will be used to locate the ejb
                     declaration in the ejb-jar.xml.  The deployment information 
-                    decalred here will be applied to this ejb.
+                    declared here will be applied to this ejb.
     
     deployment-id:  A name for the ejb that is unique not only in this jar, but 
                     in all the jars in the container system.  This name will allow
@@ -73,7 +73,7 @@
     The openejb-jar.xml is placed in the bean's jar to link the bean
     into the container system.  The bean must be given a unique id
     and it's resource references must be resolved and linked to actual
-    resources in the container sytem.
+    resources in the container system.
     -->
     <xsd:element name="openejb-jar">
         <xsd:complexType>
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
index 0fb11a2833..6fe84ea47f 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
@@ -297,7 +297,7 @@ public class DynamicDataSourceTest {
                 }
             }
 
-            // the developper set the datasource to use
+            // the developer set the datasource to use
             return currentDataSource.get();
         }
 
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallFlowReference.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallFlowReference.java
index ca0f945c34..f639e050dc 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallFlowReference.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallFlowReference.java
@@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p class="changed_added_2_2">Identifiy the called flow.</p>
+ * <p class="changed_added_2_2">Identify the called flow.</p>
  *
  * <div class="changed_added_2_2">
  *
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/KeyedCollection.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/KeyedCollection.java
index 026ffce3a9..3bfef9e0f0 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/KeyedCollection.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/KeyedCollection.java
@@ -29,7 +29,7 @@ import java.util.Map;
  * the value using either the provided KeyExtractor, or if no KeyExtractor was
  * provided, the value is cast to Keyable and the getKey() method is called.
  *
- * The underlying Map can be obtainded with the toMap method.  Any changes to this
+ * The underlying Map can be obtained with the toMap method.  Any changes to this
  * map are directly reflected in this collection.  Additions to the map do not
  * need to implement Keyable, nor do the values need to be keyed using the key
  * returned from the KeyExtractor.getKey(value) or the key returned from the
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
index 0ee7c65282..e925cdbf7c 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
@@ -30,7 +30,7 @@ import javax.xml.namespace.QName;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.jee2 package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ObjectFactory.java
index b5cced5b3c..2164bd26ea 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ObjectFactory.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the org.apache.bval.jsr.xml package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ObjectFactory.java
index 59fe008ec6..35342e0e48 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ObjectFactory.java
@@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlRegistry;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.jee.jba package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ObjectFactory.java
index 8e4e1848fa..14f62e5a3e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/cmp/ObjectFactory.java
@@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlRegistry;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.jee.jba.cmp package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ObjectFactory.java
index ad8e134fca..275bdf0feb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ObjectFactory.java
@@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlRegistry;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.jee.jpa package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java
index 39edf5c1e1..a2efd152cc 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java
@@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlRegistry;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.persistence.xml package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
index 83c8c4296f..8ff48439fb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.jee.oej2 package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ObjectFactory.java
index dad7987ea9..aeee11be2d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ObjectFactory.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.alt.config.ejb package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ObjectFactory.java
index 450b4e99c2..99fc78aa10 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ObjectFactory.java
@@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlRegistry;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.jee.sun package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ObjectFactory.java
index d4c5abc5ec..cd1df88581 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ObjectFactory.java
@@ -25,7 +25,7 @@ import jakarta.xml.bind.annotation.XmlRegistry;
  * element interface generated in the org.apache.openejb.jee.was.v6.common
  * package.
  *
- * An ObjectFactory allows you to programatically construct new instances of the
+ * An ObjectFactory allows you to programmatically construct new instances of the
  * Java representation for XML content. The Java representation of XML content
  * can consist of schema derived interfaces and classes representing the binding
  * of schema type definitions, element declarations and model groups. Factory
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ObjectFactory.java
index 9b88a94a73..ce113c6a23 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ObjectFactory.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * element interface generated in the org.apache.openejb.jee.was.v6.commonbnd
  * package.
  *
- * An ObjectFactory allows you to programatically construct new instances of the
+ * An ObjectFactory allows you to programmatically construct new instances of the
  * Java representation for XML content. The Java representation of XML content
  * can consist of schema derived interfaces and classes representing the binding
  * of schema type definitions, element declarations and model groups. Factory
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ObjectFactory.java
index 6e1d2a2912..1d5a265cd4 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/ObjectFactory.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * element interface generated in the org.apache.openejb.jee.was.v6.ecore
  * package.
  *
- * An ObjectFactory allows you to programatically construct new instances of the
+ * An ObjectFactory allows you to programmatically construct new instances of the
  * Java representation for XML content. The Java representation of XML content
  * can consist of schema derived interfaces and classes representing the binding
  * of schema type definitions, element declarations and model groups. Factory
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ObjectFactory.java
index 59f5e5a17f..ad2702fe89 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ObjectFactory.java
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
  * This object contains factory methods for each Java content interface and Java
  * element interface generated in the org.apache.openejb.jee.was.v6.ejb package.
  *
- * An ObjectFactory allows you to programatically construct new instances of the
+ * An ObjectFactory allows you to programmatically construct new instances of the
  * Java representation for XML content. The Java representation of XML content
  * can consist of schema derived interfaces and classes representing the binding
  * of schema type definitions, element declarations and model groups. Factory
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/ObjectFactory.java
index bcf5357077..dfa6ea83cb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/ObjectFactory.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * element interface generated in the org.apache.openejb.jee.was.v6.ejbbnd
  * package.
  *
- * An ObjectFactory allows you to programatically construct new instances of the
+ * An ObjectFactory allows you to programmatically construct new instances of the
  * Java representation for XML content. The Java representation of XML content
  * can consist of schema derived interfaces and classes representing the binding
  * of schema type definitions, element declarations and model groups. Factory
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ObjectFactory.java
index 2ec2bdebf2..32019fbec5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/ObjectFactory.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * element interface generated in the org.apache.openejb.jee.was.v6.java
  * package.
  *
- * An ObjectFactory allows you to programatically construct new instances of the
+ * An ObjectFactory allows you to programmatically construct new instances of the
  * Java representation for XML content. The Java representation of XML content
  * can consist of schema derived interfaces and classes representing the binding
  * of schema type definitions, element declarations and model groups. Factory
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ObjectFactory.java
index 7bb6642a16..c82ad9eb02 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ObjectFactory.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * element interface generated in the
  * org.apache.openejb.jee.was.v6.webservice.clientbnd package.
  *
- * An ObjectFactory allows you to programatically construct new instances of the
+ * An ObjectFactory allows you to programmatically construct new instances of the
  * Java representation for XML content. The Java representation of XML content
  * can consist of schema derived interfaces and classes representing the binding
  * of schema type definitions, element declarations and model groups. Factory
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ObjectFactory.java
index a3d0753191..ed33420a6d 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ObjectFactory.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * element interface generated in the org.apache.openejb.jee.was.v6.wsclient
  * package.
  *
- * An ObjectFactory allows you to programatically construct new instances of the
+ * An ObjectFactory allows you to programmatically construct new instances of the
  * Java representation for XML content. The Java representation of XML content
  * can consist of schema derived interfaces and classes representing the binding
  * of schema type definitions, element declarations and model groups. Factory
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/ObjectFactory.java
index 79ee423a1a..f26eb45ea0 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/ObjectFactory.java
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
  * This object contains factory methods for each Java content interface and Java
  * element interface generated in the org.apache.openejb.jee.was.v6.xmi package.
  *
- * An ObjectFactory allows you to programatically construct new instances of the
+ * An ObjectFactory allows you to programmatically construct new instances of the
  * Java representation for XML content. The Java representation of XML content
  * can consist of schema derived interfaces and classes representing the binding
  * of schema type definitions, element declarations and model groups. Factory
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/wls/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/wls/ObjectFactory.java
index 99ec6fa78f..e9bfbf99be 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/wls/ObjectFactory.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/wls/ObjectFactory.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
  * This object contains factory methods for each
  * Java content interface and Java element interface
  * generated in the org.apache.openejb.jee.wls package.
- * <p>An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programmatically
  * construct new instances of the Java representation
  * for XML content. The Java representation of XML
  * content can consist of schema derived interfaces
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
index f795198b02..e352202371 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
@@ -38,7 +38,7 @@ public class MakeTxLookup implements Opcodes {
         final File file = new File(args[0]);
 
         createTopLinkStrategy(file);
-        createHibernteStrategy(file);
+        createHibernateStrategy(file);
         // hibernate repackaged its SPI...keeping all the same excepted packages
         createNewHibernateStrategy(file, HIBERNATE_NEW_FACTORY, "org/hibernate/service/jta/platform/internal");
         createNewHibernateStrategy(file, HIBERNATE_NEW_FACTORY2, "org/hibernate/engine/transaction/jta/platform/internal");
@@ -98,7 +98,7 @@ public class MakeTxLookup implements Opcodes {
         write(basedir, cw, target.replace('.', '/'));
     }
 
-    private static void createHibernteStrategy(final File baseDir) throws Exception {
+    private static void createHibernateStrategy(final File baseDir) throws Exception {
 
         final String factory = HIBERNATE_FACTORY;
 
diff --git a/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java b/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java
index 23f2dca25b..00a11104b9 100644
--- a/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java
+++ b/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java
@@ -35,7 +35,7 @@ public @interface ContextConfig {
     String configFile() default "";
 
     /**
-     * Array of properties. The properties file has precedency in being loaded, so
+     * Array of properties. The properties file has precedence in being loaded, so
      * any properties listed here will overwrite those loaded from the properties file.
      *
      * Again, a Method's properties are loaded after a class' properties, so will
@@ -43,7 +43,7 @@ public @interface ContextConfig {
      *
      * If you specify both a properties file and properties for both a method and a class,
      * first the class' file and properties will be loaded, then the method's file
-     * and properties, so the precedency is effectively the following:
+     * and properties, so the precedence is effectively the following:
      * <ol>
      * <li>Class properties file
      * <li>Class properties
diff --git a/container/openejb-junit/src/main/java/org/apache/openejb/junit/context/Util.java b/container/openejb-junit/src/main/java/org/apache/openejb/junit/context/Util.java
index 318de12fa8..2a3d88d26d 100644
--- a/container/openejb-junit/src/main/java/org/apache/openejb/junit/context/Util.java
+++ b/container/openejb-junit/src/main/java/org/apache/openejb/junit/context/Util.java
@@ -36,7 +36,7 @@ public final class Util {
      */
     public static boolean isInstance(final Class type, final Object instance) {
         if (type.isPrimitive()) {
-            // for primitives the insance can't be null
+            // for primitives the instance can't be null
             if (instance == null) {
                 return false;
             }
@@ -59,7 +59,7 @@ public final class Util {
             } else if (type.equals(double.class)) {
                 return instance instanceof Double;
             } else {
-                throw new AssertionError("Invalid primitve type: " + type);
+                throw new AssertionError("Invalid primitive type: " + type);
             }
         }
 
diff --git a/docs/admin/configuration/server.adoc b/docs/admin/configuration/server.adoc
index e6ee292409..744172fd91 100644
--- a/docs/admin/configuration/server.adoc
+++ b/docs/admin/configuration/server.adoc
@@ -18,7 +18,7 @@
 |jakarta.persistence.nonJtaDataSource|	string	|override the non JTA datasource value for persistence contexts
 |openejb.descriptors.output	|bool|	dump memory deployment descriptors. Can be used to set complete metadata to true and avoid scanning when starting the container or to check the used configuration.
 |openejb.deployments.classpath.require.descriptor	|CLIENT or EJB|	can allow to filter what you want to scan (client modules or ejb modules)
-|openejb.descriptors.output.folder|	path|	where to dump deployement descriptors if activated.
+|openejb.descriptors.output.folder|	path|	where to dump deployment descriptors if activated.
 |openejb.strict.interface.declaration	|bool|	add some validations on session beans (spec validations in particular). false by default.
 |openejb.conf.file or openejb.configuration|	string|	OpenEJB configuration file path
 |openejb.debuggable-vm-hackery	|bool|	remove JMS information from deployment
diff --git a/examples/cdi-dynamic-inject/src/main/java/org/superbiz/cdi/inject/dynamic/FinalizePayment.java b/examples/cdi-dynamic-inject/src/main/java/org/superbiz/cdi/inject/dynamic/FinalizePayment.java
index e5f30dfce7..7ab2910ade 100644
--- a/examples/cdi-dynamic-inject/src/main/java/org/superbiz/cdi/inject/dynamic/FinalizePayment.java
+++ b/examples/cdi-dynamic-inject/src/main/java/org/superbiz/cdi/inject/dynamic/FinalizePayment.java
@@ -41,24 +41,24 @@ public class FinalizePayment {
 	@Any
 	private Instance<Payment> paymentsLazy;
 	
-	Payment paymentChoosed;
+	Payment paymentChosen;
 	
 	public String finishWithCash() {
 
-		paymentChoosed = paymentsLazy.select(Cash.class).get();
-		return paymentChoosed.pay();
+		paymentChosen = paymentsLazy.select(Cash.class).get();
+		return paymentChosen.pay();
 	}
 	
 	public String finishWithCreditCard() {
 
-		paymentChoosed = paymentsLazy.select(CreditCard.class).get();
-		return paymentChoosed.pay();
+		paymentChosen = paymentsLazy.select(CreditCard.class).get();
+		return paymentChosen.pay();
 	}
 
 	public String finishByQualifier(PaymentType type) {
 
-		paymentChoosed = paymentsLazy.select( new PayByQualifier(type) ).get();
+		paymentChosen = paymentsLazy.select( new PayByQualifier(type) ).get();
 		
-		return paymentChoosed.pay();
+		return paymentChosen.pay();
 	}
 }
diff --git a/examples/concurrency-utils/src/main/java/org/superbiz/executor/ManagedScheduledService.java b/examples/concurrency-utils/src/main/java/org/superbiz/executor/ManagedScheduledService.java
index 59d2a761ed..e87775c4fd 100644
--- a/examples/concurrency-utils/src/main/java/org/superbiz/executor/ManagedScheduledService.java
+++ b/examples/concurrency-utils/src/main/java/org/superbiz/executor/ManagedScheduledService.java
@@ -92,10 +92,10 @@ public class ManagedScheduledService {
     }
 
     /**
-     * Will simulate a long running operation
+     * Will simulate a long-running operation
      *
      * @param value          The value to compute
-     * @param taskDurationMs the time lenght of the operation
+     * @param taskDurationMs the time length of the operation
      * @param errorMessage   If not null an exception with be thrown with this message
      * @return a {@link Callable} with the result
      */
diff --git a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/DeterminedRouter.java b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/DeterminedRouter.java
index f650f8018b..939dafeb26 100644
--- a/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/DeterminedRouter.java
+++ b/examples/dynamic-datasource-routing/src/main/java/org/superbiz/dynamicdatasourcerouting/DeterminedRouter.java
@@ -76,7 +76,7 @@ public class DeterminedRouter extends AbstractRouter {
             }
         }
 
-        // the developper set the datasource to use
+        // the developer set the datasource to use
         return currentDataSource.get();
     }
 
diff --git a/examples/pojo-webservice/soapui.log b/examples/pojo-webservice/soapui.log
index 303a73518a..40145040f4 100644
--- a/examples/pojo-webservice/soapui.log
+++ b/examples/pojo-webservice/soapui.log
@@ -11,7 +11,7 @@
 2012-06-28 18:59:33,029 INFO  [SchemaUtils] Added default schema from file:/opt/softs/soapui-4.0.1/bin/soapui-4.0.1.jar!/com/eviware/soapui/resources/xsds/soapEnvelope12.xsd with targetNamespace http://www.w3.org/2003/05/soap-envelope
 2012-06-28 18:59:33,036 INFO  [SchemaUtils] Added default schema from file:/opt/softs/soapui-4.0.1/bin/soapui-4.0.1.jar!/com/eviware/soapui/resources/xsds/soapEncoding12.xsd with targetNamespace http://www.w3.org/2003/05/soap-encoding
 2012-06-28 18:59:46,131 ERROR [WsdlLoader] Failed to load url [http://localhost:8080/pojo-webservice?wsdl]
-2012-06-28 18:59:46,132 ERROR [SoapUI] An error occured [com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException], see error log for details
+2012-06-28 18:59:46,132 ERROR [SoapUI] An error occurred [com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException], see error log for details
 2012-06-28 18:59:46,134 ERROR [errorlog] com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException
 com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException
 	at com.eviware.soapui.impl.wsdl.support.wsdl.WsdlLoader.loadXmlObject(WsdlLoader.java:138)
@@ -23,7 +23,7 @@ com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException
 	at com.eviware.soapui.support.swing.SwingWorker$2.run(SwingWorker.java:149)
 	at java.lang.Thread.run(Thread.java:662)
 2012-06-28 19:00:22,801 ERROR [WsdlLoader] Failed to load url [http://127.0.01:8080/pojo-webservice?wsdl]
-2012-06-28 19:00:22,801 ERROR [SoapUI] An error occured [com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException], see error log for details
+2012-06-28 19:00:22,801 ERROR [SoapUI] An error occurred [com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException], see error log for details
 2012-06-28 19:00:22,801 ERROR [errorlog] com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException
 com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException
 	at com.eviware.soapui.impl.wsdl.support.wsdl.WsdlLoader.loadXmlObject(WsdlLoader.java:138)
@@ -35,7 +35,7 @@ com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException
 	at com.eviware.soapui.support.swing.SwingWorker$2.run(SwingWorker.java:149)
 	at java.lang.Thread.run(Thread.java:662)
 2012-06-28 19:01:09,714 ERROR [WsdlLoader] Failed to load url [http://localhost:8080/pojo-webservice/?wsdl]
-2012-06-28 19:01:09,715 ERROR [SoapUI] An error occured [com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException], see error log for details
+2012-06-28 19:01:09,715 ERROR [SoapUI] An error occurred [com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException], see error log for details
 2012-06-28 19:01:09,715 ERROR [errorlog] com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException
 com.eviware.soapui.impl.support.definition.support.InvalidDefinitionException
 	at com.eviware.soapui.impl.wsdl.support.wsdl.WsdlLoader.loadXmlObject(WsdlLoader.java:138)
diff --git a/examples/polling-parent/polling-client/src/main/java/jug/client/util/CommandManager.java b/examples/polling-parent/polling-client/src/main/java/jug/client/util/CommandManager.java
index e0b64f0d69..f27b635552 100644
--- a/examples/polling-parent/polling-client/src/main/java/jug/client/util/CommandManager.java
+++ b/examples/polling-parent/polling-client/src/main/java/jug/client/util/CommandManager.java
@@ -56,7 +56,7 @@ public class CommandManager {
                 }
             }
         } catch (RuntimeException | IOException e) {
-            LOGGER.log(Level.SEVERE, "an error occured while getting commands", e);
+            LOGGER.log(Level.SEVERE, "an error occurred while getting commands", e);
         }
     }
 
diff --git a/examples/server-events/src/main/java/org/superbiz/event/MyListener.java b/examples/server-events/src/main/java/org/superbiz/event/MyListener.java
index 2d0938c9dd..a052001d8e 100644
--- a/examples/server-events/src/main/java/org/superbiz/event/MyListener.java
+++ b/examples/server-events/src/main/java/org/superbiz/event/MyListener.java
@@ -33,7 +33,7 @@ public class MyListener {
     private static boolean logAllEvent = false; // static for testing
 
     public void global(@Observes final Object event) {
-        LOGGER.info(">>> an event occured -> " + event.toString());
+        LOGGER.info(">>> an event occurred -> " + event.toString());
     }
 
     // configurable
diff --git a/examples/singleton-startup-ordering/src/main/java/org/foo/SingletonC.java b/examples/singleton-startup-ordering/src/main/java/org/foo/SingletonC.java
index 3ed179390c..ecec15608a 100644
--- a/examples/singleton-startup-ordering/src/main/java/org/foo/SingletonC.java
+++ b/examples/singleton-startup-ordering/src/main/java/org/foo/SingletonC.java
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
 
 
 /**
- * Singlenton C only is annotated with @Singleton and will be lazy initialized.
+ * Singleton C only is annotated with @Singleton and will be lazy initialized.
  */
 @Singleton
 public class SingletonC {
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java
index 3204135ad7..8024c9a789 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java
@@ -62,7 +62,7 @@ public class ShoppingCartBean implements SessionBean, jakarta.ejb.SessionSynchro
             return calc;
 
         } catch (final java.rmi.RemoteException re) {
-            throw new RuntimeException("Getting calulator bean failed");
+            throw new RuntimeException("Getting calculator bean failed");
         } catch (final javax.naming.NamingException re) {
             throw new RuntimeException("Using JNDI failed");
         }
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
index e399491525..460b9f5c95 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
@@ -150,10 +150,10 @@ public class AllowedOperationsBmpBean implements jakarta.ejb.EntityBean {
     /**
      * Maps to BasicBmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return OperationsPolicy
      */
     public OperationsPolicy getAllowedOperationsReport(final String methodName) {
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java
index 34b36b4a08..2cdc6b35e9 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesBean.java
@@ -220,10 +220,10 @@ public class BasicBmp2DataSourcesBean implements jakarta.ejb.EntityBean {
     /**
      * Maps to BasicBmp2DataSourcesObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return OperationPolicy
      */
     public OperationsPolicy getAllowedOperationsReport(final String methodName) {
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesObject.java
index d41db3a863..eeda8ec1b1 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmp2DataSourcesObject.java
@@ -35,10 +35,10 @@ public interface BasicBmp2DataSourcesObject extends jakarta.ejb.EJBObject {
     public Properties getPermissionsReport() throws RemoteException;
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName) throws RemoteException;
 }
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
index 3dddde501b..5e7b178aa8 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
@@ -280,10 +280,10 @@ public class BasicBmpBean implements jakarta.ejb.EntityBean {
     /**
      * Maps to BasicBmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see BasicBmpObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpObject.java
index 1e61af20bd..863741e8bb 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpObject.java
@@ -49,10 +49,10 @@ public interface BasicBmpObject extends jakarta.ejb.EJBObject {
     public Properties getPermissionsReport() throws RemoteException;
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName) throws RemoteException;
 }
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java
index dca39e7276..369d7052a2 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java
@@ -135,10 +135,10 @@ public abstract class AllowedOperationsCmp2Bean implements EntityBean {
     /**
      * Maps to BasicCmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     public OperationsPolicy getAllowedOperationsReport(final String methodName) {
         return allowedOperationsTable.get(methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java
index d0f0e5701c..e7e1568e75 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java
@@ -137,10 +137,10 @@ public class AllowedOperationsCmpBean implements EntityBean {
     /**
      * Maps to BasicCmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see BasicCmpObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java
index 37040a2748..8dba782802 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java
@@ -130,10 +130,10 @@ public abstract class BasicCmp2Bean implements EntityBean {
     /**
      * Maps to BasicCmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     public OperationsPolicy getAllowedOperationsReport(final String methodName) {
         return allowedOperationsTable.get(methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2PojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2PojoBean.java
index 47f3bcac27..069bf229cb 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2PojoBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2PojoBean.java
@@ -150,10 +150,10 @@ public abstract class BasicCmp2PojoBean implements EntityBean {
     /**
      * Maps to BasicCmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     public OperationsPolicy getAllowedOperationsReport(final String methodName) {
         return allowedOperationsTable.get(methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpBean.java
index 786047da07..6936a24523 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpBean.java
@@ -149,10 +149,10 @@ public class BasicCmpBean implements jakarta.ejb.EntityBean {
     /**
      * Maps to BasicCmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see BasicCmpObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpObject.java
index 2261958a68..27c69ab939 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmpObject.java
@@ -50,10 +50,10 @@ public interface BasicCmpObject extends EJBObject {
     Properties getPermissionsReport() throws RemoteException;
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     OperationsPolicy getAllowedOperationsReport(String methodName) throws RemoteException;
 }
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmp2Bean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmp2Bean.java
index c8ed795b97..6441ddb667 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmp2Bean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmp2Bean.java
@@ -119,10 +119,10 @@ public abstract class ComplexCmp2Bean implements EntityBean {
     /**
      * Maps to BasicCmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     public OperationsPolicy getAllowedOperationsReport(final String methodName) {
         return allowedOperationsTable.get(methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmpBean.java
index f262c7df56..735e0fac89 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmpBean.java
@@ -136,10 +136,10 @@ public class ComplexCmpBean implements EntityBean {
     /**
      * Maps to BasicCmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see org.apache.openejb.test.entity.cmp.BasicCmpObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmpObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmpObject.java
index c9271d0954..cf236aede7 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmpObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ComplexCmpObject.java
@@ -50,10 +50,10 @@ public interface ComplexCmpObject extends EJBObject {
     Properties getPermissionsReport() throws RemoteException;
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     OperationsPolicy getAllowedOperationsReport(String methodName) throws RemoteException;
 }
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmp2Bean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmp2Bean.java
index 18a15171ae..c35bbb7739 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmp2Bean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmp2Bean.java
@@ -119,10 +119,10 @@ public abstract class UnknownCmp2Bean implements EntityBean {
     /**
      * Maps to BasicCmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     public OperationsPolicy getAllowedOperationsReport(final String methodName) {
         return allowedOperationsTable.get(methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpBean.java
index 048d95306a..abd2ae5599 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpBean.java
@@ -136,10 +136,10 @@ public class UnknownCmpBean implements EntityBean {
     /**
      * Maps to BasicCmpObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see org.apache.openejb.test.entity.cmp.BasicCmpObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpObject.java
index f3284f8ae2..bd3964d17a 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/UnknownCmpObject.java
@@ -50,10 +50,10 @@ public interface UnknownCmpObject extends EJBObject {
     Properties getPermissionsReport() throws RemoteException;
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     OperationsPolicy getAllowedOperationsReport(String methodName) throws RemoteException;
 }
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
index 51109e62f9..5aac5be7c6 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
@@ -124,10 +124,10 @@ public class BasicMdbBean implements BasicMdbObject, MessageDrivenBean, MessageL
     /**
      * Maps to BasicStatelessObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      */
     @Override
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbObject.java
index 60235e57ee..a38a9a1b21 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbObject.java
@@ -52,10 +52,10 @@ public interface BasicMdbObject {
     Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     OperationsPolicy getAllowedOperationsReport(String methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBean.java
index 340ad6dfdc..fb5e5ef13f 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBean.java
@@ -99,10 +99,10 @@ public class BasicSingletonBean implements SessionBean, TimedObject {
     /**
      * Maps to BasicSingletonObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see BasicSingletonObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBusinessLocal.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBusinessLocal.java
index 4b867afaaf..48caf70982 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBusinessLocal.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBusinessLocal.java
@@ -54,10 +54,10 @@ public interface BasicSingletonBusinessLocal {
     public Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBusinessRemote.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBusinessRemote.java
index e887d2fcf2..4901b89ded 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBusinessRemote.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBusinessRemote.java
@@ -54,10 +54,10 @@ public interface BasicSingletonBusinessRemote {
     public Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonLocalObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonLocalObject.java
index a26517c712..f8a1565bec 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonLocalObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonLocalObject.java
@@ -52,10 +52,10 @@ public interface BasicSingletonLocalObject extends jakarta.ejb.EJBLocalObject {
     public Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonObject.java
index 7ce0f0896c..e89a932977 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonObject.java
@@ -53,10 +53,10 @@ public interface BasicSingletonObject extends jakarta.ejb.EJBObject {
     public Properties getPermissionsReport() throws RemoteException;
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName) throws RemoteException;
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonPojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonPojoBean.java
index 7d74e60ed9..f144587ff6 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonPojoBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonPojoBean.java
@@ -80,10 +80,10 @@ public class BasicSingletonPojoBean implements BasicSingletonBusinessLocal, Basi
     /**
      * Maps to BasicSingletonObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see org.apache.openejb.test.singleton.BasicSingletonObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java
index 6bfce0d7b7..c25f2705d9 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BMTStatefulBean.java
@@ -108,10 +108,10 @@ public class BMTStatefulBean implements jakarta.ejb.SessionBean {
     /**
      * Maps to BasicStatefulObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see BasicStatefulObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java
index 3fa8a7391a..47e7850b8e 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBean.java
@@ -106,10 +106,10 @@ public class BasicStatefulBean implements jakarta.ejb.SessionBean, SessionSynchr
     /**
      * Maps to BasicStatefulObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see BasicStatefulObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBusinessLocal.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBusinessLocal.java
index 55c2158454..4c910c8578 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBusinessLocal.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBusinessLocal.java
@@ -54,10 +54,10 @@ public interface BasicStatefulBusinessLocal {
     public Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBusinessRemote.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBusinessRemote.java
index ed57b8a599..021b38f8fa 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBusinessRemote.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulBusinessRemote.java
@@ -54,10 +54,10 @@ public interface BasicStatefulBusinessRemote {
     public Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulLocalObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulLocalObject.java
index f2fe0ccf7f..5dcdbec1f3 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulLocalObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulLocalObject.java
@@ -53,10 +53,10 @@ public interface BasicStatefulLocalObject extends jakarta.ejb.EJBLocalObject {
     public Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName);
 
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulObject.java
index 1bf87c5ab3..0e365bcd1a 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulObject.java
@@ -49,10 +49,10 @@ public interface BasicStatefulObject extends jakarta.ejb.EJBObject {
     public Properties getPermissionsReport() throws RemoteException;
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName) throws RemoteException;
 
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulPojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulPojoBean.java
index 3c21065c39..f9cceb646f 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulPojoBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulPojoBean.java
@@ -85,10 +85,10 @@ public class BasicStatefulPojoBean implements BasicStatefulBusinessLocal, BasicS
     /**
      * Maps to BasicStatelessObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see org.apache.openejb.test.stateless.BasicStatelessObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java
index 47db67efc1..0644edc207 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java
@@ -34,7 +34,7 @@ public class PersistenceContextStatefulBean {
 
     private EntityManager extendedEntityManager;
 
-    // Used for testing propigation
+    // Used for testing propagation
     private static EntityManager inheritedDelegate;
     private SessionContext ejbContext;
 
@@ -120,12 +120,12 @@ public class PersistenceContextStatefulBean {
                 // get the raw entity manager so we can test it below
                 inheritedDelegate = (EntityManager) em.getDelegate();
 
-                // The extended entity manager is not propigated to a non-extended entity manager unless there is a transaction
+                // The extended entity manager is not propagated to a non-extended entity manager unless there is a transaction
                 final EntityManager nonExtendedEm = (EntityManager) ctx.lookup("java:comp/env/persistence/TestContext");
                 nonExtendedEm.getFlushMode();
                 final EntityManager nonExtendedDelegate = ((EntityManager) nonExtendedEm.getDelegate());
                 Assert.assertTrue("non-extended entity manager should be open", nonExtendedDelegate.isOpen());
-                Assert.assertNotSame("Extended non-extended entity manager shound not be the same instance as extendend entity manager when accessed out side of a transactions",
+                Assert.assertNotSame("Extended non-extended entity manager should not be the same instance as extended entity manager when accessed out side of a transactions",
                     inheritedDelegate,
                     nonExtendedDelegate);
 
@@ -133,12 +133,12 @@ public class PersistenceContextStatefulBean {
                 //
                 // Note: this code also tests EBJ 3.0 Persistence spec 5.9.1 "UserTransaction is begun within the method, the
                 // container associates the persistence context with the JTA transaction and calls EntityManager.joinTransaction."
-                // If our the extended entity manager were not associted with the transaction, the non-extended entity manager would
+                // If our the extended entity manager were not associated with the transaction, the non-extended entity manager would
                 // not see it.
                 final UserTransaction userTransaction = ejbContext.getUserTransaction();
                 userTransaction.begin();
                 try {
-                    Assert.assertSame("Extended non-extended entity manager to be same instance as extendend entity manager",
+                    Assert.assertSame("Extended non-extended entity manager to be same instance as extended entity manager",
                         inheritedDelegate,
                         nonExtendedEm.getDelegate());
                 } finally {
@@ -151,7 +151,7 @@ public class PersistenceContextStatefulBean {
                 final PersistenceContextStatefulHome home = (PersistenceContextStatefulHome) ejbContext.getEJBHome();
                 final PersistenceContextStatefulObject object = home.create();
 
-                // test the new stateful bean recieved the context
+                // test the new stateful bean received the context
                 object.testPropgation();
 
                 // remove the bean
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
index 741f84bcf7..3aa19aaf3a 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
@@ -101,10 +101,10 @@ public class BasicStatelessBean implements SessionBean, TimedObject {
     /**
      * Maps to BasicStatelessObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see BasicStatelessObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessLocal.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessLocal.java
index c7a18abbd5..9e74c036a0 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessLocal.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessLocal.java
@@ -59,10 +59,10 @@ public interface BasicStatelessBusinessLocal {
     public Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessRemote.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessRemote.java
index a9b43bf1e1..ce57665ada 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessRemote.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessRemote.java
@@ -54,10 +54,10 @@ public interface BasicStatelessBusinessRemote {
     public Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessLocalObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessLocalObject.java
index fc268f1888..a3467abec3 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessLocalObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessLocalObject.java
@@ -52,10 +52,10 @@ public interface BasicStatelessLocalObject extends jakarta.ejb.EJBLocalObject {
     public Properties getPermissionsReport();
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName);
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessObject.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessObject.java
index 0d17c61275..b5aeecfbeb 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessObject.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessObject.java
@@ -53,10 +53,10 @@ public interface BasicStatelessObject extends jakarta.ejb.EJBObject {
     public Properties getPermissionsReport() throws RemoteException;
 
     /**
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return operations policy
      */
     public OperationsPolicy getAllowedOperationsReport(String methodName) throws RemoteException;
diff --git a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java
index 33316f4719..c15da0c97b 100644
--- a/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java
+++ b/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java
@@ -88,10 +88,10 @@ public class BasicStatelessPojoBean implements BasicStatelessBusinessLocal, Basi
     /**
      * Maps to BasicStatelessObject.getAllowedOperationsReport
      *
-     * Returns a report of the allowed opperations
+     * Returns a report of the allowed operations
      * for one of the bean's methods.
      *
-     * @param methodName The method for which to get the allowed opperations report
+     * @param methodName The method for which to get the allowed operations report
      * @return
      * @see org.apache.openejb.test.stateless.BasicStatelessObject#getAllowedOperationsReport
      */
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RiTestServer.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RiTestServer.java
index 7050224dad..f48f21e38d 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RiTestServer.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/RiTestServer.java
@@ -42,7 +42,7 @@ public class RiTestServer implements TestServer {
     protected File testHome;
 
     /**
-     * The environment variable <code>test.home</code> sould be set
+     * The environment variable <code>test.home</code> should be set
      * to the base directory where the test suite is located.
      */
     public static final String TEST_HOME = "test.home";
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpAllowedOperationsTests.java
index d0b521a987..d6e4fb3d76 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpAllowedOperationsTests.java
@@ -148,7 +148,7 @@ public class BmpAllowedOperationsTests extends BasicBmpTestClient {
          * method has already been called by the container.
          *
          * TO DO:
-         * Implement a little application senario to ensure
+         * Implement a little application scenario to ensure
          * that all methods tested for below have been called
          * by the container.
          */
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpAllowedOperationsTests.java
index 9835f822f3..b6e5ab0be6 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpAllowedOperationsTests.java
@@ -148,7 +148,7 @@ public class CmpAllowedOperationsTests extends BasicCmpTestClient {
          * method has already been called by the container.
          *
          * TO DO:
-         * Implement a little application senario to ensure
+         * Implement a little application scenario to ensure
          * that all methods tested for below have been called
          * by the container.
          */
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2AllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2AllowedOperationsTests.java
index dc7643860b..722d6bf47b 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2AllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2AllowedOperationsTests.java
@@ -149,7 +149,7 @@ public class Cmp2AllowedOperationsTests extends BasicCmp2TestClient {
          * method has already been called by the container.
          *
          * TO DO:
-         * Implement a little application senario to ensure
+         * Implement a little application scenario to ensure
          * that all methods tested for below have been called
          * by the container.
          */
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java
index 0733cdbc70..55f6ed5faf 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbTestSuite.java
@@ -31,7 +31,7 @@ public class MdbTestSuite extends junit.framework.TestCase {
     public static junit.framework.Test suite() {
         final TestSuite suite = new FilteredTestSuite();
 
-        // Verify the famework is working
+        // Verify the framework is working
         suite.addTest(new MdbConnectionFactoryTests());
         suite.addTest(new BasicMdbTests());
 
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java
index b8127c4829..8b354646ea 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/BMTSingletonAllowedOperationsTests.java
@@ -77,7 +77,7 @@ public class BMTSingletonAllowedOperationsTests extends BasicSingletonTestClient
         * method has already been called by the container.
         *
         * TO DO:
-        * Implement a little application senario to ensure
+        * Implement a little application scenario to ensure
         * that all methods tested for below have been called
         * by the container.
         */
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java
index c795b2b276..0d868e9da6 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/singleton/SingletonAllowedOperationsTests.java
@@ -81,7 +81,7 @@ public class SingletonAllowedOperationsTests extends BasicSingletonTestClient {
          * method has already been called by the container.
          *
          * TO DO:
-         * Implement a little application senario to ensure
+         * Implement a little application scenario to ensure
          * that all methods tested for below have been called
          * by the container.
          */
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 8fdc000ef9..040ebfc372 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
@@ -125,9 +125,9 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase
     public void test02_java_comp_UserTransaction() {
         try {
             final Transaction t = ejbObject.jndiUserTransaction();
-            assertNotNull("UserTransaction is null. Could not retreive a UserTransaction from the bean's JNDI namespace.", t);
+            assertNotNull("UserTransaction is null. Could not retrieve a UserTransaction from the bean's JNDI namespace.", t);
         } catch (final Exception e) {
-            fail("Could not retreive a UserTransaction from the bean's JNDI namespace. Received Exception " + e.getClass() + " : " + e.getMessage());
+            fail("Could not retrieve a UserTransaction from the bean's JNDI namespace. Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
@@ -185,7 +185,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase
             assertNotNull("The transaction was not commited.  The record is null", actual);
             assertEquals("The transaction was not commited cleanly.", expected, actual);
         } catch (final RollbackException re) {
-            fail("Transaction was rolledback.  Received Exception " + re.getClass() + " : " + re.getMessage());
+            fail("Transaction was rolled back. Received Exception " + re.getClass() + " : " + re.getMessage());
         } catch (final Exception e) {
             fail("Received Exception " + e.getClass() + " : " + e.getMessage());
         }
@@ -283,7 +283,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase
      * <B>11.6.1 Bean-managed transaction demarcation</B>
      *
      * The actions performed by the Container for an instance with bean-managed transaction are summarized
-     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently
+     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is currently
      * associated with the instance (i.e. a transaction that was started but not completed by a previous
      * business method).
      *
@@ -332,7 +332,7 @@ public class SingletonBeanTxTests extends org.apache.openejb.test.NamedTestCase
      * <B>11.6.1 Bean-managed transaction demarcation</B>
      *
      * The actions performed by the Container for an instance with bean-managed transaction are summarized
-     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently
+     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is currently
      * associated with the instance (i.e. a transaction that was started but not completed by a previous
      * business method).
      *
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java
index d8dc7c5c14..f11083959f 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/BMTStatefulAllowedOperationsTests.java
@@ -77,7 +77,7 @@ public class BMTStatefulAllowedOperationsTests extends BasicStatefulTestClient {
          * method has already been called by the container.
          *
          * TO DO:
-         * Implement a little application senario to ensure
+         * Implement a little application scenario to ensure
          * that all methods tested for below have been called
          * by the container.
          */
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java
index 097e1ccef7..903a497b67 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulAllowedOperationsTests.java
@@ -99,7 +99,7 @@ public class StatefulAllowedOperationsTests extends BasicStatefulTestClient {
          * method has already been called by the container.
          *
          * TO DO:
-         * Implement a little application senario to ensure
+         * Implement a little application scenario to ensure
          * that all methods tested for below have been called
          * by the container.
          */
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 dead0c5e60..81e10695d1 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
@@ -125,9 +125,9 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase {
     public void test02_java_comp_UserTransaction() {
         try {
             final Transaction t = ejbObject.jndiUserTransaction();
-            assertNotNull("UserTransaction is null. Could not retreive a UserTransaction from the bean's JNDI namespace.", t);
+            assertNotNull("UserTransaction is null. Could not retrieve a UserTransaction from the bean's JNDI namespace.", t);
         } catch (final Exception e) {
-            fail("Could not retreive a UserTransaction from the bean's JNDI namespace. Received Exception " + e.getClass() + " : " + e.getMessage());
+            fail("Could not retrieve a UserTransaction from the bean's JNDI namespace. Received Exception " + e.getClass() + " : " + e.getMessage());
         }
     }
 
@@ -214,7 +214,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase {
         //// Now check that the account really wasn't added.
         //try{
         //    actual = ejbObject.retreiveAccount( expected.getSsn() );
-        //    //assertTrue( "The transaction was commited when it should have been rolledback.", !expected.equals(actual) );
+        //    //assertTrue( "The transaction was commited when it should have been rolled back.", !expected.equals(actual) );
         //} catch (Exception e){
         //    fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
         //}
@@ -279,7 +279,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase {
      * <B>11.6.1 Bean-managed transaction demarcation</B>
      *
      * The actions performed by the Container for an instance with bean-managed transaction are summarized
-     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently
+     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is currently
      * associated with the instance (i.e. a transaction that was started but not completed by a previous
      * business method).
      *
@@ -328,7 +328,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase {
      * <B>11.6.1 Bean-managed transaction demarcation</B>
      *
      * The actions performed by the Container for an instance with bean-managed transaction are summarized
-     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently
+     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is currently
      * associated with the instance (i.e. a transaction that was started but not completed by a previous
      * business method).
      *
@@ -377,7 +377,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase {
      * <B>11.6.1 Bean-managed transaction demarcation</B>
      *
      * The actions performed by the Container for an instance with bean-managed transaction are summarized
-     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently
+     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is currently
      * associated with the instance (i.e. a transaction that was started but not completed by a previous
      * business method).
      *
@@ -425,7 +425,7 @@ public class StatefulBeanTxTests extends org.apache.openejb.test.NamedTestCase {
      * <B>11.6.1 Bean-managed transaction demarcation</B>
      *
      * The actions performed by the Container for an instance with bean-managed transaction are summarized
-     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is cur-rently
+     * by the following table. T1 is a transaction associated with a client request, T2 is a transaction that is currently
      * associated with the instance (i.e. a transaction that was started but not completed by a previous
      * business method).
      *
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java
index ed17dd588f..fc13904bc1 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/BMTStatelessAllowedOperationsTests.java
@@ -77,7 +77,7 @@ public class BMTStatelessAllowedOperationsTests extends BasicStatelessTestClient
         * method has already been called by the container.
         *
         * TO DO:
-        * Implement a little application senario to ensure
+        * Implement a little application scenario to ensure
         * that all methods tested for below have been called
         * by the container.
         */
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAllowedOperationsTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAllowedOperationsTests.java
index 9e1c7b5c35..d34353237a 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAllowedOperationsTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessAllowedOperationsTests.java
@@ -81,7 +81,7 @@ public class StatelessAllowedOperationsTests extends BasicStatelessTestClient {
          * method has already been called by the container.
          *
          * TO DO:
-         * Implement a little application senario to ensure
+         * Implement a little application scenario to ensure
          * that all methods tested for below have been called
          * by the container.
          */
diff --git a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/SecondStatefulInterceptedBean.java b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/SecondStatefulInterceptedBean.java
index 8488c59455..90e1b68ab2 100644
--- a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/SecondStatefulInterceptedBean.java
+++ b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/SecondStatefulInterceptedBean.java
@@ -53,7 +53,7 @@ public class SecondStatefulInterceptedBean extends SuperInterceptedBean
     }
 
     /**
-     * A simple dummy busines method to reverse a string
+     * A simple dummy business method to reverse a string
      */
     @Interceptors({MethodInterceptor.class})
     public String reverse(final String str) {
diff --git a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptedBean.java b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptedBean.java
index 9c13d63493..429fc30ab8 100644
--- a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptedBean.java
+++ b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptedBean.java
@@ -53,7 +53,7 @@ public class StatefulInterceptedBean extends SuperInterceptedBean
     }
 
     /**
-     * A simple dummy busines method to reverse a string
+     * A simple dummy business method to reverse a string
      */
     @Interceptors({MethodInterceptor.class})
     public String reverse(final String str) {
diff --git a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/ThirdStatefulInterceptedBean.java b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/ThirdStatefulInterceptedBean.java
index c1911a7e43..bca2a30865 100644
--- a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/ThirdStatefulInterceptedBean.java
+++ b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/ThirdStatefulInterceptedBean.java
@@ -53,7 +53,7 @@ public class ThirdStatefulInterceptedBean extends SuperInterceptedBean
     }
 
     /**
-     * A simple dummy busines method to reverse a string
+     * A simple dummy business method to reverse a string
      */
     @Interceptors({MethodInterceptor.class})
     public String reverse(final String str) {
diff --git a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/SecondStatelessInterceptedBean.java b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/SecondStatelessInterceptedBean.java
index 31de1fa856..a5d9c76347 100644
--- a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/SecondStatelessInterceptedBean.java
+++ b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/SecondStatelessInterceptedBean.java
@@ -53,7 +53,7 @@ public class SecondStatelessInterceptedBean extends SuperInterceptedBean
     }
 
     /**
-     * A simple dummy busines method to reverse a string
+     * A simple dummy business method to reverse a string
      */
     @Interceptors({MethodInterceptor.class})
     public String reverse(final String str) {
diff --git a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java
index 56fe65d47d..91cf7f3608 100644
--- a/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java
+++ b/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java
@@ -53,7 +53,7 @@ public class ThirdStatelessInterceptedBean extends SuperInterceptedBean
     }
 
     /**
-     * A simple dummy busines method to reverse a string
+     * A simple dummy business method to reverse a string
      *
      * @see org.apache.openejb.test.stateless.BasicStatelessInterceptedLocal#reverse(java.lang.String)
      */
diff --git a/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java b/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
index 12ae1e7e3b..adeccefe30 100644
--- a/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
+++ b/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
@@ -592,7 +592,7 @@ public class TomEEEmbeddedMojo extends AbstractMojo {
         final String classifier;
         final String type;
         if (infos.length < 3) {
-            throw new MojoExecutionException("format for librairies should be <groupId>:<artifactId>:<version>[:<type>[:<classifier>]]");
+            throw new MojoExecutionException("format for libraries should be <groupId>:<artifactId>:<version>[:<type>[:<classifier>]]");
         }
         if (infos.length >= 4) {
             type = infos[3];
@@ -724,11 +724,11 @@ public class TomEEEmbeddedMojo extends AbstractMojo {
      *
      * Note that reload and quit/exit are built in commands.
      *
-     * It is recommanded to prefix the command by something specific to your set of commands.
+     * It is recommended to prefix the command by something specific to your set of commands.
      */
     public interface Command {
         /**
-         * @return the string to invoke this comamnd.
+         * @return the string to invoke this command.
          */
         String name();
 
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/JwtValidationGenerator.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/JwtValidationGenerator.java
index 889af27fd2..5aababa904 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/JwtValidationGenerator.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/JwtValidationGenerator.java
@@ -27,7 +27,7 @@ import java.util.List;
 
 /**
  * We allow CDI and EJB beans to use BeanValidation to validate a JsonWebToken
- * instance by simply creating contstraints and putting them on that method.
+ * instance by simply creating constraints and putting them on that method.
  *
  * BeanValidation doesn't "see" them there so we have to generate a class
  * that has the annotations in a place BeanValidation can see.
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
index ba66be7d7f..7d11eca655 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
 
 /**
  * We allow CDI and EJB beans to use BeanValidation to validate a JsonWebToken
- * instance by simply creating contstraints and putting them on that method.
+ * instance by simply creating constraints and putting them on that method.
  *
  * BeanValidation doesn't "see" them there so we have to generate a class
  * that has the annotations in a place BeanValidation can see.
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java
index a29b61e22e..fb8e9ae4a3 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java
@@ -56,7 +56,7 @@ public class JWTCallerPrincipal implements JsonWebToken {
      * Create the DefaultJWTCallerPrincipal from the parsed JWT token and the extracted principal name
      *
      * @param jwt  - the parsed JWT token representation
-     * @param name - the extracted unqiue name to use as the principal name; from "upn", "preferred_username" or "sub" claim
+     * @param name - the extracted unique name to use as the principal name; from "upn", "preferred_username" or "sub" claim
      */
     public JWTCallerPrincipal(final String jwt, final String type, final JwtClaims claimsSet, final String name) {
         this.name = name;
diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/ClientInjectionProcessor.java b/server/openejb-client/src/main/java/org/apache/openejb/client/ClientInjectionProcessor.java
index b60226cb6a..ed398943c9 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/ClientInjectionProcessor.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/ClientInjectionProcessor.java
@@ -327,7 +327,7 @@ public class ClientInjectionProcessor<T> {
 
     private static boolean isInstance(final Class type, final Object instance) {
         if (type.isPrimitive()) {
-            // for primitives the insance can't be null
+            // for primitives the instance can't be null
             if (instance == null) {
                 return false;
             }
@@ -350,7 +350,7 @@ public class ClientInjectionProcessor<T> {
             } else if (type.equals(double.class)) {
                 return instance instanceof Double;
             } else {
-                throw new AssertionError("Invalid primitve type: " + type);
+                throw new AssertionError("Invalid primitive type: " + type);
             }
         }
 
diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/ClientSecurity.java b/server/openejb-client/src/main/java/org/apache/openejb/client/ClientSecurity.java
index edac8db8ae..625831cdc4 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/ClientSecurity.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/ClientSecurity.java
@@ -61,8 +61,8 @@ public class ClientSecurity {
     }
 
     /**
-     * Login the spedified user using the specified password.  This is a global login for the
-     * entire Java Virtural Machine.  If you would like to have a thread scoped login, use
+     * Login the specified user using the specified password.  This is a global login for the
+     * entire Java Virtual Machine.  If you would like to have a thread scoped login, use
      * ClientSecurity.login(username, password, true);
      *
      * This is the equivalent of ClientSecurity.login(username, password, false);
@@ -77,8 +77,8 @@ public class ClientSecurity {
     }
 
     /**
-     * Login the spedified user using the specified password either globally for the
-     * entire Java Virtural Machine or scoped to the thread.
+     * Login the specified user using the specified password either globally for the
+     * entire Java Virtual Machine or scoped to the thread.
      *
      * When using thread scoped login, you should logout in a finally block.  This particularly
      * when using thread pools.  If a thread is returned to the pool with a login attached to the
@@ -87,7 +87,7 @@ public class ClientSecurity {
      * @param username     the user to login
      * @param password     the password for the user
      * @param threadScoped if true the login is scoped to the thread; otherwise the login is global
-     *                     for the entire Java Virtural Machine
+     *                     for the entire Java Virtual Machine
      * @throws FailedLoginException if the username and password combination are not valid or
      *                              if there is a problem communiating with the server
      */
diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java b/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java
index 819c678bae..7e9e049046 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/JaxWsProviderWrapper.java
@@ -62,7 +62,7 @@ public class JaxWsProviderWrapper extends Provider {
     private static final Logger logger = Logger.getLogger("OpenEJB.client");
 
     //
-    // Magic to get our proider wrapper installed with the PortRefData
+    // Magic to get our provider wrapper installed with the PortRefData
     //
 
     private static final ThreadLocal<ProviderWrapperData> threadPortRefs = new ThreadLocal<>();
@@ -401,7 +401,7 @@ public class JaxWsProviderWrapper extends Provider {
                     }
                 }
             }
-        } catch (Exception ingored) {
+        } catch (Exception ignored) {
             logger.log(Level.INFO, "No META-INF/services/jakarta.xml.ws.spi.Provider found");
         }
 
diff --git a/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java b/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java
index 03741828f5..c07303afa8 100644
--- a/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java
+++ b/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java
@@ -106,7 +106,7 @@ public class CliRunnable implements Runnable {
                 }
             }
         } catch (RuntimeException e) {
-            LOGGER.error("an error occured while getting commands", e);
+            LOGGER.error("an error occurred while getting commands", e);
         } catch (IOException e) {
             LOGGER.error("can't get commands");
         }
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CdiResourceProvider.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CdiResourceProvider.java
index 2e1854e126..c6bbfa2071 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CdiResourceProvider.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CdiResourceProvider.java
@@ -342,7 +342,7 @@ public abstract class CdiResourceProvider implements ResourceProvider {
                 LOGGER.warning(msg, ex);
                 throw new WebApplicationException(Response.serverError().entity(msg).build());
             } catch (final OpenEJBException ex) {
-                final String msg = "An error occured injecting in class " + constructor.getDeclaringClass().getName();
+                final String msg = "An error occurred injecting in class " + constructor.getDeclaringClass().getName();
                 LOGGER.warning(msg, ex);
                 throw new WebApplicationException(Response.serverError().entity(msg).build());
             }
diff --git a/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/WebServiceInjectionConfigurator.java b/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/WebServiceInjectionConfigurator.java
index 25aaa0c802..da3e40da7d 100644
--- a/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/WebServiceInjectionConfigurator.java
+++ b/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/WebServiceInjectionConfigurator.java
@@ -55,7 +55,7 @@ import static org.apache.openejb.server.cxf.transport.util.CxfUtil.configureInte
  * # specific
  * cxf.jaxws.client.{ns}MyPort.out-interceptors = com.foo.MyInInterceptor
  *
- * Services can be defines in tomee.xml or application.properties.
+ * Services can be defined in tomee.xml or application.properties.
  *
  * Note: resources.xml are ignored for now (to be enhanced)
  */
diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
index 02edea5e21..69a19ad039 100644
--- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
+++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
@@ -104,9 +104,9 @@ class ClientObjectFactory implements org.apache.openejb.spi.ApplicationServer {
         final ClientMetaData cMetaData = new ClientMetaData(securityIdentity);
         final EJBMetaDataImpl eMetaData = buildEjbMetaData(info, beanContext, idCode);
 
-        final EJBHomeHandler hanlder = EJBHomeHandler.createEJBHomeHandler(JNDIContext.globalExecutor(), eMetaData, getServerMetaData(), cMetaData, call.get(JNDIContext.AuthenticationInfo.class));
+        final EJBHomeHandler handler = EJBHomeHandler.createEJBHomeHandler(JNDIContext.globalExecutor(), eMetaData, getServerMetaData(), cMetaData, call.get(JNDIContext.AuthenticationInfo.class));
 
-        return new EJBHomeHandle(hanlder.createEJBHomeProxy());
+        return new EJBHomeHandle(handler.createEJBHomeProxy());
     }
 
     @Override
@@ -126,9 +126,9 @@ class ClientObjectFactory implements org.apache.openejb.spi.ApplicationServer {
         final EJBMetaDataImpl eMetaData = buildEjbMetaData(info, beanContext, idCode);
         final Object primKey = info.getPrimaryKey();
 
-        final EJBObjectHandler hanlder = EJBObjectHandler.createEJBObjectHandler(JNDIContext.globalExecutor(), eMetaData, getServerMetaData(), cMetaData, primKey, null);
+        final EJBObjectHandler handler = EJBObjectHandler.createEJBObjectHandler(JNDIContext.globalExecutor(), eMetaData, getServerMetaData(), cMetaData, primKey, null);
 
-        return (jakarta.ejb.EJBObject) hanlder.createEJBObjectProxy();
+        return (jakarta.ejb.EJBObject) handler.createEJBObjectProxy();
     }
 
     @Override
@@ -157,9 +157,9 @@ class ClientObjectFactory implements org.apache.openejb.spi.ApplicationServer {
 
         final Object primKey = info.getPrimaryKey();
 
-        final EJBObjectHandler hanlder = EJBObjectHandler.createEJBObjectHandler(JNDIContext.globalExecutor(), eMetaData, getServerMetaData(), cMetaData, primKey, null);
+        final EJBObjectHandler handler = EJBObjectHandler.createEJBObjectHandler(JNDIContext.globalExecutor(), eMetaData, getServerMetaData(), cMetaData, primKey, null);
 
-        return hanlder.createEJBObjectProxy();
+        return handler.createEJBObjectProxy();
     }
 
     public static InterfaceType convert(final org.apache.openejb.InterfaceType type) {
@@ -192,9 +192,9 @@ class ClientObjectFactory implements org.apache.openejb.spi.ApplicationServer {
         final ClientMetaData cMetaData = new ClientMetaData(securityIdentity);
         final EJBMetaDataImpl eMetaData = buildEjbMetaData(info, beanContext, idCode);
 
-        final EJBHomeHandler hanlder = EJBHomeHandler.createEJBHomeHandler(JNDIContext.globalExecutor(), eMetaData, getServerMetaData(), cMetaData, null);
+        final EJBHomeHandler handler = EJBHomeHandler.createEJBHomeHandler(JNDIContext.globalExecutor(), eMetaData, getServerMetaData(), cMetaData, null);
 
-        return hanlder.createEJBHomeProxy();
+        return handler.createEJBHomeProxy();
     }
 
     private EJBMetaDataImpl buildEjbMetaData(final ProxyInfo info, final BeanContext beanContext, final int idCode) {
diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
index b9dd610c09..50b3d13ad5 100644
--- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
+++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
@@ -125,7 +125,7 @@ class EjbRequestHandler extends RequestHandler {
                 return setResponseError(res, version, e, "No such deployment");
             } catch (Throwable t) {
                 failed = true;
-                return setResponseError(res, version, t, "Unkown error occured while retrieving deployment: " + req);
+                return setResponseError(res, version, t, "Unkown error occurred while retrieving deployment: " + req);
             }
 
             try {
diff --git a/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianServer.java b/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianServer.java
index f826be294f..3ffd3a9ab3 100644
--- a/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianServer.java
+++ b/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianServer.java
@@ -26,7 +26,7 @@ import java.io.OutputStream;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-// done by relfection to let hessian be in the app
+// done by reflection to let hessian be in the app
 public class HessianServer {
     public static final String CONTENT_TYPE_HESSIAN = "application/x-hessian";
 
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
index 7d5743ec3c..5eb82aad1d 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
@@ -84,7 +84,7 @@ public interface HttpRequest extends java.io.Serializable, HttpServletRequest {
     public static final String HEADER_COOKIE = "Cookie";
 
     //
-    // Common attrobute values
+    // Common attribute values
     //
     /**
      * If the https server implementation is based on Servlets, the real HttpServletRequest
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
index 5738ae8621..910cd184cd 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
@@ -488,7 +488,7 @@ public class HttpRequestImpl implements HttpRequest {
      * parses the method for this page
      *
      * @param lineParts a StringTokenizer of the request line
-     * @throws java.io.IOException if an exeption is thrown
+     * @throws java.io.IOException if an exception is thrown
      */
     private void parseMethod(StringTokenizer lineParts) throws IOException {
         String token;
@@ -533,7 +533,7 @@ public class HttpRequestImpl implements HttpRequest {
      * parses the URI into the different parts
      *
      * @param lineParts a StringTokenizer of the URI
-     * @throws java.io.IOException if an exeption is thrown
+     * @throws java.io.IOException if an exception is thrown
      */
     public void parseURI(StringTokenizer lineParts) throws IOException {
         String token;
@@ -596,7 +596,7 @@ public class HttpRequestImpl implements HttpRequest {
      * reads the headers from the data input sent from the browser
      *
      * @param in the data input sent from the browser
-     * @throws java.io.IOException if an exeption is thrown
+     * @throws java.io.IOException if an exception is thrown
      */
     private void readHeaders(DataInput in) throws IOException {
 //        System.out.println("\nREQUEST");
diff --git a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java
index 26a7059499..132b4ab735 100644
--- a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java
+++ b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java
@@ -409,7 +409,7 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM
         if (this.running.getAndSet(false)) {
 
             try {
-                //Iterrupt threads
+                //Interrupt threads
                 for (final Future future : this.futures) {
                     try {
                         future.cancel(true);
diff --git a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java
index 713fc9c8de..b45ae0187e 100644
--- a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java
+++ b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java
@@ -374,7 +374,7 @@ public class Tracker {
         private int maxMissedHeartbeats = 10;
         private long heartRate = 500;
         // ---------------------------------
-        // Listenting specific settings
+        // Listening specific settings
         private long reconnectDelay = 1000 * 5;
         private long maxReconnectDelay = 1000 * 30;
         private long exponentialBackoff = 0;
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java b/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java
index 86bcc8f225..11f91d3bdd 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java
@@ -67,7 +67,7 @@ public class SimpleServiceManager extends ServiceManager {
     //    httpejb.properties
     //    webejb.properties
     //    xmlejb.properties
-    // Each contains the class name of the daemon implamentation
+    // Each contains the class name of the daemon implementation
     // The port to use
     // whether it's turned on
     // May be reusable elsewhere, move if another use occurs
diff --git a/tomee/tomee-jaxrs/src/test/java/org/apache/tomee/jaxrs/ReloadingLoaderTest.java b/tomee/tomee-jaxrs/src/test/java/org/apache/tomee/jaxrs/ReloadingLoaderTest.java
index 575582a906..df89bd16c2 100644
--- a/tomee/tomee-jaxrs/src/test/java/org/apache/tomee/jaxrs/ReloadingLoaderTest.java
+++ b/tomee/tomee-jaxrs/src/test/java/org/apache/tomee/jaxrs/ReloadingLoaderTest.java
@@ -78,7 +78,7 @@ public class ReloadingLoaderTest {
         SystemInstance.get().setComponent(ContainerSystem.class, containerSystem);
         SystemInstance.get().setComponent(WebAppEnricher.class, new WebAppEnricher() {
             @Override
-            public URL[] enrichment(final ClassLoader webappClassLaoder) {
+            public URL[] enrichment(final ClassLoader webappClassLoader) {
                 return new URL[0];
             }
         });


(tomee) 02/03: Simplify removal loops with Collection.removeIf

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-10.x
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 3c6e59b93e75535c6c3645c98b530a9d9cef970d
Author: Martin Wiesner <ma...@hs-heilbronn.de>
AuthorDate: Sun Mar 1 19:57:36 2026 +0100

    Simplify removal loops with Collection.removeIf
    
    (cherry picked from commit 154cb384d67a89732b4f2b3784b6724dcbb90fbe)
---
 .../java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java    | 8 +-------
 .../apache/tomee/catalina/deployment/TomcatWebappDeployer.java   | 7 +------
 .../src/main/java/org/apache/tomee/embedded/Container.java       | 9 ++-------
 .../src/main/java/org/apache/tomee/loader/filter/Filters.java    | 8 +-------
 .../apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java   | 8 +-------
 .../apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java   | 8 +-------
 6 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java b/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
index aef91166e5..7b289d6451 100644
--- a/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
+++ b/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
@@ -91,13 +91,7 @@ public class PojoEndpoint extends CxfEndpoint {
         service = doServiceCreate();
 
         { // cleanup jax-ws injections
-            final Iterator<Injection> injections = port.getInjections().iterator();
-            while (injections.hasNext()) {
-                final Injection next = injections.next();
-                if (WebServiceContext.class.equals(type(loader, next))) {
-                    injections.remove();
-                }
-            }
+            port.getInjections().removeIf(next -> WebServiceContext.class.equals(type(loader, next)));
         }
 
         ResourceInjector injector = null;
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
index 2806241132..d97d6b6256 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
@@ -62,12 +62,7 @@ public class TomcatWebappDeployer implements WebAppDeployer {
 
         if (info == null) { // try another time doing a diff with apps before deployment and apps after
             final Collection<String> deployedNow = tomcatWebAppBuilder.availableApps();
-            final Iterator<String> it = deployedNow.iterator();
-            while (it.hasNext()) {
-                if (alreadyDeployed.contains(it.next())) {
-                    it.remove();
-                }
-            }
+            deployedNow.removeIf(alreadyDeployed::contains);
 
             if (deployedNow.size() == 1) {
                 info = contextInfo(new File(deployedNow.iterator().next()));
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index 84cafb6721..3093ebeb63 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -359,13 +359,8 @@ public class Container implements AutoCloseable {
         // we don't care of these
         callers.remove("org.apache.tomee.embedded.Container");
         callers.remove("org.apache.tomee.gradle.embedded.TomEEEmbeddedTask");
-        final Iterator<String> callerIt = callers.iterator();
-        while (callerIt.hasNext()) { // TomEEEmbeddedMojo is also used with some anonymous classes (TomEEEmbeddedMojo$x)
-            if (callerIt.next().startsWith("org.apache.openejb.maven.plugins.TomEEEmbeddedMojo")) {
-                callerIt.remove();
-                // no break since we remove anonymous class+the mojo itself
-            }
-        }
+        // TomEEEmbeddedMojo is also used with some anonymous classes (TomEEEmbeddedMojo$x)
+        callers.removeIf(s -> s.startsWith("org.apache.openejb.maven.plugins.TomEEEmbeddedMojo"));
         if (additionalCallers != null && additionalCallers.length > 0) {
             callers.addAll(asList(additionalCallers));
         }
diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java
index 01432364ae..dd3a89a1c5 100644
--- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java
+++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java
@@ -96,13 +96,7 @@ public class Filters {
         }
 
         if (unwrapped.size() > 1) {
-            final Iterator<Filter> iterator = unwrapped.iterator();
-            while (iterator.hasNext()) {
-                final Filter filter = iterator.next();
-                if (filter == NONE) {
-                    iterator.remove();
-                }
-            }
+            unwrapped.removeIf(filter -> filter == NONE);
         }
 
         if (unwrapped.isEmpty()) {
diff --git a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java
index 1db267d83e..857eb389d4 100644
--- a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java
+++ b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java
@@ -125,13 +125,7 @@ public class TomEEFacesConfigResourceProvider extends DefaultFacesConfigResource
         try {
             if (AppFinder.findAppContextOrWeb(
                     Thread.currentThread().getContextClassLoader(), AppFinder.WebBeansContextTransformer.INSTANCE) == null) {
-                final Iterator<URL> toFilter = urlSet.iterator();
-                while (toFilter.hasNext()) {
-                    final URL url = toFilter.next();
-                    if (TomEEMyFacesContainerInitializer.isOwb(url)) {
-                        toFilter.remove();
-                    }
-                }
+                urlSet.removeIf(TomEEMyFacesContainerInitializer::isOwb);
             }
         } catch (final Throwable th) {
             // no-op
diff --git a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
index edfe6ebf33..52aeeda143 100644
--- a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
+++ b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
@@ -162,13 +162,7 @@ public class TomEEMyFacesContainerInitializer implements ServletContainerInitial
             }
 
             // remove our internal faces-config.xml
-            final Iterator<URL> it = metaInfFacesConfigUrls.iterator();
-            while (it.hasNext()) {
-                final URL next = it.next();
-                if (isOwb(next)) {
-                    it.remove();
-                }
-            }
+            metaInfFacesConfigUrls.removeIf(TomEEMyFacesContainerInitializer::isOwb);
 
             return !metaInfFacesConfigUrls.isEmpty();
         } catch (final Exception e) {