Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public String deploy(final ClassLoader loader, final HessianServer listener,
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?");
}
}

Expand Down Expand Up @@ -243,7 +243,7 @@ public void undeploy(final String hostname, final String app, final String name)
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?");
}
}

Expand Down
2 changes: 1 addition & 1 deletion tomee/apache-tomee/src/main/resources/service.readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ public int getMajorVersion() {

@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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void addResourceLink(final ContextResourceLink ref) {
}

/**
* 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
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void onError(final AsyncEvent asyncEvent) throws IOException {

@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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public boolean hasRole(final Wrapper wrapper, final Principal principal, final S
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;
}
Expand All @@ -101,7 +101,7 @@ private Principal logInTomEE(final Principal pcp) {
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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ public void internalStop() throws LifecycleException {
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();
Expand Down Expand Up @@ -359,7 +359,7 @@ public synchronized void initAdditionalRepos() {
}
}

// 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public static void mergeJava(final StandardContext standardContext) {
// 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
Expand Down Expand Up @@ -815,7 +815,7 @@ public void mergeRef(final NamingResourcesImpl naming, final ServiceReferenceInf
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) {
Expand Down Expand Up @@ -875,7 +875,7 @@ public static void importOpenEJBResourcesInTomcat(final Collection<ResourceInfo>

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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public void initialize(final Properties properties) throws Exception {
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -763,7 +763,7 @@ private static boolean isReady(final HostConfig deployer) {
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;
Expand Down Expand Up @@ -1743,7 +1743,7 @@ public void afterStart(final StandardContext standardContext) {
} 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;
Expand Down Expand Up @@ -1829,7 +1829,7 @@ public void afterStart(final StandardContext standardContext) {
// 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

Expand Down Expand Up @@ -1951,7 +1951,7 @@ private void ensureMyFacesDontLooseFacesContext(final StandardContext standardCo
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
}
}
}
Expand Down Expand Up @@ -2268,7 +2268,7 @@ public synchronized void checkHost(final StandardHost standardHost) {
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())) {
Expand Down Expand Up @@ -2367,7 +2367,7 @@ protected File appBase(final StandardHost standardHost) {
* @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();
Expand Down Expand Up @@ -2465,7 +2465,7 @@ private void loadWebModule(final AppModule appModule, final StandardContext stan
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());
Expand Down Expand Up @@ -2520,7 +2520,7 @@ private void removeRef(final WebApp webApp, final String name) {
*
* @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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public AppInfo deploy(final String host, final String context, final File file)
}

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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ private void buildPermissions() {
* 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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ public URLPattern(String pat, Set<String> methods, boolean isHttpMethodExcluded)
}

/**
* 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) {
Expand Down Expand Up @@ -256,7 +256,7 @@ public boolean check(URLPattern base, URLPattern test) {
}

/**
* 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6584,7 +6584,7 @@ private static void populateMyfacesAndJstlData() {
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);
Expand Down Expand Up @@ -6630,7 +6630,7 @@ private static void populateMyfacesAndJstlData() {
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);
Expand Down Expand Up @@ -6888,7 +6888,7 @@ private static void populateMyfacesAndJstlData() {
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);
Expand Down Expand Up @@ -6938,7 +6938,7 @@ private static void populateMyfacesAndJstlData() {
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);
Expand Down Expand Up @@ -7092,7 +7092,7 @@ private static void populateMyfacesAndJstlData() {
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public Object getObjectInstance(final Object object, final Name name, final Cont
// 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);
}

Expand Down
Loading