Author: dblevins
Date: Fri Apr 8 02:06:00 2011
New Revision: 1090087
URL: http://svn.apache.org/viewvc?rev=1090087&view=rev
Log:
print either vendor or global jndi names depending on which bootstrap technique
was used
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?rev=1090087&r1=1090086&r2=1090087&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
Fri Apr 8 02:06:00 2011
@@ -18,6 +18,7 @@ package org.apache.openejb.assembler.cla
import static org.apache.openejb.util.Classes.packageName;
+import javax.ejb.embeddable.EJBContainer;
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.NameAlreadyBoundException;
@@ -55,6 +56,9 @@ import java.lang.reflect.Constructor;
*/
public class JndiBuilder {
+
+ final boolean embeddedEjbContainerApi;
+
public static final Logger logger =
Logger.getInstance(LogCategory.OPENEJB_STARTUP,
JndiBuilder.class.getPackage().getName());
private final Context openejbContext;
@@ -64,7 +68,11 @@ public class JndiBuilder {
public JndiBuilder(Context openejbContext) {
this.openejbContext = openejbContext;
- failOnCollision =
SystemInstance.get().getOptions().get(JNDINAME_FAILONCOLLISION, true);
+
+ final Options options = SystemInstance.get().getOptions();
+
+ failOnCollision = options.get(JNDINAME_FAILONCOLLISION, true);
+ embeddedEjbContainerApi = options.get(EJBContainer.class.getName(),
false);
}
public void build(EjbJarInfo ejbJar, HashMap<String, BeanContext>
deployments) {
@@ -521,7 +529,9 @@ public class JndiBuilder {
nameInfo.name = externalName;
beanInfo.jndiNamess.add(nameInfo);
- logger.info("Jndi(name=" + externalName + ") -->
Ejb(deployment-id=" + beanInfo.ejbDeploymentId + ")");
+ if (!embeddedEjbContainerApi) {
+ logger.info("Jndi(name=" + externalName + ") -->
Ejb(deployment-id=" + beanInfo.ejbDeploymentId + ")");
+ }
}
} catch (NameAlreadyBoundException e) {
BeanContext deployment = findNameOwner(name);
@@ -564,7 +574,10 @@ public class JndiBuilder {
}
try {
String globalName = "global/" + appName + moduleName + beanName;
- logger.info(String.format("Jndi(name=\"java:%s\")", globalName));
+
+ if (embeddedEjbContainerApi) {
+ logger.info(String.format("Jndi(name=\"java:%s\")",
globalName));
+ }
globalContext.bind(globalName, ref);
} catch (NameAlreadyBoundException e) {
//one interface in more than one role (e.g. both Local and Remote
