geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r1026416 - /geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
Date Fri, 22 Oct 2010 17:26:58 GMT
Author: kevan
Date: Fri Oct 22 17:26:58 2010
New Revision: 1026416

URL: http://svn.apache.org/viewvc?rev=1026416&view=rev
Log:
GERONIMO-5628 cleanup configuration of the discoveryURI

Modified:
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java?rev=1026416&r1=1026415&r2=1026416&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
Fri Oct 22 17:26:58 2010
@@ -37,7 +37,7 @@ public class EjbDaemonGBean implements N
 
     private boolean secure;
     private String discoveryHost = null;
-    private String discoveryURI = "ejb:ejbd://{discoveryHost}:{port}";
+    private String discoveryURI = null;
     private String clusterName;
     private String multicastHost;
     private int multicastPort;
@@ -209,10 +209,10 @@ public class EjbDaemonGBean implements N
         properties.setProperty("multipoint.max_missed_heartbeats", Integer.toString(maxMissedHeartbeats));
         if ((discoveryHost != null) && discoveryHost.length() > 0) {
             properties.setProperty("ejbd.discoveryHost", discoveryHost);
+            properties.setProperty("ejbd.discovery", "ejb:ejbd://{discoveryHost}:{port}");
         } else {
-            properties.setProperty("ejbd.discoveryHost", host);
+            properties.setProperty("ejbd.discovery", "ejb:ejbd://{host}:{port}");
         }
-        properties.setProperty("ejbd.discovery", discoveryURI);
         properties.setProperty("ejbd.secure", secure + "");
         properties.setProperty("ejbds.disabled", "true");
         if (threads > 0) {



Mime
View raw message