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 00a0e61e93010ec8b78576b47fbff543155581bb Author: Martin Wiesner <[email protected]> AuthorDate: Mon Feb 23 21:09:02 2026 +0100 Correct spelling errors from TomEE's code base (cherry picked from commit cdc73bf3257cc4d7897eb8994059eda67dc7cc3a) --- .../openejb/server/hessian/TomcatHessianRegistry.java | 4 ++-- .../apache-tomee/src/main/resources/service.readme.txt | 2 +- .../apache/catalina/startup/OpenEJBContextConfig.java | 2 +- .../apache/tomee/catalina/OpenEJBNamingResource.java | 2 +- .../apache/tomee/catalina/OpenEJBSecurityListener.java | 2 +- .../java/org/apache/tomee/catalina/TomEERealm.java | 4 ++-- .../apache/tomee/catalina/TomEEWebappClassLoader.java | 4 ++-- .../org/apache/tomee/catalina/TomcatJndiBuilder.java | 6 +++--- .../java/org/apache/tomee/catalina/TomcatLoader.java | 2 +- .../org/apache/tomee/catalina/TomcatWebAppBuilder.java | 18 +++++++++--------- .../catalina/cdi/WebBeansThreadBindingListener.java | 4 ++-- .../catalina/deployment/TomcatWebappDeployer.java | 2 +- ...SecurityConstaintsToJaccPermissionsTransformer.java | 4 ++-- .../org/apache/tomee/catalina/security/URLPattern.java | 8 ++++---- .../java/org/apache/tomee/jasper/TomEETldScanner.java | 10 +++++----- .../META-INF/org.apache.tomee/ServerClassLoader | 2 +- .../apache/tomee/common/PersistenceContextFactory.java | 2 +- .../apache/tomee/common/PersistenceUnitFactory.java | 2 +- tomee/tomee-common/src/main/resources/conf/web.xml | 6 +++--- .../main/java/org/apache/tomee/embedded/Container.java | 2 +- .../tomee/embedded/TomEEEmbeddedApplicationRunner.java | 2 +- .../main/resources/org/apache/tomee/configs/web.xml | 4 ++-- .../org/apache/tomee/webservices/TomcatRsRegistry.java | 4 ++-- .../org/apache/tomee/jdbc/TomEEDataSourceCreator.java | 2 +- .../tomee/jul/handler/rotating/LocalFileHandler.java | 2 +- .../java/org/apache/tomee/loader/LoaderServlet.java | 2 +- .../java/org/apache/tomee/loader/OpenEJBListener.java | 2 +- .../java/org/apache/tomee/loader/TomcatHelper.java | 2 +- .../main/java/org/apache/tomee/loader/TomcatHook.java | 6 +++--- .../tomee/loader/filter/IncludeExcludeFilter.java | 2 +- tomee/tomee-overlay-runner/pom.xml | 2 +- .../tomee/security/TomEEELInvocationHandler.java | 2 +- .../tomee/security/cdi/LoginToContinueInterceptor.java | 6 +++--- .../tomee/security/http/LoginToContinueMechanism.java | 2 +- .../org/apache/tomee/webservices/TomcatWsRegistry.java | 4 ++-- 35 files changed, 66 insertions(+), 66 deletions(-) diff --git a/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java b/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java index 062ae5e63e..2835b3b554 100644 --- a/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java +++ b/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java @@ -82,7 +82,7 @@ public class TomcatHessianRegistry implements HessianRegistry { if (host == null) { host = engine.findChild(engine.getDefaultHost()); if (host == null) { - throw new IllegalArgumentException("Invalid virtual host '" + engine.getDefaultHost() + "'. Do you have a matchiing Host entry in the server.xml?"); + throw new IllegalArgumentException("Invalid virtual host '" + engine.getDefaultHost() + "'. Do you have a matching Host entry in the server.xml?"); } } @@ -243,7 +243,7 @@ public class TomcatHessianRegistry implements HessianRegistry { if (host == null) { host = engine.findChild(engine.getDefaultHost()); if (host == null) { - throw new IllegalArgumentException("Invalid virtual host '" + engine.getDefaultHost() + "'. Do you have a matchiing Host entry in the server.xml?"); + throw new IllegalArgumentException("Invalid virtual host '" + engine.getDefaultHost() + "'. Do you have a matching Host entry in the server.xml?"); } } diff --git a/tomee/apache-tomee/src/main/resources/service.readme.txt b/tomee/apache-tomee/src/main/resources/service.readme.txt index bb4cf1dc43..1c4799d420 100644 --- a/tomee/apache-tomee/src/main/resources/service.readme.txt +++ b/tomee/apache-tomee/src/main/resources/service.readme.txt @@ -2,7 +2,7 @@ Windows NT Service ================== The two batch files for creating and removing TomEE as a Windows Service are basically -self explanatory. Both scripts must be run using an account that has rights to install +self-explanatory. Both scripts must be run using an account that has rights to install or de-install a service. This is usually an administrator account. service.install.as.admin.bat diff --git a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java index ab2c03c95d..7a615dde4a 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java @@ -388,7 +388,7 @@ public class OpenEJBContextConfig extends ContextConfig { @Override public void addFilterMapping(final FilterMap filterMap) { - // we need to add this one before the mapping cause of tomcat validation (ie dont make deployment fail) + // we need to add this one before the mapping cause of tomcat validation (ie don't make deployment fail) if ("CDI Conversation Filter".equals(filterMap.getFilterName()) && !cdiConversation) { final FilterDef conversationFilter = new FilterDef(); conversationFilter.setAsyncSupported("true"); diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java index 8e16654e1d..cfbe1edaf1 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java @@ -124,7 +124,7 @@ public class OpenEJBNamingResource extends NamingResourcesImpl { } /** - * tomcat uses a hastable to store entry type, null values are not allowed + * tomcat uses a hashtable to store entry type, null values are not allowed * <p> * These occur when the reference is declared using a 'lookup' attribute These do not have a type associated * diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java index f874c13237..45cf0e9d43 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java @@ -50,7 +50,7 @@ public class OpenEJBSecurityListener implements AsyncListener { @Override public void onStartAsync(final AsyncEvent asyncEvent) throws IOException { - asyncEvent.getAsyncContext().addListener(this); // super vicious isnt it? that's in servlet spec, start != end events. + asyncEvent.getAsyncContext().addListener(this); // super vicious isn't it? that's in servlet spec, start != end events. requests.set(request); enter(); } diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java index 2a5c87ed07..5bba476c52 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java @@ -85,7 +85,7 @@ public class TomEERealm extends CombinedRealm { return ((GenericPrincipal) principal).hasRole(role); } - for (final Realm realm : realms) { // when used implicitely (always?) realms.size == 1 so no need of a strategy + for (final Realm realm : realms) { // when used implicitly (always?) realms.size == 1 so no need of a strategy if (realm.hasRole(wrapper, principal, rawRole)) { return true; } @@ -101,7 +101,7 @@ public class TomEERealm extends CombinedRealm { securityService = (TomcatSecurityService) SystemInstance.get().getComponent(SecurityService.class); } - // normally we don't care about oldstate because the listener already contains one + // normally we don't care about old state because the listener already contains one // which is the previous one // so no need to clean twice here final Request request = OpenEJBSecurityListener.requests.get(); diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java index 1ead59416c..1252071bbf 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java @@ -297,7 +297,7 @@ public class TomEEWebappClassLoader extends ParallelWebappClassLoader { if (stopped) { return; } - // reset classloader because of tomcat classloaderlogmanager + // reset classloader because of tomcat classloader logmanager // to be sure we reset the right loggers final Thread thread = Thread.currentThread(); final ClassLoader loader = thread.getContextClassLoader(); @@ -359,7 +359,7 @@ public class TomEEWebappClassLoader extends ParallelWebappClassLoader { } } - // embeddeding implementation of sthg (JPA, JSF) can lead to classloading issues if we don't enrich the webapp + // embedding implementation of sthg (JPA, JSF) can lead to classloading issues if we don't enrich the webapp // with our integration jars // typically the class will try to be loaded by the common classloader // but the interface implemented or the parent class diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java index 5a12eb2696..346a6790bd 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java @@ -163,7 +163,7 @@ public class TomcatJndiBuilder { // no-op } - // classical deployment - needed because can be overriden through META-INF/context.xml + // classical deployment - needed because can be overridden through META-INF/context.xml final String hostname = org.apache.tomee.catalina.Contexts.getHostname(standardContext); String path = standardContext.findParameter(TomcatWebAppBuilder.OPENEJB_WEBAPP_MODULE_ID); if (path == null) { // standardContext not created by OpenEJB @@ -815,7 +815,7 @@ public class TomcatJndiBuilder { naming.addResource(resource); } - // or replace the exisitng resource entry + // or replace the existing resource entry if (replaceEntry) { ContextAccessController.setWritable(namingContextListener.getName(), standardContext.getNamingToken()); if (!addEntry) { @@ -875,7 +875,7 @@ public class TomcatJndiBuilder { for (final ResourceInfo info : resources) { final String name = info.id; - // if invalid or existing or lazy just skip it cause doesnt work during startup + // if invalid or existing or lazy just skip it cause doesn't work during startup if (name == null || naming.findResource(name) != null || info.properties.containsKey("UseAppClassLoader")) { continue; } diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java index 599a3668e4..21624788a4 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java @@ -178,7 +178,7 @@ public class TomcatLoader implements Loader { final Class<?> creatorClass = TomcatLoader.class.getClassLoader().loadClass("org.apache.tomee.jdbc.TomEEDataSourceCreator"); SystemInstance.get().setProperty(ConfigurationFactory.OPENEJB_JDBC_DATASOURCE_CREATOR, creatorClass.getName()); } catch (final Throwable ignored) { - // will use the defaul tone + // will use the default tone } // tomcat default behavior is webapp, simply keep it, it is overridable by system property too diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java index 29ddfc5460..9ac7516f1d 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java @@ -243,7 +243,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare /** * Deployed web applications */ - // todo merge this map witth the infos map above + // todo merge this map with the infos map above private final Map<String, DeployedApplication> deployedApps = new TreeMap<>(); /** * OpenEJB deployment loader instance @@ -763,7 +763,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare private static void addMyFacesDefaultParameters(final ClassLoader classLoader, final ServletContext context) { if (!SystemInstance.get().getOptions().get(OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES, false)) { if (classLoader != null) { - try { // if myfaces is not here we doesn't need any trick + try { // if myfaces is not here we don't need any trick classLoader.loadClass("org.apache.myfaces.shared.config.MyfacesConfig"); } catch (final ClassNotFoundException cnfe) { return; @@ -1743,7 +1743,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare } else if (contextInfo == null) { // openejb webapp loaded from the LoaderServlet return; } - contextInfo.module = null; // shouldnt be there after startup (actually we shouldnt need it from info tree but our scanning does) + contextInfo.module = null; // shouldn't be there after startup (actually we shouldn't need it from info tree but our scanning does) final String id = getId(standardContext); WebAppInfo currentWebAppInfo = null; @@ -1829,7 +1829,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare // owb integration filters final WebBeansContext webBeansContext = getWebBeansContext(contextInfo); if (webBeansContext != null) { - // it is important to have a begin and a end listener + // it is important to have a begin and an end listener // to be sure to create contexts before other listeners // and destroy contexts after other listeners @@ -1951,7 +1951,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare break; } } catch (final Throwable t) { - // not there, not a big deal in most of cases + // not there, not a big deal in most of the cases } } } @@ -2268,7 +2268,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare file = file.getCanonicalFile().getAbsoluteFile(); final AppModule appModule = deploymentLoader.load(file, null); - // Ignore any standalone web modules - this happens when the app is unpaked and doesn't have a WEB-INF dir + // Ignore any standalone web modules - this happens when the app is unpacked and doesn't have a WEB-INF dir if (appModule.getDeploymentModule().size() == 1 && appModule.getWebModules().size() == 1) { final WebModule webModule = appModule.getWebModules().iterator().next(); if (file.getAbsolutePath().equals(webModule.getJarLocation())) { @@ -2367,7 +2367,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare * @return a openejb application module */ private AppModule loadApplication(final StandardContext standardContext) { - // don't use getId since the app id shouldnt get the host (jndi) + // don't use getId since the app id shouldn't get the host (jndi) // final TomcatDeploymentLoader tomcatDeploymentLoader = new TomcatDeploymentLoader(standardContext, getId(standardContext)); String id = standardContext.getName(); @@ -2465,7 +2465,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare final String path = standardContext.getPath(); LOGGER.debug("context path = " + path); webModule.setHost(Contexts.getHostname(standardContext)); - // Add all Tomcat env entries to context so they can be overriden by the env.properties file + // Add all Tomcat env entries to context so they can be overridden by the env.properties file final NamingResourcesImpl naming = standardContext.getNamingResources(); for (final ContextEnvironment environment : naming.findEnvironments()) { EnvEntry envEntry = webApp.getEnvEntryMap().get(environment.getName()); @@ -2520,7 +2520,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare * * @param comp context * @param name name of the binding - * @param value binded object + * @param value bound object */ private void safeBind(final Context comp, final String name, final Object value) { try { diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.java index 6f4dafc656..d8cd1b1874 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.java @@ -23,12 +23,12 @@ import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.spi.ContextsService; /** - * For Tomcat we need to implement a ThreadBindingListener to + * For Tomcat, we need to implement a ThreadBindingListener to * release the ServletRequest in case of Async requests. * Tomcat only sends the requestDestroyed event only when the 'final' * detached response gets rendered. But this happens on a totally * different Thread. - * Thus in order to release e.g. locks on Conversations and prevent mem leaks + * Thus, in order to release e.g. locks on Conversations and prevent mem leaks * we need to end the request on unbind() as well. * Note that the ContextsService will do nothing if the Request was already * properly destroyed in standard synchronous Servlet Requests. 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 de0914db27..2806241132 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 @@ -75,7 +75,7 @@ public class TomcatWebappDeployer implements WebAppDeployer { } if (info == null || info.appInfo == null) { - LOGGER.error("Can't find of appInfo for " + (file != null ? file.getAbsolutePath() : null) + ", availables: " + tomcatWebAppBuilder.availableApps()); + LOGGER.error("Can't find appInfo for " + (file != null ? file.getAbsolutePath() : null) + ", available apps: " + tomcatWebAppBuilder.availableApps()); } if (info == null) { // error diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/TomcatSecurityConstaintsToJaccPermissionsTransformer.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/TomcatSecurityConstaintsToJaccPermissionsTransformer.java index b77352f6d0..72ef97076e 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/TomcatSecurityConstaintsToJaccPermissionsTransformer.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/TomcatSecurityConstaintsToJaccPermissionsTransformer.java @@ -260,11 +260,11 @@ public class TomcatSecurityConstaintsToJaccPermissionsTransformer { * pattern "/", that is not combined by the * <tt>web-resource-collection</tt> elements of the deployment * descriptor with ever HTTP method value. The permission objects must - * be contructed using the qualified pattern as their name and with + * be constructed using the qualified pattern as their name and with * actions defined by the subset of the HTTP methods that do not occur * in combination with the pattern. The resulting permissions that must * be added to the unchecked policy statements by calling the - * <code>addToUncheckedPolcy</code> method on the + * <code>addToUncheckedPolicy</code> method on the * <code>PolicyConfiguration</code> object. */ for (URLPattern pattern : allSet) { diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/URLPattern.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/URLPattern.java index e43023c330..88a1978440 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/URLPattern.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/security/URLPattern.java @@ -67,11 +67,11 @@ public class URLPattern { } /** - * Get a qualifed URL pattern relative to a particular set of URL patterns. This algorithm is described in - * JSR 115, section 3.1.3.1 "Qualified URL Pattern Names". + * Get a qualified URL pattern relative to a particular set of URL patterns. + * This algorithm is described in JSR 115, section 3.1.3.1 "Qualified URL Pattern Names". * * @param patterns the set of possible URL patterns that could be used to qualify this pattern - * @return a qualifed URL pattern + * @return a qualified URL pattern */ public String getQualifiedPattern(Set<URLPattern> patterns) { if (type == EXACT) { @@ -256,7 +256,7 @@ public class URLPattern { } /** - * This pattern is an extension pattern (that is, it startswith "*.") and the argument pattern ends with + * This pattern is an extension pattern (that is, it starts with "*.") and the argument pattern ends with * this pattern. * * @param base the base pattern diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java index 5ff1345ee8..1d2657a4c9 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java @@ -6584,7 +6584,7 @@ public class TomEETldScanner extends TldScanner { tag.setName("when"); tag.setTagClass("org.apache.taglibs.standard.tag.rt.core.WhenTag"); tag.setBodyContent("JSP"); - tag.setInfo("Subtag of <choose> that includes its body if its \tcondition evalutes to 'true'"); + tag.setInfo("Subtag of <choose> that includes its body if its \tcondition evaluates to 'true'"); { final TagAttributeInfo attr = new TagAttributeInfo("test", true, "boolean", true, false, "The test condition that determines whether or not the body content should be processed.", false, false, null, null); tag.getAttributes().add(attr); @@ -6630,7 +6630,7 @@ public class TomEETldScanner extends TldScanner { tag.setName("if"); tag.setTagClass("org.apache.taglibs.standard.tag.rt.core.IfTag"); tag.setBodyContent("JSP"); - tag.setInfo("Simple conditional tag, which evalutes its body if the \tsupplied condition is true and optionally exposes a Boolean \tscripting variable representing the evaluation of this condition"); + tag.setInfo("Simple conditional tag, which evaluates its body if the \tsupplied condition is true and optionally exposes a Boolean \tscripting variable representing the evaluation of this condition"); { final TagAttributeInfo attr = new TagAttributeInfo("test", true, "boolean", true, false, null, false, false, null, null); tag.getAttributes().add(attr); @@ -6888,7 +6888,7 @@ public class TomEETldScanner extends TldScanner { tag.setName("when"); tag.setTagClass("org.apache.taglibs.standard.tag.rt.core.WhenTag"); tag.setBodyContent("JSP"); - tag.setInfo("Subtag of <choose> that includes its body if its \tcondition evalutes to 'true'"); + tag.setInfo("Subtag of <choose> that includes its body if its \tcondition evaluates to 'true'"); { final TagAttributeInfo attr = new TagAttributeInfo("test", true, "boolean", true, false, null, false, false, null, null); tag.getAttributes().add(attr); @@ -6938,7 +6938,7 @@ public class TomEETldScanner extends TldScanner { tag.setName("if"); tag.setTagClass("org.apache.taglibs.standard.tag.common.xml.IfTag"); tag.setBodyContent("JSP"); - tag.setInfo("XML conditional tag, which evalutes its body if the supplied XPath expression evalutes to 'true' as a boolean"); + tag.setInfo("XML conditional tag, which evaluates its body if the supplied XPath expression evaluates to 'true' as a boolean"); { final TagAttributeInfo attr = new TagAttributeInfo("select", true, "java.lang.String", false, false, null, false, false, null, null); tag.getAttributes().add(attr); @@ -7092,7 +7092,7 @@ public class TomEETldScanner extends TldScanner { tag.setName("when"); tag.setTagClass("org.apache.taglibs.standard.tag.common.xml.WhenTag"); tag.setBodyContent("JSP"); - tag.setInfo("Subtag of <choose> that includes its body if its expression evalutes to 'true'"); + tag.setInfo("Subtag of <choose> that includes its body if its expression evaluates to 'true'"); { final TagAttributeInfo attr = new TagAttributeInfo("select", true, "java.lang.String", false, false, null, false, false, null, null); tag.getAttributes().add(attr); diff --git a/tomee/tomee-catalina/src/main/resources/META-INF/org.apache.tomee/ServerClassLoader b/tomee/tomee-catalina/src/main/resources/META-INF/org.apache.tomee/ServerClassLoader index c14549531c..752830246f 100644 --- a/tomee/tomee-catalina/src/main/resources/META-INF/org.apache.tomee/ServerClassLoader +++ b/tomee/tomee-catalina/src/main/resources/META-INF/org.apache.tomee/ServerClassLoader @@ -16,4 +16,4 @@ # limitations under the License. # ################################################################################ -This file causes the jar containing it to be loaded into the Tomcat server classloader rather than the commom classloader +This file causes the jar containing it to be loaded into the Tomcat server classloader rather than the common classloader diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceContextFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceContextFactory.java index 3760ce2b14..330d023aa2 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceContextFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceContextFactory.java @@ -43,7 +43,7 @@ public class PersistenceContextFactory extends AbstractObjectFactory { // lookup the value in JNDI value = super.getObjectInstance(object, name, context, environment); } else { - // value is hard hard coded in the properties + // value is hard coded in the properties value = getStaticValue(ref); } diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java index b9e3559955..ea7ba9de0e 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java @@ -43,7 +43,7 @@ public class PersistenceUnitFactory extends AbstractObjectFactory { // lookup the value in JNDI value = super.getObjectInstance(object, name, context, environment); } else { - // value is hard hard coded in the properties + // value is hard coded in the properties value = getStaticValue(ref); } diff --git a/tomee/tomee-common/src/main/resources/conf/web.xml b/tomee/tomee-common/src/main/resources/conf/web.xml index 1f9a07c6c8..eb10d4d9b4 100644 --- a/tomee/tomee-common/src/main/resources/conf/web.xml +++ b/tomee/tomee-common/src/main/resources/conf/web.xml @@ -108,7 +108,7 @@ <!-- --> <!-- showServerInfo Should server information be presented in the --> <!-- response sent to clients when directory --> - <!-- listings is enabled? [true] --> + <!-- listings are enabled? [true] --> <!-- --> <!-- allowPartialPut Should the server treat an HTTP PUT request --> <!-- with a Range header as a partial PUT? Note --> @@ -174,7 +174,7 @@ <!-- --> <!-- enablePooling Determines whether tag handler pooling is --> <!-- enabled. This is a compilation option. It will --> - <!-- not alter the behaviour of JSPs that have --> + <!-- not alter the behavior of JSPs that have --> <!-- already been compiled. [true] --> <!-- --> <!-- engineOptionsClass Allows specifying the Options class used to --> @@ -434,7 +434,7 @@ <!-- ================ Built In Servlet Mappings ========================= --> - <!-- The servlet mappings for the built in servlets defined above. Note --> + <!-- The servlet mappings for the built-in servlets defined above. Note --> <!-- that, by default, the CGI and SSI servlets are *not* mapped. You --> <!-- must uncomment these mappings (or add them to your application's own --> <!-- web.xml deployment descriptor) to enable these services --> 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 a030dd7e13..4428618185 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 @@ -511,7 +511,7 @@ public class Container implements AutoCloseable { final String catalinaBase = base.getAbsolutePath(); - // set the env before calling anoything on tomcat or Catalina!! + // set the env before calling anything on tomcat or Catalina!! // TODO: save previous value and restore in stop System.setProperty("catalina.base", catalinaBase); System.setProperty("openejb.deployments.classpath", "false"); diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/TomEEEmbeddedApplicationRunner.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/TomEEEmbeddedApplicationRunner.java index 9125b7a5a7..16a1082a1e 100644 --- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/TomEEEmbeddedApplicationRunner.java +++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/TomEEEmbeddedApplicationRunner.java @@ -140,7 +140,7 @@ public class TomEEEmbeddedApplicationRunner implements AutoCloseable { final Class<?> appClass = app.getClass(); final AnnotationFinder finder = new AnnotationFinder(new ClassesArchive(ancestors(appClass))); - // setup the container config reading class annotation, using a randome http port and deploying the classpath + // setup the container config reading class annotation, using a random http port and deploying the classpath final Configuration configuration = new Configuration(); final ContainerProperties props = appClass.getAnnotation(ContainerProperties.class); if (props != null) { diff --git a/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/web.xml b/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/web.xml index 1c6e849dea..69dd203b97 100644 --- a/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/web.xml +++ b/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/web.xml @@ -158,7 +158,7 @@ <!-- --> <!-- enablePooling Determines whether tag handler pooling is --> <!-- enabled. This is a compilation option. It will --> - <!-- not alter the behaviour of JSPs that have --> + <!-- not alter the behavior of JSPs that have --> <!-- already been compiled. [true] --> <!-- --> <!-- engineOptionsClass Allows specifying the Options class used to --> @@ -411,7 +411,7 @@ </servlet> --> <!-- ================ Built In Servlet Mappings ========================= --> - <!-- The servlet mappings for the built in servlets defined above. Note --> + <!-- The servlet mappings for the built-in servlets defined above. Note --> <!-- that, by default, the CGI and SSI servlets are *not* mapped. You --> <!-- must uncomment these mappings (or add them to your application's own --> <!-- web.xml deployment descriptor) to enable these services --> diff --git a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java index a8be769e71..d9ab591dca 100644 --- a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java +++ b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java @@ -178,7 +178,7 @@ public class TomcatRsRegistry implements RsRegistry { final URI address; try { address = new URI(connector.getScheme(), null, host, connector.getPort(), path, null, null); - } catch (final Exception e) { // just an URI problem normally...shouldn't occur + } catch (final Exception e) { // just a URI problem normally...shouldn't occur LOGGER.error("can't add container for path " + path, e); continue; } @@ -207,7 +207,7 @@ public class TomcatRsRegistry implements RsRegistry { } private static final class Key implements Comparable<Key> { - private final String appId; // can be versionned so context is not enough + private final String appId; // can be versioned so context is not enough private final String path; private final int hash; // hashmap key so compute only once the hash for perf diff --git a/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java b/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java index cb813ee6e2..591f617a9d 100644 --- a/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java +++ b/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java @@ -260,7 +260,7 @@ public class TomEEDataSourceCreator extends PoolDataSourceCreator { } public void setXaDataSource(final String jndi) { - // we should do setDataSourceJNDI(jndi); but ATM tomcat doesnt do the lookup so using this as correct impl + // we should do setDataSourceJNDI(jndi); but ATM tomcat doesn't do the lookup so using this as correct impl try { setDataSource(SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext().lookup("openejb:Resource/" + jndi)); } catch (final NamingException e) { diff --git a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java index 5f7e6d700f..3a9ae3ec6f 100644 --- a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java +++ b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java @@ -437,7 +437,7 @@ public class LocalFileHandler extends Handler { final BasicFileAttributes attr = Files.readAttributes(archive.toPath(), BasicFileAttributes.class); if (now - attr.creationTime().toMillis() > purgeExpiryDuration) { if (!Files.deleteIfExists(archive.toPath())) { - // dont try to delete on exit cause we will find it again + // don't try to delete on exit cause we will find it again reportError("Can't delete " + archive.getAbsolutePath() + ".", null, ErrorManager.GENERIC_FAILURE); } } diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java index b9573b38f8..457a6616a7 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java @@ -76,7 +76,7 @@ public class LoaderServlet extends HttpServlet { } /** - * Retrieves all intialization parameters for this servlet and stores them in a java.util.Properties object. + * Retrieves all initialization parameters for this servlet and stores them in a java.util.Properties object. * * @param config jakarta.servlet.ServletConfig * @return java.util.Properties diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java index 09bd4e72ec..5fc0b868b4 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java @@ -43,7 +43,7 @@ import java.util.logging.Logger; * The sole purpose of this class is to call the {@link TomcatEmbedder#embed} method * <p> * This is an alternate way to load the Tomcat integration - * This approach is mutually exclussive to the {@link LoaderServlet} + * This approach is mutually exclusive to the {@link LoaderServlet} * </p> * <p> * This class does nothing more than scrape around in diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java index 89667c5846..293e4584ff 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java @@ -140,7 +140,7 @@ public class TomcatHelper { * @param realm * @param tomcatPrincipal * @param logicalRole - * @return true the the principle has the specified role + * @return true the principle has the specified role */ public static boolean hasRole(final Realm realm, final Principal tomcatPrincipal, final String logicalRole) { try { diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java index 49a4059ad2..fdca72a427 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java @@ -29,7 +29,7 @@ import java.net.URLClassLoader; import java.util.Properties; /** - * This class should only be loadded and used via reflection from TomcatEmbedder. + * This class should only be loaded and used via reflection from TomcatEmbedder. * * Everything that happens up to the point of calling this particular method * (except setting tomee.war) ultimately means nothing and does not matter @@ -180,12 +180,12 @@ class TomcatHook { // create the loader // This init call affects only this WebappClassloader and is just required - // for runnig the Embedder. The SystemInstance will be initialized more permanently + // for running the Embedder. The SystemInstance will be initialized more permanently // in the parent classloader once the required libraries are added. SystemInstance.init(properties); // This guy does the magic of squishing the openejb libraries into the parent classloader - // and kicking off the reall integration. + // and kicking off the real integration. embedder.init(properties); } catch (final Exception e) { e.printStackTrace(); diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/IncludeExcludeFilter.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/IncludeExcludeFilter.java index 572ee8b518..311bf767c6 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/IncludeExcludeFilter.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/IncludeExcludeFilter.java @@ -19,7 +19,7 @@ package org.apache.tomee.loader.filter; /** * First, all Include directives are evaluated; at least one must match, or the className is rejected. * Next, all Exclude directives are evaluated. If any matches, the className is rejected. - * Last, any classNames which do not match an Include or a Exclude directive are denied by default. + * Last, any classNames which do not match an Include or an Exclude directive are denied by default. */ public class IncludeExcludeFilter implements Filter { diff --git a/tomee/tomee-overlay-runner/pom.xml b/tomee/tomee-overlay-runner/pom.xml index 7c76e9c76f..ac2d6df1fb 100644 --- a/tomee/tomee-overlay-runner/pom.xml +++ b/tomee/tomee-overlay-runner/pom.xml @@ -27,7 +27,7 @@ <artifactId>tomee-overlay-runner</artifactId> <name>TomEE :: TomEE :: Overlay Runner</name> - <description>This jar is intended to be embed in a war overlay of one TomEE war to start TomEE from a webapp</description> + <description>This jar is intended to be embedded in a war overlay of one TomEE war to start TomEE from a webapp</description> <properties> <tomee.build.name>${project.groupId}.tomee.overlay.runner</tomee.build.name> diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEEELInvocationHandler.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEEELInvocationHandler.java index 3933ace504..31fb01de5c 100644 --- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEEELInvocationHandler.java +++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/TomEEELInvocationHandler.java @@ -74,7 +74,7 @@ public class TomEEELInvocationHandler implements InvocationHandler { // if there is an expression, it takes precedence over the static one if (!expression.trim().isEmpty()) { - // make sure to pass in the return type of the initial method, otherwith it would be String all the time + // make sure to pass in the return type of the initial method, otherwise it would be String all the time return eval(processor, sanitizeExpression(expression), method.getReturnType()); } else { diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/LoginToContinueInterceptor.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/LoginToContinueInterceptor.java index 8c9bc2f78f..0c1e639cab 100644 --- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/LoginToContinueInterceptor.java +++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/LoginToContinueInterceptor.java @@ -36,7 +36,7 @@ import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; import static jakarta.security.enterprise.AuthenticationStatus.SEND_FAILURE; import static jakarta.security.enterprise.AuthenticationStatus.SUCCESS; import static org.apache.tomee.security.http.LoginToContinueMechanism.AUTHENTICATION; -import static org.apache.tomee.security.http.LoginToContinueMechanism.CALLER_AUTHENICATION; +import static org.apache.tomee.security.http.LoginToContinueMechanism.CALLER_AUTHENTICATION; import static org.apache.tomee.security.http.LoginToContinueMechanism.ORIGINAL_REQUEST; import static org.apache.tomee.security.http.LoginToContinueMechanism.clearRequestAndAuthentication; import static org.apache.tomee.security.http.LoginToContinueMechanism.getAuthentication; @@ -87,11 +87,11 @@ public class LoginToContinueInterceptor { !httpMessageContext.getRequest().getRequestURI().endsWith("j_security_check")) { httpMessageContext.getRequest().getSession().removeAttribute(ORIGINAL_REQUEST); - httpMessageContext.getRequest().getSession().removeAttribute(CALLER_AUTHENICATION); + httpMessageContext.getRequest().getSession().removeAttribute(CALLER_AUTHENTICATION); } if (httpMessageContext.getAuthParameters().isNewAuthentication()) { - httpMessageContext.getRequest().getSession().setAttribute(CALLER_AUTHENICATION, true); + httpMessageContext.getRequest().getSession().setAttribute(CALLER_AUTHENTICATION, true); httpMessageContext.getRequest().getSession().removeAttribute(ORIGINAL_REQUEST); httpMessageContext.getRequest().getSession().removeAttribute(AUTHENTICATION); } diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/LoginToContinueMechanism.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/LoginToContinueMechanism.java index df0086a3e2..3978e3ed71 100644 --- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/LoginToContinueMechanism.java +++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/LoginToContinueMechanism.java @@ -28,7 +28,7 @@ public interface LoginToContinueMechanism { String ORIGINAL_REQUEST = "org.apache.tomee.security.request.original"; String AUTHENTICATION = "org.apache.tomee.security.request.authentication"; - String CALLER_AUTHENICATION = "org.apache.tomee.security.request.caller.authentication"; + String CALLER_AUTHENTICATION = "org.apache.tomee.security.request.caller.authentication"; LoginToContinue getLoginToContinue(); diff --git a/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java b/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java index 0b2e80a263..a4212c0338 100644 --- a/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java +++ b/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java @@ -118,7 +118,7 @@ public class TomcatWsRegistry implements WsRegistry { wrapper.setServletClass(WsServlet.class.getName()); if (wrapper.getServlet() != null) { wrapper.unload(); // deallocate previous one - wrapper.load(); // reload this one withuot unloading it to keep the instance - unload is called during stop() + wrapper.load(); // reload this one without unloading it to keep the instance - unload is called during stop() // boolean controlling this method call can't be set to false through API so let do it ourself wrapper.getServlet().init(StandardWrapper.class.cast(wrapper)); // or Reflections.set(wrapper, "instanceInitialized", false); } @@ -192,7 +192,7 @@ public class TomcatWsRegistry implements WsRegistry { } final Container host = engine.findChild(virtualHost); if (host == null) { - throw new IllegalArgumentException("Invalid virtual host '" + virtualHost + "'. Do you have a matchiing Host entry in the server.xml?"); + throw new IllegalArgumentException("Invalid virtual host '" + virtualHost + "'. Do you have a matching Host entry in the server.xml?"); } final List<String> addresses = new ArrayList<>();
