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

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

Author: bstansberry at jboss.com
Date: 2008-08-29 09:14:18 -0400 (Fri, 29 Aug 2008)
New Revision: 77652

Modified:
   trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
   trunk/main/src/main/org/jboss/system/server/ServerConfig.java
Log:
[JBAS-2395] Don't have -m set the sys prop JGroups uses to override xml config
[JBAS-5583] Bump the timer.num_threads on the transports we expect to be shared

Modified: trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2008-08-29 13:08:36 UTC (rev 77651)
+++ trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2008-08-29 13:14:18 UTC (rev 77652)
@@ -9,7 +9,7 @@
         <config>
           <UDP
              singleton_name="udp"
-             mcast_port="${jgroups.udp.mcast_port:45688}"
+             mcast_port="${jboss.jgroups.udp.mcast_port:45688}"
              mcast_addr="${jgroups.udp.mcast_addr:228.11.11.11}"
              tos="8"
              ucast_recv_buf_size="20000000"
@@ -24,6 +24,7 @@
              use_incoming_packet_handler="true"
              ip_ttl="${jgroups.udp.ip_ttl:2}"
              thread_naming_pattern="cl"
+             timer.num_threads="12"
                  
              use_concurrent_stack="true"
 
@@ -148,6 +149,7 @@
                  use_send_queues="false"
                  sock_conn_timeout="300"
                  skip_suspected_members="true"
+                 timer.num_threads="12"
                  
                  use_concurrent_stack="true"
 	

Modified: trunk/main/src/main/org/jboss/system/server/ServerConfig.java
===================================================================
--- trunk/main/src/main/org/jboss/system/server/ServerConfig.java	2008-08-29 13:08:36 UTC (rev 77651)
+++ trunk/main/src/main/org/jboss/system/server/ServerConfig.java	2008-08-29 13:14:18 UTC (rev 77652)
@@ -44,7 +44,7 @@
    String PARTITION_UDP_PROPERTY = "jboss.partition.udpGroup";
    
    /** The udp port property */
-   String PARTITION_UDP_PORT_PROPERTY = "jgroups.udp.mcast_port";
+   String PARTITION_UDP_PORT_PROPERTY = "jboss.jgroups.udp.mcast_port";
    
    /** Whether to load native libraries */
    String NATIVE_LOAD_PROPERTY = "jboss.native.load";