geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r531336 - in /geronimo/server/trunk/modules: geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
Date Mon, 23 Apr 2007 05:14:06 GMT
Author: dblevins
Date: Sun Apr 22 22:14:05 2007
New Revision: 531336

URL: http://svn.apache.org/viewvc?view=rev&rev=531336
Log:
Use the new jndi name strategy in openejb which should fix the client ref issue

Modified:
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
    geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?view=diff&rev=531336&r1=531335&r2=531336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Sun Apr 22 22:14:05 2007
@@ -171,8 +171,8 @@
         if (value instanceof IntraVmJndiReference) {
             IntraVmJndiReference intraVmJndiReference = (IntraVmJndiReference) value;
             String deploymentId = intraVmJndiReference.getJndiName();
-            if (deploymentId.startsWith("java:openejb/ejb/")) {
-                deploymentId = deploymentId.substring("java:openejb/ejb/".length());
+            if (deploymentId.startsWith("java:openejb/Deployment/")) {
+                deploymentId = deploymentId.substring("java:openejb/Deployment/".length());
             }
             ClientEjbReference clientRef = new ClientEjbReference(uri.toString(), deploymentId);
             return clientRef;

Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?view=diff&rev=531336&r1=531335&r2=531336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
Sun Apr 22 22:14:05 2007
@@ -103,6 +103,9 @@
             systemInstance.setProperty("openejb.deploymentId.format", "{moduleId}/{ejbName}");
         }
 
+        systemInstance.setProperty("openejb.jndiname.strategy", "org.apache.openejb.assembler.classic.JndiBuilder$TemplatedStrategy");
+        systemInstance.setProperty("openejb.jndiname.format", "{deploymentId}-{interfaceClass.simpleName}");
+
         System.setProperty("openejb.naming", "xbean");
         if (transactionManager == null) {
             throw new NullPointerException("transactionManager is null");



Mime
View raw message