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/07/20 14:47:53 UTC
svn commit: r1148737 - in
/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina:
TomcatJndiBuilder.java TomcatWebAppBuilder.java
Author: rmannibucau
Date: Wed Jul 20 12:47:53 2011
New Revision: 1148737
URL: http://svn.apache.org/viewvc?rev=1148737&view=rev
Log:
modifying openejb bindings in tomcat, getting the context differently
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java?rev=1148737&r1=1148736&r2=1148737&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java Wed Jul 20 12:47:53 2011
@@ -165,12 +165,12 @@ public class TomcatJndiBuilder {
naming.addEnvironment(environment);
}
- if (replaceEntry) {
+ /*if (replaceEntry) {
ContextAccessController.setWritable(namingContextListener.getName(), standardContext);
if (!addEntry) namingContextListener.removeEnvironment(environment.getName());
namingContextListener.addEnvironment(environment);
ContextAccessController.setReadOnly(namingContextListener.getName());
- }
+ }*/
}
public void mergeRef(NamingResources naming, EjbReferenceInfo ref) {
@@ -205,12 +205,12 @@ public class TomcatJndiBuilder {
naming.addEjb(ejb);
}
- if (replaceEntry) {
+ /*if (replaceEntry) {
ContextAccessController.setWritable(namingContextListener.getName(), standardContext);
if (!addEntry) namingContextListener.removeEjb(ejb.getName());
namingContextListener.addEjb(ejb);
ContextAccessController.setReadOnly(namingContextListener.getName());
- }
+ }*/
}
public void mergeRef(NamingResources naming, EjbLocalReferenceInfo ref) {
@@ -244,12 +244,12 @@ public class TomcatJndiBuilder {
naming.addEjb(ejb);
}
- if (replaceEntry) {
+ /*if (replaceEntry) {
ContextAccessController.setWritable(namingContextListener.getName(), standardContext);
if (!addEntry) namingContextListener.removeEjb(ejb.getName());
namingContextListener.addEjb(ejb);
ContextAccessController.setReadOnly(namingContextListener.getName());
- }
+ }*/
}
@SuppressWarnings({"UnusedDeclaration"})
@@ -296,12 +296,12 @@ public class TomcatJndiBuilder {
naming.addResource(resource);
}
- if (replaceEntry) {
+ /*if (replaceEntry) {
ContextAccessController.setWritable(namingContextListener.getName(), standardContext);
if (!addEntry) namingContextListener.removeResource(resource.getName());
namingContextListener.addResource(resource);
ContextAccessController.setReadOnly(namingContextListener.getName());
- }
+ }*/
}
@SuppressWarnings({"UnusedDeclaration"})
@@ -341,12 +341,12 @@ public class TomcatJndiBuilder {
naming.addResource(resource);
}
- if (replaceEntry) {
+ /*if (replaceEntry) {
ContextAccessController.setWritable(namingContextListener.getName(), standardContext);
if (!addEntry) namingContextListener.removeResource(resource.getName());
namingContextListener.addResource(resource);
ContextAccessController.setReadOnly(namingContextListener.getName());
- }
+ }*/
}
public void mergeRef(NamingResources naming, ResourceReferenceInfo ref) {
@@ -380,12 +380,12 @@ public class TomcatJndiBuilder {
naming.addResource(resource);
}
- if (replaceEntry) {
+ /*if (replaceEntry) {
ContextAccessController.setWritable(namingContextListener.getName(), standardContext);
if (!addEntry) namingContextListener.removeResource(resource.getName());
namingContextListener.addResource(resource);
ContextAccessController.setReadOnly(namingContextListener.getName());
- }
+ }*/
}
public void mergeRef(NamingResources naming, ResourceEnvReferenceInfo ref) {
@@ -419,12 +419,12 @@ public class TomcatJndiBuilder {
naming.addResourceEnvRef(resourceEnv);
}
- if (replaceEntry) {
+ /*if (replaceEntry) {
ContextAccessController.setWritable(namingContextListener.getName(), standardContext);
if (!addEntry) namingContextListener.removeResourceEnvRef(resourceEnv.getName());
namingContextListener.addResourceEnvRef(resourceEnv);
ContextAccessController.setReadOnly(namingContextListener.getName());
- }
+ }*/
}
public void mergeRef(NamingResources naming, ServiceReferenceInfo ref) {
@@ -510,12 +510,12 @@ public class TomcatJndiBuilder {
}
// or replace the exisitng resource entry
- if (replaceEntry) {
+ /*if (replaceEntry) {
ContextAccessController.setWritable(namingContextListener.getName(), standardContext);
if (!addEntry) namingContextListener.removeResource(resource.getName());
namingContextListener.addResource(resource);
ContextAccessController.setReadOnly(namingContextListener.getName());
- }
+ }*/
}
private URL getWsdlUrl(ServiceReferenceInfo ref) {
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=1148737&r1=1148736&r2=1148737&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java Wed Jul 20 12:47:53 2011
@@ -365,18 +365,20 @@ public class TomcatWebAppBuilder impleme
// bind extra stuff at the java:comp level which can only be
// bound after the context is created
- String listenerName = getNamingContextListener(standardContext).getName();
+ NamingContextListener ncl = getNamingContextListener(standardContext);
+ String listenerName = ncl.getName();
ContextAccessController.setWritable(listenerName, standardContext);
try {
Context openejbContext = getContainerSystem().getJNDIContext();
openejbContext = (Context) openejbContext.lookup("openejb");
- Context root = (Context) ContextBindings.getClassLoader().lookup("");
- safeBind(root, "openejb", openejbContext);
+ // Context root = (Context) ContextBindings.getClassLoader().lookup("");
+ // Context comp = (Context) ContextBindings.getClassLoader().lookup("comp");
- // TODO: else (=NamingException) if it doesn't exist create it to bind TransactionManager...
- Context comp = (Context) ContextBindings.getClassLoader().lookup("comp");
+ Context root = ncl.getNamingContext();
+ Context comp = (Context) root.lookup("comp");
+ safeBind(root, "openejb", openejbContext);
// add context to WebDeploymentInfo
for (WebAppInfo webAppInfo : contextInfo.appInfo.webApps) {
@@ -384,7 +386,7 @@ public class TomcatWebAppBuilder impleme
if (("/" + webAppInfo.contextRoot).equals(standardContext.getPath()) || isRoot) {
WebContext webContext = getContainerSystem().getWebContext(webAppInfo.moduleId);
if (webContext != null) {
- // webContext.setJndiEnc(comp);
+ webContext.setJndiEnc(root);
}
try {