geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1139164 - in /geronimo/server/trunk: plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java plugins/openejb/openejb/pom.xml plugins/openejb/openejb/src/main/plan/plan.xml pom.xml
Date Fri, 24 Jun 2011 06:32:13 GMT
Author: violalu
Date: Fri Jun 24 06:32:13 2011
New Revision: 1139164

URL: http://svn.apache.org/viewvc?rev=1139164&view=rev
Log:
GERONIMO-5311 Add support for configuration of multipoint server addresses ,pull the code
from 2.2 to 3.0

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

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java?rev=1139164&r1=1139163&r2=1139164&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
Fri Jun 24 06:32:13 2011
@@ -59,7 +59,11 @@ public class EjbDaemonGBean implements G
                           @ParamAttribute(name = "clusterName") String clusterName,
                           @ParamAttribute(name = "multicastHost") String multicastHost,
                           @ParamAttribute(name = "multicastPort") int multicastPort,
-                          @ParamAttribute(name = "enableMulticast") boolean enableMulticast,
+                          @ParamAttribute(name = "multicastEnabled") boolean multicastEnabled,
+                          @ParamAttribute(name = "multipointEnabled") boolean multipointEnabled,
+                          @ParamAttribute(name = "multipointHost") String multipointHost,
+                          @ParamAttribute(name = "multipointPort") int multipointPort,
+                          @ParamAttribute(name = "multipointServers") String multipointServers,
 
                           @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
                           @ParamSpecial(type = SpecialAttributeType.abstractName) AbstractName
name,
@@ -100,8 +104,14 @@ public class EjbDaemonGBean implements G
 
         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("multipoint.bind", multipointHost);
+        properties.setProperty("multipoint.port", Integer.toString(multipointPort));
+        properties.setProperty("multipoint.initialServers", multipointServers);
+        properties.setProperty("multipoint.disabled", Boolean.toString(!multipointEnabled));
+        properties.setProperty("multipoint.group", clusterName);
 
         ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(classLoader);

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=1139164&r1=1139163&r2=1139164&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Fri Jun 24 06:32:13 2011
@@ -171,6 +171,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="multipointEnabled">${MultipointEnabled}</attribute>
+                                    <attribute name="multicastEnabled">${MulticastEnabled}</attribute>
                                     <attribute name="clusterName">${ClusterName}</attribute>
                                 </gbean>
                                 <gbean name="DefaultStatefulContainer">
@@ -209,7 +214,12 @@
                             <config-substitution key="StatelessIdleTimeout">0</config-substitution>
                              
                             <config-substitution key="MulticastDiscoveryAddress">239.255.3.2</config-substitution>
                             <config-substitution key="MulticastDiscoveryPort">6142</config-substitution>
-                            <config-substitution key="ClusterName">cluster1</config-substitution>
+                            <config-substitution key="MultipointHost">0.0.0.0</config-substitution>
+                            <config-substitution key="MultipointPort">4212</config-substitution>
                           
+                            <config-substitution key="MultipointEnabled">false</config-substitution>
+                            <config-substitution key="MulticastEnabled">false</config-substitution>
+                            <config-substitution key="MultipointServers" />
+                            <config-substitution key="ClusterName">cluster1</config-substitution>
                           
                             <copy-file relative-to="geronimo" dest-dir="schema">schema/</copy-file>
                         </plugin-artifact>
                     </instance>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml?rev=1139164&r1=1139163&r2=1139164&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml Fri Jun 24 06:32:13
2011
@@ -89,9 +89,13 @@
         <attribute name="host">${planServerHostname}</attribute>
         <attribute name="threads">20</attribute>
         <attribute name="multicastPort">${planOpenEJBMulticastPort}</attribute>
-        <attribute name="multicastHost">${planOpenEJBMulticastHostname}</attribute>
-        <attribute name="clusterName">cluster1</attribute>
-        <attribute name="enableMulticast">true</attribute>
+        <attribute name="multicastHost">${planOpenEJBMulticastHostname}</attribute>
       
+        <attribute name="multipointPort">${PlanOpenEJBMultipointPort}</attribute>
+        <attribute name="multipointHost">${PlanOpenEJBMultipointHostname}</attribute>
+        <attribute name="multipointServers"></attribute>
+        <attribute name="multipointEnabled">false</attribute>
+        <attribute name="clusterName">cluster1</attribute>        
+        <attribute name="multicastEnabled">false</attribute>
         <dependency>
             <name>OpenEjbSystem</name>
         </dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1139164&r1=1139163&r2=1139164&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Jun 24 06:32:13 2011
@@ -122,6 +122,8 @@
         <planOpenEJBPort>4201</planOpenEJBPort>
         <planOpenEJBMulticastPort>6142</planOpenEJBMulticastPort>
         <planOpenEJBMulticastHostname>239.255.3.2</planOpenEJBMulticastHostname>
+        <PlanOpenEJBMultipointPort>4212</PlanOpenEJBMultipointPort>
+        <PlanOpenEJBMultipointHostname>localhost</PlanOpenEJBMultipointHostname>
         <planNamingPort>1099</planNamingPort>
         <planActiveMQPort>61616</planActiveMQPort>
         <planCOSNamingHost>localhost</planCOSNamingHost>
@@ -2686,3 +2688,4 @@ only found in cxf
 
 </project>
 
+



Mime
View raw message