You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ge...@apache.org on 2011/06/15 17:53:37 UTC
svn commit: r1136098 - in /openejb/trunk/openejb3/server/openejb-ejbd/src:
main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
test/java/org/apache/openejb/server/ejbd/AppClientTest.java
Author: genspring
Date: Wed Jun 15 15:53:36 2011
New Revision: 1136098
URL: http://svn.apache.org/viewvc?rev=1136098&view=rev
Log:
OPENEJB-1140 EE6 Global JNDI
use global jndi added with OPENEJB-1596
Modified:
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java
Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?rev=1136098&r1=1136097&r2=1136098&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Wed Jun 15 15:53:36 2011
@@ -164,8 +164,6 @@ class JndiRequestHandler {
if (name.startsWith("openejb/Deployment/")) {
context = rootContext;
- } else if (name.startsWith("global/")) {
- context = getGlobalTree();
} else if (req.getModuleId() != null && req.getModuleId().equals("openejb/Deployment")){
context = deploymentsJndiTree;
} else if (req.getModuleId() != null && req.getModuleId().equals("openejb/global")){
@@ -484,15 +482,6 @@ class JndiRequestHandler {
}
}
- // TODO this is a terrible hack
- // We don't actually have a global context yet
- public Context getGlobalTree() {
- for (AppContext appContext : SystemInstance.get().getComponent(ContainerSystem.class).getAppContexts()) {
- return appContext.getGlobalJndiContext();
- }
-
- return new IvmContext();
- }
public static class DbcpDataSource {
private final Object object;
Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java?rev=1136098&r1=1136097&r2=1136098&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java Wed Jun 15 15:53:36 2011
@@ -89,7 +89,7 @@ public class AppClientTest extends TestC
props.put("java.naming.provider.url", "ejbd://127.0.0.1:" + port);
props.put("openejb.client.moduleId", "orange-client");
- final Context context = new InitialContext(props);
+ Context context = new InitialContext(props);
final Object home = context.lookup("comp/env/home");
assertTrue(home instanceof OrangeHome);
@@ -102,6 +102,9 @@ public class AppClientTest extends TestC
assertTrue(business instanceof OrangeBusinessRemote);
OrangeBusinessRemote orangeBusinessRemote = (OrangeBusinessRemote) business;
assertEquals("nap", orangeBusinessRemote.echo("pan"));
+
+ props.put("openejb.client.moduleId", "openejb/global");
+ context = new InitialContext(props);
final Object global = context.lookup("global/testapp/testejbmodule/Orange!" + OrangeBusinessRemote.class.getName());
assertTrue(global instanceof OrangeBusinessRemote);