geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r767250 - in /geronimo/server/trunk/plugins/openejb: geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java
Date Tue, 21 Apr 2009 18:53:59 GMT
Author: dblevins
Date: Tue Apr 21 18:53:59 2009
New Revision: 767250

URL: http://svn.apache.org/viewvc?rev=767250&view=rev
Log:
Reflect updates in internal openejb tree

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
    geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=767250&r1=767249&r2=767250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Tue Apr 21 18:53:59 2009
@@ -184,8 +184,11 @@
         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/local/")) {
+                deploymentId = deploymentId.substring("java:openejb/local/".length());
+            }
+            if (deploymentId.startsWith("java:openejb/remote/")) {
+                deploymentId = deploymentId.substring("java:openejb/remote/".length());
             }
             if (deploymentId.startsWith("java:openejb/Deployment/")) {
                 deploymentId = deploymentId.substring("java:openejb/Deployment/".length());

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java?rev=767250&r1=767249&r2=767250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java
(original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/java/org/apache/geronimo/console/ejbserver/EjbHelper.java
Tue Apr 21 18:53:59 2009
@@ -428,8 +428,8 @@
                         .get(cls));
                 StringBuffer names = new StringBuffer();
                 for (String jndiName : jndiNames) {
-                    if (jndiName.startsWith("openejb/ejb/")) {
-                        jndiName = jndiName.replaceFirst("openejb/ejb/", "");
+                    if (jndiName.startsWith("openejb/local/")) {
+                        jndiName = jndiName.replaceFirst("openejb/local/", "");
                         names.append(jndiName).append(",");
                     }
                 }



Mime
View raw message