geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r945485 - in /geronimo/server/branches/2.2/plugins/openejb: geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java openejb/pom.xml openejb/src/main/plan/plan.xml
Date Tue, 18 May 2010 04:11:36 GMT
Author: kevan
Date: Tue May 18 04:11:36 2010
New Revision: 945485

URL: http://svn.apache.org/viewvc?rev=945485&view=rev
Log:
GERONIMO-5311 Add support for multipoint servers. Bit of cleanup of config-substitution properties,
also

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

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=945485&r1=945484&r2=945485&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
Tue May 18 04:11:36 2010
@@ -40,10 +40,11 @@ public class EjbDaemonGBean implements N
     private String clusterName;
     private String multicastHost;
     private int multicastPort;
-    private boolean enableMulticast;
+    private boolean multicastEnabled;
     private String multipointHost;
     private int multipointPort;
-    private boolean enableMultipoint;
+    private String multipointServers;
+    private boolean multipointEnabled;
     private long heartRate;
     private int maxMissedHeartbeats;
 
@@ -88,12 +89,12 @@ public class EjbDaemonGBean implements N
         this.threads = threads;
     }
 
-    public boolean isEnableMulticast() {
-        return enableMulticast;
+    public boolean isMulticastEnabled() {
+        return multicastEnabled;
     }
 
-    public void setEnableMulticast(boolean enableMulticast) {
-        this.enableMulticast = enableMulticast;
+    public void setMulticastEnabled(boolean multicastEnabled) {
+        this.multicastEnabled = multicastEnabled;
     }
 
     public String getMulticastHost() {
@@ -148,12 +149,20 @@ public class EjbDaemonGBean implements N
         this.multipointPort = multipointPort;
     }
 
-    public boolean isEnableMultipoint() {
-        return enableMultipoint;
+    public String getMultipointServers() {
+        return multipointServers;
     }
 
-    public void setEnableMultipoint(boolean enableMultipoint) {
-        this.enableMultipoint = enableMultipoint;
+    public void setMultipointServers(String multipointServers) {
+        this.multipointServers = multipointServers;
+    }
+
+    public boolean isMultipointEnabled() {
+        return multipointEnabled;
+    }
+
+    public void setMultipointEnabled(boolean multipointEnabled) {
+        this.multipointEnabled = multipointEnabled;
     }
 
     public long getHeartRate() {
@@ -178,13 +187,14 @@ public class EjbDaemonGBean implements N
         properties.setProperty("ejbd.port", Integer.toString(port));
         properties.setProperty("multicast.bind", multicastHost);
         properties.setProperty("multicast.port", Integer.toString(multicastPort));
-        properties.setProperty("multicast.disabled", Boolean.toString(!enableMulticast));
+        properties.setProperty("multicast.disabled", Boolean.toString(!multicastEnabled));
         properties.setProperty("multicast.group", clusterName);
         properties.setProperty("multicast.heart_rate", Long.toString(heartRate));
         properties.setProperty("multicast.max_missed_heartbeats", Integer.toString(maxMissedHeartbeats));
         properties.setProperty("multipoint.bind", multipointHost);
         properties.setProperty("multipoint.port", Integer.toString(multipointPort));
-        properties.setProperty("multipoint.disabled", Boolean.toString(!enableMultipoint));
+        properties.setProperty("multipoint.initialServers", multipointServers);
+        properties.setProperty("multipoint.disabled", Boolean.toString(!multipointEnabled));
         properties.setProperty("multipoint.group", clusterName);
         properties.setProperty("multipoint.heart_rate", Long.toString(heartRate));
         properties.setProperty("multipoint.max_missed_heartbeats", Integer.toString(maxMissedHeartbeats));
@@ -218,10 +228,11 @@ public class EjbDaemonGBean implements N
         infoBuilder.addAttribute("maxMissedHeartbeats", int.class, true);
         infoBuilder.addAttribute("multicastHost", String.class, true);
         infoBuilder.addAttribute("multicastPort", int.class, true);
-        infoBuilder.addAttribute("enableMulticast", boolean.class, true);
+        infoBuilder.addAttribute("multicastEnabled", boolean.class, true);
         infoBuilder.addAttribute("multipointHost", String.class, true);
         infoBuilder.addAttribute("multipointPort", int.class, true);
-        infoBuilder.addAttribute("enableMultipoint", boolean.class, true);
+        infoBuilder.addAttribute("multipointServers", String.class, true);
+        infoBuilder.addAttribute("multipointEnabled", boolean.class, true);
         infoBuilder.addAttribute("threads", int.class, true);
 
         GBEAN_INFO = infoBuilder.getBeanInfo();

Modified: geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml?rev=945485&r1=945484&r2=945485&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb/pom.xml Tue May 18 04:11:36 2010
@@ -164,6 +164,11 @@
                                     <attribute name="host">${ServerHostname}</attribute>
                                     <attribute name="multicastHost">${MulticastDiscoveryAddress}</attribute>
                                     <attribute name="multicastPort">${MulticastDiscoveryPort}</attribute>
+                                    <attribute name="multipointHost">${MultipointHost}</attribute>
+                                    <attribute name="multipointPort">${MultipointPort
+ PortOffset}</attribute>
+                                    <attribute name="multipointServers">${MultipointServers}</attribute>
+                                    <attribute name="multicastEnabled">${MulticastEnabled}</attribute>
+                                    <attribute name="multipointEnabled">${MultipointEnabled}</attribute>
                                     <attribute name="clusterName">${ClusterName}</attribute>
                                 </gbean>
                                 <gbean name="DefaultStatefulContainer">
@@ -194,6 +199,11 @@
                             <config-substitution key="StrictPooling">true</config-substitution>
                             <config-substitution key="MulticastDiscoveryAddress">239.255.3.2</config-substitution>
                             <config-substitution key="MulticastDiscoveryPort">6142</config-substitution>
+                            <config-substitution key="MultipointHost">0.0.0.0</config-substitution>
+                            <config-substitution key="MultipointPort">4212</config-substitution>
+                            <config-substitution key="MulticastEnabled">false</config-substitution>
+                            <config-substitution key="MultipointEnabled">false</config-substitution>
+                            <config-substitution key="MultipointServers"></config-substitution>
                             <config-substitution key="ClusterName">cluster1</config-substitution>
                             <copy-file relative-to="geronimo" dest-dir="">schema</copy-file>
                         </plugin-artifact>

Modified: geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml?rev=945485&r1=945484&r2=945485&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml Tue May 18
04:11:36 2010
@@ -92,10 +92,11 @@
         <attribute name="threads">200</attribute>
         <attribute name="multicastPort">${PlanOpenEJBMulticastPort}</attribute>
         <attribute name="multicastHost">${PlanOpenEJBMulticastHostname}</attribute>
-        <attribute name="enableMulticast">true</attribute>
+        <attribute name="multicastEnabled">false</attribute>
         <attribute name="multipointPort">${PlanOpenEJBMultipointPort}</attribute>
         <attribute name="multipointHost">${PlanOpenEJBMultipointHostname}</attribute>
-        <attribute name="enableMultipoint">false</attribute>
+        <attribute name="multipointServers"></attribute>
+        <attribute name="multipointEnabled">false</attribute>
         <attribute name="clusterName">cluster1</attribute>
         <attribute name="heartRate">500</attribute>
         <attribute name="maxMissedHeartbeats">10</attribute>



Mime
View raw message