Author: rmannibucau
Date: Fri Oct 21 16:30:37 2011
New Revision: 1187451
URL: http://svn.apache.org/viewvc?rev=1187451&view=rev
Log:
fixing way embedded tomee web context is gotten in TomcatJndiBuilder
Modified:
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
Modified:
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java?rev=1187451&r1=1187450&r2=1187451&view=diff
==============================================================================
---
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
(original)
+++
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
Fri Oct 21 16:30:37 2011
@@ -180,6 +180,8 @@ public class TomcatJndiBuilder {
// no-op
}
+ // TODO: uniformize webapp moduleId?
+ // classical deployment - needed because can be overriden through
META-INF/context.xml
String path = standardContext.getHostname();
if (standardContext.getPath().startsWith("/")) {
path += standardContext.getPath();
@@ -187,7 +189,10 @@ public class TomcatJndiBuilder {
path += "/" + standardContext.getPath();
}
- final WebContext webContext = cs.getWebContext(path);
+ WebContext webContext = cs.getWebContext(path);
+ if (webContext == null) { // tomee-embedded deployment
+ webContext =
cs.getWebContext(standardContext.getPath().replaceFirst("/", ""));
+ }
if (webContext != null && webContext.getBindings() != null) {
for (Map.Entry<String, Object> entry :
webContext.getBindings().entrySet()) {
