You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/10/21 17:51:20 UTC
svn commit: r1187414 -
/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
Author: rmannibucau
Date: Fri Oct 21 15:51:19 2011
New Revision: 1187414
URL: http://svn.apache.org/viewvc?rev=1187414&view=rev
Log:
binding the beanmanager to JNDI for each webapp - to validate
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=1187414&r1=1187413&r2=1187414&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 15:51:19 2011
@@ -180,9 +180,11 @@ public class TomcatJndiBuilder {
// no-op
}
- String path = standardContext.getEncodedPath();
- if (path.startsWith("/")) {
- path = path.substring(1);
+ String path = standardContext.getHostname();
+ if (standardContext.getPath().startsWith("/")) {
+ path += standardContext.getPath();
+ } else {
+ path += "/" + standardContext.getPath();
}
final WebContext webContext = cs.getWebContext(path);
@@ -212,6 +214,8 @@ public class TomcatJndiBuilder {
comp.rebind("ORB", new SystemComponentReference(ORB.class));
comp.rebind("HandleDelegate", new SystemComponentReference(HandleDelegate.class));
+
+ comp.rebind("BeanManager", webContext.getAppContext().getBeanManager());
} catch (Exception ignored) {
ignored.printStackTrace();
// no-op