You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/12/20 05:15:59 UTC
svn commit: r605804 - in /openejb/trunk/openejb3/assembly/openejb-tomcat:
maven.xml src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java
Author: dblevins
Date: Wed Dec 19 20:15:58 2007
New Revision: 605804
URL: http://svn.apache.org/viewvc?rev=605804&view=rev
Log:
Bind openejb jndi context into java: for webapps
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml?rev=605804&r1=605803&r2=605804&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml Wed Dec 19 20:15:58 2007
@@ -36,7 +36,7 @@
<goal name="tomcat6">
<j:set var="tomcat.branch" value="6"/>
- <j:set var="tomcat.version" value="6.0.13"/>
+ <j:set var="tomcat.version" value="6.0.14"/>
<j:set var="tomcat.prefix" value="apache"/>
<j:set var="tomcat.server.lib" value="lib"/>
<j:set var="tomcat.server.webapps" value="webapps"/>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java?rev=605804&r1=605803&r2=605804&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java Wed Dec 19 20:15:58 2007
@@ -102,6 +102,7 @@
}
public void mergeJndi() throws OpenEJBException {
+
NamingResources naming = standardContext.getNamingResources();
URI moduleUri;
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java?rev=605804&r1=605803&r2=605804&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java Wed Dec 19 20:15:58 2007
@@ -305,6 +305,13 @@
// bound after the context is created
ContextAccessController.setWritable(standardContext.getNamingContextListener().getName(), standardContext);
try {
+
+ Context openejbContext = SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext();
+ openejbContext = (Context) openejbContext.lookup("openejb");
+
+ Context root = (Context) ContextBindings.getClassLoader().lookup("");
+ safeBind(root, "openejb", openejbContext);
+
Context comp = (Context) ContextBindings.getClassLoader().lookup("comp");
// add context to WebDeploymentInfo