[jboss-cvs] JBossAS SVN: r61146 - in trunk/system/src/main/org/jboss: system/server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-03-06 12:53:44 -0500 (Tue, 06 Mar 2007)
New Revision: 61146

Modified:
   trunk/system/src/main/org/jboss/Main.java
   trunk/system/src/main/org/jboss/system/server/ServerConfig.java
Log:
[JBAS-3537] Add a startup switch to configure a multicast port
[JBAS-4181] If -b 0.0.0.0 is used, do not pass wildcard addresss through to JGroups

Modified: trunk/system/src/main/org/jboss/Main.java
===================================================================
--- trunk/system/src/main/org/jboss/Main.java	2007-03-06 17:47:07 UTC (rev 61145)
+++ trunk/system/src/main/org/jboss/Main.java	2007-03-06 17:53:44 UTC (rev 61146)
@@ -257,7 +257,7 @@
    {
       // set this from a system property or default to jboss
       String programName = System.getProperty("program.name", "jboss");
-      String sopts = "-:hD:d:p:n:c:Vj::B:L:C:P:b:g:u:l:";
+      String sopts = "-:hD:d:p:n:c:Vj::B:L:C:P:b:g:u:m:l:";
       LongOpt[] lopts =
       {
          new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
@@ -274,6 +274,7 @@
          new LongOpt("host", LongOpt.REQUIRED_ARGUMENT, null, 'b'),
          new LongOpt("partition", LongOpt.REQUIRED_ARGUMENT, null, 'g'),
          new LongOpt("udp", LongOpt.REQUIRED_ARGUMENT, null, 'u'),
+         new LongOpt("mcast_port", LongOpt.REQUIRED_ARGUMENT, null, 'm'),
          new LongOpt("log", LongOpt.REQUIRED_ARGUMENT, null, 'l'),
       };
 
@@ -319,6 +320,7 @@
                System.out.println("    -P, --properties=<url>        Load system properties from the given url");
                System.out.println("    -b, --host=<host or ip>       Bind address for all JBoss services");
                System.out.println("    -g, --partition=<name>        HA Partition name (default=DefaultDomain)");
+               System.out.println("    -m, --mcast_port=<ip>         UDP multicast port; Only used by JGroups multiplexer");
                System.out.println("    -u, --udp=<ip>                UDP multicast address");
                System.out.println("    -l, --log=<log4j|jdk>         Specify the logger plugin type");
                System.out.println();
@@ -346,7 +348,9 @@
                // jgroups.bind_addr property, otherwise jgroups may ignore it
                if ("bind.address".equals(name))
                {
-                  System.setProperty("jgroups.bind_addr", value);
+                  // Wildcard address is not valid for JGroups
+                  String addr = ServerConfigUtil.fixRemoteAddress(value);
+                  System.setProperty("jgroups.bind_addr", addr);
                }
                break;
             }
@@ -438,13 +442,18 @@
                String bindAddress = System.getProperty("bind.address");
                if (bindAddress == null)
                {
-                  System.setProperty("bind.address", arg);
+                  // Wildcard address is not valid for JGroups
+                  bindAddress = ServerConfigUtil.fixRemoteAddress(arg);
+                  System.setProperty("bind.address", bindAddress);
                }
                bindAddress = System.getProperty("jgroups.bind_addr");
                if (bindAddress == null)
                {
-                  System.setProperty("jgroups.bind_addr", arg);
+                  // Wildcard address is not valid for JGroups
+                  bindAddress = ServerConfigUtil.fixRemoteAddress(arg);
+                  System.setProperty("jgroups.bind_addr", bindAddress);
                }
+               
                // Set the java.rmi.server.hostname if not set
                String rmiHost = System.getProperty("java.rmi.server.hostname");
                if( rmiHost == null )
@@ -465,6 +474,11 @@
                // the new jgroups property name
                System.setProperty("jgroups.udp.mcast_addr", arg);
                break;
+            case 'm':
+               arg = getopt.getOptarg();
+               props.put(ServerConfig.PARTITION_UDP_PORT_PROPERTY, arg);
+               System.setProperty(ServerConfig.PARTITION_UDP_PORT_PROPERTY, arg);
+               break;
             case 'l':
             {
                arg = getopt.getOptarg();

Modified: trunk/system/src/main/org/jboss/system/server/ServerConfig.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/ServerConfig.java	2007-03-06 17:47:07 UTC (rev 61145)
+++ trunk/system/src/main/org/jboss/system/server/ServerConfig.java	2007-03-06 17:53:44 UTC (rev 61146)
@@ -46,6 +46,9 @@
    /** The udp address property */
    String PARTITION_UDP_PROPERTY = "jboss.partition.udpGroup";
    
+   /** The udp port property */
+   String PARTITION_UDP_PORT_PROPERTY = "jgroups.udp.mcast_port";
+   
    /** Whether to load native libraries */
    String NATIVE_LOAD_PROPERTY = "jboss.native.load";