[jboss-cvs] JBoss Messaging SVN: r3753 - branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Feb 21 07:46:40 EST 2008


Author: timfox
Date: 2008-02-21 07:46:40 -0500 (Thu, 21 Feb 2008)
New Revision: 3753

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/clustered-hsqldb-persistence-service.xml
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/mssql-persistence-service.xml
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/mysql-persistence-service.xml
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/oracle-persistence-service.xml
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/postgresql-persistence-service.xml
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/sybase-persistence-service.xml
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1234


Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/clustered-hsqldb-persistence-service.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/clustered-hsqldb-persistence-service.xml	2008-02-21 12:44:36 UTC (rev 3752)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/clustered-hsqldb-persistence-service.xml	2008-02-21 12:46:40 UTC (rev 3753)
@@ -2,7 +2,7 @@
 
 <!--
      Hypersonic persistence deployment descriptor.
-     
+
      DO NOT USE HYPERSONIC IN PRODUCTION or in a clustered environment- Hypersonic does not have transaction isolation
 
      This clustered example is provided for test purposes and integration with JBAS only. Do not use it in real situations!
@@ -148,7 +148,7 @@
                  max_bundle_timeout="30"
                  use_incoming_packet_handler="true"
                  use_outgoing_packet_handler="false"
-                 ip_ttl="${jboss.messaging.ipttl:2}"
+                 ip_ttl="${jboss.messaging.ipttl:8}"
                  down_thread="false" up_thread="false"
                  enable_bundling="false"/>
             <PING timeout="2000"

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/mssql-persistence-service.xml	2008-02-21 12:44:36 UTC (rev 3752)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/mssql-persistence-service.xml	2008-02-21 12:46:40 UTC (rev 3753)
@@ -12,27 +12,27 @@
 
    <!-- Persistence Manager MBean configuration
        ======================================== -->
-   
+
    <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
       name="jboss.messaging:service=PersistenceManager"
       xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
+
       <!-- The datasource to use for the persistence manager -->
-        
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
+
       <!-- If true will attempt to create tables and indexes on every start-up -->
-      
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <!-- If true then will use JDBC batch updates -->
-      
+
       <attribute name="UsingBatchUpdates">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
    CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY))
    CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID BIGINT, CHANNEL_ID BIGINT, TRANSACTION_ID BIGINT, STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, DELIVERY_COUNT INT, SCHED_DELIVERY BIGINT, PRIMARY KEY(MESSAGE_ID, CHANNEL_ID))
@@ -60,16 +60,16 @@
    UPDATE_REFS_NOT_PAGED=UPDATE JBM_MSG_REF SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNEL_ID=?
    SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JBM_MSG_REF WHERE CHANNEL_ID = ?
    SELECT_EXISTS_REF_MESSAGE_ID=SELECT MESSAGE_ID FROM JBM_MSG_REF WHERE MESSAGE_ID = ?
-   UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ? 
-   UPDATE_CHANNEL_ID=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE CHANNEL_ID = ?   
-   MOVE_REFERENCE=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?    
+   UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
+   UPDATE_CHANNEL_ID=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE CHANNEL_ID = ?
+   MOVE_REFERENCE=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
    LOAD_MESSAGES=SELECT MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, HEADERS, PAYLOAD, TYPE FROM JBM_MSG
    INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
    INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE) SELECT ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
    UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? WHERE MESSAGE_ID=?
-   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)   
+   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
    MESSAGE_ID_COLUMN=MESSAGE_ID
-   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)   
+   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)
    INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
    DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? AND TRANSACTION_ID = ?
    SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
@@ -81,68 +81,68 @@
    SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
    UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
       ]]></attribute>
-      
+
       <!-- The maximum number of parameters to include in a prepared statement -->
-      
+
       <attribute name="MaxParams">500</attribute>
-           
+
    </mbean>
 
    <!-- Messaging Post Office MBean configuration
         ========================================= -->
-   
+
    <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
       name="jboss.messaging:service=PostOffice"
       xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
-      
+
       <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-                 
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
-      <!-- The name of the post office -->      
-      
+
+      <!-- The name of the post office -->
+
       <attribute name="PostOfficeName">JMS post office</attribute>
-      
-      <!-- The datasource used by the post office to access it's binding information -->      
-            
+
+      <!-- The datasource used by the post office to access it's binding information -->
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
+
       <!-- If true will attempt to create tables and indexes on every start-up -->
-            
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
 CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID SMALLINT, QUEUE_NAME VARCHAR(255), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID INTEGER, CLSTERED CHAR(1), ALL_NODES CHAR(1), PRIMARY KEY(POSTOFFICE_NAME, NODE_ID, QUEUE_NAME))
 INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
 LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
-      ]]></attribute>        
-      
+      ]]></attribute>
+
       <!-- This post office is clustered. If you don't want a clustered post office then set to false -->
-      
+
       <attribute name="Clustered">true</attribute>
-      
+
       <!-- All the remaining properties only have to be specified if the post office is clustered.
            You can safely comment them out if your post office is non clustered -->
-      
-      <!-- The JGroups group name that the post office will use -->      
-            
+
+      <!-- The JGroups group name that the post office will use -->
+
       <attribute name="GroupName">${jboss.messaging.groupname:MessagingPostOffice}</attribute>
-     
-      <!-- Max time to wait for state to arrive when the post office joins the cluster -->            
-      
+
+      <!-- Max time to wait for state to arrive when the post office joins the cluster -->
+
       <attribute name="StateTimeout">30000</attribute>
-      
-      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->            
-      
+
+      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
+
       <attribute name="CastTimeout">30000</attribute>
-       
-      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->               
-      
-      <!-- By default we use the TCP stack for data -->                  
-      <attribute name="DataChannelConfig">      
+
+      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
+
+      <!-- By default we use the TCP stack for data -->
+      <attribute name="DataChannelConfig">
          <config>
             <TCP start_port="7900"
                  loopback="true"
@@ -163,10 +163,10 @@
 		         mcast_port="${jboss.messaging.datachanneludpport:45567}"
 		         ip_ttl="${jboss.messaging.ipttl:8}"
 		         num_initial_members="2"
-		         num_ping_requests="1"/>                     
+		         num_ping_requests="1"/>
             <MERGE2 max_interval="100000"
                     down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>            
+            <FD_SOCK down_thread="false" up_thread="false"/>
             <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
             <pbcast.NAKACK max_xmit_size="60000"
                            use_mcast_xmit="false" gc_lag="0"
@@ -180,11 +180,11 @@
                         down_thread="false" up_thread="false"
                         join_retry_timeout="2000" shun="false"
                         view_bundling="true"/>
-        </config>        
+        </config>
       </attribute>
-      
-      <!-- JGroups stack configuration to use for the control channel - used for control messages -->         
-              
+
+      <!-- JGroups stack configuration to use for the control channel - used for control messages -->
+
       <!-- We use udp stack for the control channel -->
       <attribute name="ControlChannelConfig">
          <config>
@@ -202,7 +202,7 @@
                  max_bundle_timeout="30"
                  use_incoming_packet_handler="true"
                  use_outgoing_packet_handler="false"
-                 ip_ttl="${jboss.messaging.ipttl:2}"
+                 ip_ttl="${jboss.messaging.ipttl:8}"
                  down_thread="false" up_thread="false"
                  enable_bundling="false"/>
             <PING timeout="2000"
@@ -230,24 +230,24 @@
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
             <pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
         </config>
-     </attribute>	
-   </mbean>    
-   
+     </attribute>
+   </mbean>
+
    <!-- Messaging JMS User Manager MBean config
         ======================================= -->
-   
+
    <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
       name="jboss.messaging:service=JMSUserManager"
       xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
 CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128), PRIMARY KEY(USER_ID))
 CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR(32) NOT NULL, USER_ID VARCHAR(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/mysql-persistence-service.xml	2008-02-21 12:44:36 UTC (rev 3752)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/mysql-persistence-service.xml	2008-02-21 12:46:40 UTC (rev 3753)
@@ -12,36 +12,36 @@
 
    <!-- Persistence Manager MBean configuration
        ======================================== -->
-   
+
    <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
       name="jboss.messaging:service=PersistenceManager"
       xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
+
       <!-- The datasource to use for the persistence manager -->
-                    
-      <attribute name="DataSource">java:/DefaultDS</attribute>      
-      
+
+      <attribute name="DataSource">java:/DefaultDS</attribute>
+
       <!-- If true will attempt to create tables and indexes on every start-up -->
-                  
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <!-- If true then will use JDBC batch updates -->
-                  
+
       <attribute name="UsingBatchUpdates">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
    CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY)) ENGINE = INNODB
-   CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID BIGINT, CHANNEL_ID BIGINT, TRANSACTION_ID BIGINT, STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, DELIVERY_COUNT INTEGER, SCHED_DELIVERY BIGINT, PRIMARY KEY(MESSAGE_ID, CHANNEL_ID)) ENGINE = INNODB   
-   CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID, STATE)   
+   CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID BIGINT, CHANNEL_ID BIGINT, TRANSACTION_ID BIGINT, STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, DELIVERY_COUNT INTEGER, SCHED_DELIVERY BIGINT, PRIMARY KEY(MESSAGE_ID, CHANNEL_ID)) ENGINE = INNODB
+   CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID, STATE)
    CREATE_IDX_MESSAGE_REF_ORD=CREATE INDEX JBM_MSG_REF_ORD ON JBM_MSG_REF (ORD)
    CREATE_IDX_MESSAGE_REF_PAGE_ORD=CREATE INDEX JBM_MSG_REF_PAGE_ORD ON JBM_MSG_REF (PAGE_ORD)
    CREATE_IDX_MESSAGE_REF_MESSAGE_ID=CREATE INDEX JBM_MSG_REF_MESSAGE_ID ON JBM_MSG_REF (MESSAGE_ID)
-   CREATE_IDX_MESSAGE_REF_SCHED_DELIVERY=CREATE INDEX JBM_MSG_REF_SCHED_DELIVERY ON JBM_MSG_REF (SCHED_DELIVERY)      
-   CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID BIGINT, RELIABLE CHAR(1), EXPIRATION BIGINT, TIMESTAMP BIGINT, PRIORITY TINYINT, TYPE TINYINT, HEADERS MEDIUMBLOB, PAYLOAD LONGBLOB, PRIMARY KEY (MESSAGE_ID)) ENGINE = INNODB  
+   CREATE_IDX_MESSAGE_REF_SCHED_DELIVERY=CREATE INDEX JBM_MSG_REF_SCHED_DELIVERY ON JBM_MSG_REF (SCHED_DELIVERY)
+   CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID BIGINT, RELIABLE CHAR(1), EXPIRATION BIGINT, TIMESTAMP BIGINT, PRIORITY TINYINT, TYPE TINYINT, HEADERS MEDIUMBLOB, PAYLOAD LONGBLOB, PRIMARY KEY (MESSAGE_ID)) ENGINE = INNODB
    CREATE_TRANSACTION=CREATE TABLE JBM_TX (NODE_ID INTEGER, TRANSACTION_ID BIGINT, BRANCH_QUAL VARBINARY(254), FORMAT_ID INTEGER, GLOBAL_TXID VARBINARY(254), PRIMARY KEY (TRANSACTION_ID)) ENGINE = INNODB
    CREATE_COUNTER=CREATE TABLE JBM_COUNTER (NAME VARCHAR(255), NEXT_ID BIGINT, PRIMARY KEY(NAME)) ENGINE = INNODB
    INSERT_DUAL=INSERT INTO JBM_DUAL VALUES (1)
@@ -56,7 +56,7 @@
    ROLLBACK_MESSAGE_REF2=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='-'
    LOAD_PAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, PAGE_ORD, SCHED_DELIVERY FROM JBM_MSG_REF WHERE CHANNEL_ID = ? AND PAGE_ORD BETWEEN ? AND ? ORDER BY PAGE_ORD
    LOAD_UNPAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? AND PAGE_ORD IS NULL ORDER BY ORD
-   LOAD_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? ORDER BY ORD     
+   LOAD_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? ORDER BY ORD
    UPDATE_REFS_NOT_PAGED=UPDATE JBM_MSG_REF SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNEL_ID=?
    SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JBM_MSG_REF WHERE CHANNEL_ID = ?
    SELECT_EXISTS_REF_MESSAGE_ID=SELECT MESSAGE_ID FROM JBM_MSG_REF WHERE MESSAGE_ID = ?
@@ -67,9 +67,9 @@
    INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
    INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE) SELECT ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
    UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? WHERE MESSAGE_ID=?
-   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)   
-   MESSAGE_ID_COLUMN=MESSAGE_ID   
-   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)      
+   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+   MESSAGE_ID_COLUMN=MESSAGE_ID
+   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)
    INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
    DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? AND TRANSACTION_ID = ?
    SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
@@ -81,68 +81,68 @@
    SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
    UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
       ]]></attribute>
-      
+
       <!-- The maximum number of parameters to include in a prepared statement -->
-                  
+
       <attribute name="MaxParams">500</attribute>
-           
+
    </mbean>
 
    <!-- Messaging Post Office MBean configuration
         ========================================= -->
-   
+
    <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
       name="jboss.messaging:service=PostOffice"
       xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
-      
+
       <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-                
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
-      <!-- The name of the post office -->                  
-      
+
+      <!-- The name of the post office -->
+
       <attribute name="PostOfficeName">JMS post office</attribute>
-      
-      <!-- The datasource used by the post office to access it's binding information -->                     
-      
+
+      <!-- The datasource used by the post office to access it's binding information -->
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
+
       <!-- If true will attempt to create tables and indexes on every start-up -->
-                        
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
 CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR(255), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT, CLUSTERED CHAR(1), ALL_NODES CHAR(1), PRIMARY KEY(POSTOFFICE_NAME, NODE_ID, QUEUE_NAME)) ENGINE = INNODB
 INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
 LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
       ]]></attribute>
-      
+
       <!-- This post office is clustered. If you don't want a clustered post office then set to false -->
-      
+
       <attribute name="Clustered">true</attribute>
-      
+
       <!-- All the remaining properties only have to be specified if the post office is clustered.
            You can safely comment them out if your post office is non clustered -->
-      
-      <!-- The JGroups group name that the post office will use -->            
-      
+
+      <!-- The JGroups group name that the post office will use -->
+
       <attribute name="GroupName">${jboss.messaging.groupname:MessagingPostOffice}</attribute>
-      
-      <!-- Max time to wait for state to arrive when the post office joins the cluster -->            
-                  
+
+      <!-- Max time to wait for state to arrive when the post office joins the cluster -->
+
       <attribute name="StateTimeout">300000</attribute>
-      
-      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->            
-                  
+
+      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
+
       <attribute name="CastTimeout">300000</attribute>
-      
-      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster --> 
-                   
-      <!-- By default we use the TCP stack for data -->                  
-      <attribute name="DataChannelConfig">      
+
+      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
+
+      <!-- By default we use the TCP stack for data -->
+      <attribute name="DataChannelConfig">
          <config>
             <TCP start_port="7900"
                  loopback="true"
@@ -158,15 +158,15 @@
                  use_send_queues="false"
                  sock_conn_timeout="300"
                  skip_suspected_members="true"/>
-            <MPING timeout="4000"		        
+            <MPING timeout="4000"
 		         mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
 		         mcast_port="${jboss.messaging.datachanneludpport:45567}"
 		         ip_ttl="${jboss.messaging.ipttl:8}"
 		         num_initial_members="2"
-		         num_ping_requests="1"/>                     
+		         num_ping_requests="1"/>
             <MERGE2 max_interval="100000"
                     down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>            
+            <FD_SOCK down_thread="false" up_thread="false"/>
             <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
             <pbcast.NAKACK max_xmit_size="60000"
                            use_mcast_xmit="false" gc_lag="0"
@@ -180,11 +180,11 @@
                         down_thread="false" up_thread="false"
                         join_retry_timeout="2000" shun="false"
                         view_bundling="true"/>
-        </config>        
+        </config>
       </attribute>
-      
-      <!-- JGroups stack configuration to use for the control channel - used for control messages -->         
-              
+
+      <!-- JGroups stack configuration to use for the control channel - used for control messages -->
+
       <!-- We use udp stack for the control channel -->
       <attribute name="ControlChannelConfig">
          <config>
@@ -202,7 +202,7 @@
                  max_bundle_timeout="30"
                  use_incoming_packet_handler="true"
                  use_outgoing_packet_handler="false"
-                 ip_ttl="${jboss.messaging.ipttl:2}"
+                 ip_ttl="${jboss.messaging.ipttl:8}"
                  down_thread="false" up_thread="false"
                  enable_bundling="false"/>
             <PING timeout="2000"
@@ -230,13 +230,13 @@
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
             <pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
         </config>
-     </attribute>	   
-      
+     </attribute>
+
    </mbean>
-   
+
    <!-- Messaging JMS User Manager MBean config
         ======================================= -->
-      
+
    <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
       name="jboss.messaging:service=JMSUserManager"
       xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/oracle-persistence-service.xml	2008-02-21 12:44:36 UTC (rev 3752)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/oracle-persistence-service.xml	2008-02-21 12:46:40 UTC (rev 3753)
@@ -12,33 +12,33 @@
 
    <!-- Persistence Manager MBean configuration
        ======================================== -->
-   
+
    <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
       name="jboss.messaging:service=PersistenceManager"
       xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
+
       <!-- The datasource to use for the persistence manager -->
-                    
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
+
       <!-- If true will attempt to create tables and indexes on every start-up -->
-                  
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <!-- If true then will use JDBC batch updates -->
-                  
+
       <attribute name="UsingBatchUpdates">true</attribute>
-      
+
       <!-- Some databases don't support inserting blobs using INSERT INTO ... SELECT FROM -->
-      
+
       <attribute name="SupportsBlobOnSelect">false</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
-   CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY))   
+   CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY))
    CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID INTEGER, CHANNEL_ID INTEGER, TRANSACTION_ID INTEGER, STATE CHAR(1), ORD INTEGER, PAGE_ORD INTEGER, DELIVERY_COUNT INTEGER, SCHED_DELIVERY INTEGER, PRIMARY KEY(MESSAGE_ID, CHANNEL_ID))
    CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID, STATE)
    CREATE_IDX_MESSAGE_REF_ORD=CREATE INDEX JBM_MSG_REF_ORD ON JBM_MSG_REF (ORD)
@@ -64,16 +64,16 @@
    UPDATE_REFS_NOT_PAGED=UPDATE JBM_MSG_REF SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNEL_ID=?
    SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JBM_MSG_REF WHERE CHANNEL_ID = ?
    SELECT_EXISTS_REF_MESSAGE_ID=SELECT MESSAGE_ID FROM JBM_MSG_REF WHERE MESSAGE_ID = ?
-   UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ? 
+   UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
    UPDATE_CHANNEL_ID=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE CHANNEL_ID = ?
-   MOVE_REFERENCE=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ? 
+   MOVE_REFERENCE=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
    LOAD_MESSAGES=SELECT MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, HEADERS, PAYLOAD, TYPE FROM JBM_MSG
    INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
    INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE) SELECT ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
    UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? WHERE MESSAGE_ID=?
-   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)   
+   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
    MESSAGE_ID_COLUMN=MESSAGE_ID
-   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)   
+   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)
    INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
    DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? AND TRANSACTION_ID = ?
    SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
@@ -85,68 +85,68 @@
    SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
    UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
       ]]></attribute>
-      
+
       <!-- The maximum number of parameters to include in a prepared statement -->
-                  
+
       <attribute name="MaxParams">500</attribute>
-       
+
    </mbean>
 
    <!-- Messaging Post Office MBean configuration
         ========================================= -->
-   
+
    <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
       name="jboss.messaging:service=PostOffice"
       xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
-            
+
       <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
-      <!-- The name of the post office -->      
-                  
+
+      <!-- The name of the post office -->
+
       <attribute name="PostOfficeName">JMS post office</attribute>
-      
-      <!-- The datasource used by the post office to access it's binding information -->      
-                    
+
+      <!-- The datasource used by the post office to access it's binding information -->
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
-      <!-- If true will attempt to create tables and indexes on every start-up -->                  
-      
+
+      <!-- If true will attempt to create tables and indexes on every start-up -->
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
 CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR2(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR2(255), COND VARCHAR2(1023), SELECTOR VARCHAR2(1023), CHANNEL_ID INTEGER, CLUSTERED CHAR(1), ALL_NODES CHAR(1), PRIMARY KEY(POSTOFFICE_NAME, NODE_ID, QUEUE_NAME))
 INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
 LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
       ]]></attribute>
-      
+
 	  <!-- This post office is clustered. If you don't want a clustered post office then set to false -->
-      
+
       <attribute name="Clustered">true</attribute>
-      
+
       <!-- All the remaining properties only have to be specified if the post office is clustered.
            You can safely comment them out if your post office is non clustered -->
-      
-      <!-- The JGroups group name that the post office will use -->          
-      
+
+      <!-- The JGroups group name that the post office will use -->
+
       <attribute name="GroupName">${jboss.messaging.groupname:MessagingPostOffice}</attribute>
-     
-      <!-- Max time to wait for state to arrive when the post office joins the cluster -->            
-                  
+
+      <!-- Max time to wait for state to arrive when the post office joins the cluster -->
+
       <attribute name="StateTimeout">30000</attribute>
-      
-      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->            
-                  
+
+      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
+
       <attribute name="CastTimeout">30000</attribute>
-      
-      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->               
-      
-      <!-- By default we use the TCP stack for data -->                  
-      <attribute name="DataChannelConfig">      
+
+      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
+
+      <!-- By default we use the TCP stack for data -->
+      <attribute name="DataChannelConfig">
          <config>
             <TCP start_port="7900"
                  loopback="true"
@@ -162,15 +162,15 @@
                  use_send_queues="false"
                  sock_conn_timeout="300"
                  skip_suspected_members="true"/>
-            <MPING timeout="4000"	
+            <MPING timeout="4000"
 		         mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
 		         mcast_port="${jboss.messaging.datachanneludpport:45567}"
 		         ip_ttl="${jboss.messaging.ipttl:8}"
 		         num_initial_members="2"
-		         num_ping_requests="1"/>                     
+		         num_ping_requests="1"/>
             <MERGE2 max_interval="100000"
                     down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>            
+            <FD_SOCK down_thread="false" up_thread="false"/>
             <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
             <pbcast.NAKACK max_xmit_size="60000"
                            use_mcast_xmit="false" gc_lag="0"
@@ -184,11 +184,11 @@
                         down_thread="false" up_thread="false"
                         join_retry_timeout="2000" shun="false"
                         view_bundling="true"/>
-        </config>        
+        </config>
       </attribute>
-      
-      <!-- JGroups stack configuration to use for the control channel - used for control messages -->         
-              
+
+      <!-- JGroups stack configuration to use for the control channel - used for control messages -->
+
       <!-- We use udp stack for the control channel -->
       <attribute name="ControlChannelConfig">
          <config>
@@ -206,7 +206,7 @@
                  max_bundle_timeout="30"
                  use_incoming_packet_handler="true"
                  use_outgoing_packet_handler="false"
-                 ip_ttl="${jboss.messaging.ipttl:2}"
+                 ip_ttl="${jboss.messaging.ipttl:8}"
                  down_thread="false" up_thread="false"
                  enable_bundling="false"/>
             <PING timeout="2000"
@@ -234,24 +234,24 @@
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
             <pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
         </config>
-     </attribute>   
+     </attribute>
    </mbean>
-   
+
    <!-- Messaging JMS User Manager MBean config
         ======================================= -->
-      
+
    <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
       name="jboss.messaging:service=JMSUserManager"
       xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
 CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR2(32) NOT NULL, PASSWD VARCHAR2(32) NOT NULL, CLIENTID VARCHAR2(128), PRIMARY KEY(USER_ID))
 CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR2(32) NOT NULL, USER_ID VARCHAR2(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/postgresql-persistence-service.xml	2008-02-21 12:44:36 UTC (rev 3752)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/postgresql-persistence-service.xml	2008-02-21 12:46:40 UTC (rev 3753)
@@ -12,27 +12,27 @@
 
    <!-- Persistence Manager MBean configuration
        ======================================== -->
-   
+
    <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
       name="jboss.messaging:service=PersistenceManager"
       xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
+
       <!-- The datasource to use for the persistence manager -->
-                    
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
+
       <!-- If true will attempt to create tables and indexes on every start-up -->
-                  
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <!-- If true then will use JDBC batch updates -->
-                  
+
       <attribute name="UsingBatchUpdates">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
    CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY))
    CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID BIGINT, CHANNEL_ID BIGINT, TRANSACTION_ID BIGINT, STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, DELIVERY_COUNT INTEGER, SCHED_DELIVERY BIGINT, PRIMARY KEY(MESSAGE_ID, CHANNEL_ID))
@@ -41,7 +41,7 @@
    CREATE_IDX_MESSAGE_REF_PAGE_ORD=CREATE INDEX JBM_MSG_REF_PAGE_ORD ON JBM_MSG_REF (PAGE_ORD)
    CREATE_IDX_MESSAGE_REF_MESSAGE_ID=CREATE INDEX JBM_MSG_REF_MESSAGE_ID ON JBM_MSG_REF (MESSAGE_ID)
    CREATE_IDX_MESSAGE_REF_SCHED_DELIVERY=CREATE INDEX JBM_MSG_REF_SCHED_DELIVERY ON JBM_MSG_REF (SCHED_DELIVERY)
-   CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID BIGINT, RELIABLE CHAR(1), EXPIRATION BIGINT, TIMESTAMP BIGINT, PRIORITY SMALLINT, TYPE SMALLINT, HEADERS BYTEA, PAYLOAD BYTEA, PRIMARY KEY (MESSAGE_ID))   
+   CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID BIGINT, RELIABLE CHAR(1), EXPIRATION BIGINT, TIMESTAMP BIGINT, PRIORITY SMALLINT, TYPE SMALLINT, HEADERS BYTEA, PAYLOAD BYTEA, PRIMARY KEY (MESSAGE_ID))
    CREATE_TRANSACTION=CREATE TABLE JBM_TX (NODE_ID INTEGER, TRANSACTION_ID BIGINT, BRANCH_QUAL BYTEA, FORMAT_ID INTEGER, GLOBAL_TXID BYTEA, PRIMARY KEY (TRANSACTION_ID))
    CREATE_COUNTER=CREATE TABLE JBM_COUNTER (NAME VARCHAR(255), NEXT_ID BIGINT, PRIMARY KEY(NAME))
    INSERT_DUAL=INSERT INTO JBM_DUAL VALUES (1)
@@ -67,9 +67,9 @@
    INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
    INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE) SELECT ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
    UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? WHERE MESSAGE_ID=?
-   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)   
+   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
    MESSAGE_ID_COLUMN=MESSAGE_ID
-   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)   
+   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)
    INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
    DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? AND TRANSACTION_ID = ?
    SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
@@ -81,79 +81,79 @@
    SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
    UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
       ]]></attribute>
-      
+
       <!-- The maximum number of parameters to include in a prepared statement -->
-                  
+
       <attribute name="MaxParams">500</attribute>
-      
+
    </mbean>
 
    <!-- Messaging Post Office MBean configuration
         ========================================= -->
-   
+
    <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
       name="jboss.messaging:service=PostOffice"
       xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
-      
+
       <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
-      <!-- The name of the post office -->      
-                  
+
+      <!-- The name of the post office -->
+
       <attribute name="PostOfficeName">JMS post office</attribute>
-      
-      <!-- The datasource used by the post office to access it's binding information -->                        
-      
+
+      <!-- The datasource used by the post office to access it's binding information -->
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
-      <!-- If true will attempt to create tables and indexes on every start-up -->              
-      
+
+      <!-- If true will attempt to create tables and indexes on every start-up -->
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
 CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR(255), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT, CLUSTERED CHAR(1), ALL_NODES CHAR(1), PRIMARY KEY(POSTOFFICE_NAME, NODE_ID, QUEUE_NAME))
 INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
 LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
       ]]></attribute>
-      
+
 	  <!-- This post office is clustered. If you don't want a clustered post office then set to false -->
-      
+
       <attribute name="Clustered">true</attribute>
-      
+
       <!-- All the remaining properties only have to be specified if the post office is clustered.
            You can safely comment them out if your post office is non clustered -->
-      
-      <!-- The JGroups group name that the post office will use -->          
-      
+
+      <!-- The JGroups group name that the post office will use -->
+
       <attribute name="GroupName">${jboss.messaging.groupname:MessagingPostOffice}</attribute>
-      
-      <!-- Max time to wait for state to arrive when the post office joins the cluster -->                        
-      
+
+      <!-- Max time to wait for state to arrive when the post office joins the cluster -->
+
       <attribute name="StateTimeout">30000</attribute>
-      
-      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->                        
-      
+
+      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
+
       <attribute name="CastTimeout">30000</attribute>
-      
+
       <!-- Max number of concurrent replications -->
-      
+
       <attribute name="MaxConcurrentReplications">50</attribute>
-                  
-      <!-- 
-      <attribute name="ChannelFactoryName">jgroups.mux:name=Multiplexer</attribute>      
+
+      <!--
+      <attribute name="ChannelFactoryName">jgroups.mux:name=Multiplexer</attribute>
       <attribute name="ControlChannelName">udp-sync</attribute>
       <attribute name="DataChannelName">udp</attribute>
       <attribute name="ChannelPartitionName">${jboss.partition.name:DefaultPartition}-JMS</attribute>
       -->
-      
-      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->               
-      
-      <!-- By default we use the TCP stack for data -->                  
-      <attribute name="DataChannelConfig">      
+
+      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
+
+      <!-- By default we use the TCP stack for data -->
+      <attribute name="DataChannelConfig">
          <config>
             <TCP start_port="7900"
                  loopback="true"
@@ -169,15 +169,15 @@
                  use_send_queues="false"
                  sock_conn_timeout="300"
                  skip_suspected_members="true"/>
-            <MPING timeout="4000"		     
+            <MPING timeout="4000"
 		         mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
 		         mcast_port="${jboss.messaging.datachanneludpport:45567}"
 		         ip_ttl="${jboss.messaging.ipttl:8}"
 		         num_initial_members="2"
-		         num_ping_requests="1"/>                     
+		         num_ping_requests="1"/>
             <MERGE2 max_interval="100000"
                     down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>            
+            <FD_SOCK down_thread="false" up_thread="false"/>
             <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
             <pbcast.NAKACK max_xmit_size="60000"
                            use_mcast_xmit="false" gc_lag="0"
@@ -191,11 +191,11 @@
                         down_thread="false" up_thread="false"
                         join_retry_timeout="2000" shun="false"
                         view_bundling="true"/>
-        </config>        
+        </config>
       </attribute>
-      
-      <!-- JGroups stack configuration to use for the control channel - used for control messages -->         
-              
+
+      <!-- JGroups stack configuration to use for the control channel - used for control messages -->
+
       <!-- We use udp stack for the control channel -->
       <attribute name="ControlChannelConfig">
          <config>
@@ -213,7 +213,7 @@
                  max_bundle_timeout="30"
                  use_incoming_packet_handler="true"
                  use_outgoing_packet_handler="false"
-                 ip_ttl="${jboss.messaging.ipttl:2}"
+                 ip_ttl="${jboss.messaging.ipttl:8}"
                  down_thread="false" up_thread="false"
                  enable_bundling="false"/>
             <PING timeout="2000"
@@ -241,12 +241,12 @@
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
             <pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
         </config>
-     </attribute>	
+     </attribute>
    </mbean>
-   
+
    <!-- Messaging JMS User Manager MBean config
         ======================================= -->
-      
+
    <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
       name="jboss.messaging:service=JMSUserManager"
       xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/sybase-persistence-service.xml	2008-02-21 12:44:36 UTC (rev 3752)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/server/default/deploy/sybase-persistence-service.xml	2008-02-21 12:46:40 UTC (rev 3753)
@@ -11,33 +11,33 @@
 <server>
 
    <!-- Persistence Manager MBean configuration
-       ======================================== -->   
+       ======================================== -->
 
    <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
       name="jboss.messaging:service=PersistenceManager"
       xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-            
+
       <!-- The datasource to use for the persistence manager -->
-                                
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
+
       <!-- If true will attempt to create tables and indexes on every start-up -->
-                  
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <!-- If true then will use JDBC batch updates -->
-                  
+
       <attribute name="UsingBatchUpdates">true</attribute>
-      
+
       <!-- If true then will add a trailing byte to all byte arrays otherwise Sybase truncates them
            Only known to be necessary for Sybase -->
-                  
+
       <attribute name="UsingTrailingByte">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
    CREATE_DUAL=CREATE TABLE JBM_DUAL (DUAL_DUMMY INTEGER, PRIMARY KEY (DUAL_DUMMY))
    CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID DECIMAL(19, 0), CHANNEL_ID DECIMAL(19, 0), TRANSACTION_ID DECIMAL(19, 0) NULL, STATE CHAR(1), ORD DECIMAL(19, 0), PAGE_ORD DECIMAL(19, 0) NULL, DELIVERY_COUNT INTEGER, SCHED_DELIVERY DECIMAL(19, 0), PRIMARY KEY(MESSAGE_ID, CHANNEL_ID))
@@ -67,14 +67,14 @@
    SELECT_EXISTS_REF_MESSAGE_ID=SELECT MESSAGE_ID FROM JBM_MSG_REF WHERE MESSAGE_ID = ?
    UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
    UPDATE_CHANNEL_ID=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE CHANNEL_ID = ?
-   MOVE_REFERENCE=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ? 
+   MOVE_REFERENCE=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
    LOAD_MESSAGES=SELECT MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, HEADERS, PAYLOAD, TYPE FROM JBM_MSG
    INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
    INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE) SELECT ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
    UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? WHERE MESSAGE_ID=?
-   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)   
-   MESSAGE_ID_COLUMN=MESSAGE_ID   
-   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)   
+   INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT ?, ?, ?, ?, ?, ?, ?, ? FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+   MESSAGE_ID_COLUMN=MESSAGE_ID
+   DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)
    INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
    DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? AND TRANSACTION_ID = ?
    SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
@@ -86,68 +86,68 @@
    SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
    UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
       ]]></attribute>
-      
+
       <!-- The maximum number of parameters to include in a prepared statement -->
-                  
+
       <attribute name="MaxParams">500</attribute>
-      
+
    </mbean>
 
    <!-- Messaging Post Office MBean configuration
         ========================================= -->
-   
+
    <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
       name="jboss.messaging:service=PostOffice"
       xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
-      
+
       <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-      
+
       <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-      
+
       <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-      
-      <!-- The name of the post office -->      
-                  
+
+      <!-- The name of the post office -->
+
       <attribute name="PostOfficeName">JMS post office</attribute>
-      
-      <!-- The datasource used by the post office to access it's binding information -->                              
-      
+
+      <!-- The datasource used by the post office to access it's binding information -->
+
       <attribute name="DataSource">java:/DefaultDS</attribute>
-      
+
       <!-- If true will attempt to create tables and indexes on every start-up -->
-                        
+
       <attribute name="CreateTablesOnStartup">true</attribute>
-      
+
       <attribute name="SqlProperties"><![CDATA[
 CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID SMALLINT, QUEUE_NAME VARCHAR(255), COND VARCHAR(1023), SELECTOR VARCHAR(1023) NULL, CHANNEL_ID INTEGER, CLSTERED CHAR(1), ALL_NODES CHAR(1), PRIMARY KEY(POSTOFFICE_NAME, NODE_ID, QUEUE_NAME))
 INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
 LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
       ]]></attribute>
-      
+
 	  <!-- This post office is clustered. If you don't want a clustered post office then set to false -->
-      
+
       <attribute name="Clustered">true</attribute>
-      
+
       <!-- All the remaining properties only have to be specified if the post office is clustered.
            You can safely comment them out if your post office is non clustered -->
-      
-      <!-- The JGroups group name that the post office will use -->         
-      
+
+      <!-- The JGroups group name that the post office will use -->
+
       <attribute name="GroupName">${jboss.messaging.groupname:MessagingPostOffice}</attribute>
-     
-      <!-- Max time to wait for state to arrive when the post office joins the cluster -->            
-                  
+
+      <!-- Max time to wait for state to arrive when the post office joins the cluster -->
+
       <attribute name="StateTimeout">30000</attribute>
-      
-      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->            
-                  
+
+      <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
+
       <attribute name="CastTimeout">30000</attribute>
-      
-      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->               
-      
-      <!-- By default we use the TCP stack for data -->                  
-      <attribute name="DataChannelConfig">      
+
+      <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
+
+      <!-- By default we use the TCP stack for data -->
+      <attribute name="DataChannelConfig">
          <config>
             <TCP start_port="7900"
                  loopback="true"
@@ -163,15 +163,15 @@
                  use_send_queues="false"
                  sock_conn_timeout="300"
                  skip_suspected_members="true"/>
-            <MPING timeout="4000"		
+            <MPING timeout="4000"
 		         mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
 		         mcast_port="${jboss.messaging.datachanneludpport:45567}"
 		         ip_ttl="${jboss.messaging.ipttl:8}"
 		         num_initial_members="2"
-		         num_ping_requests="1"/>                     
+		         num_ping_requests="1"/>
             <MERGE2 max_interval="100000"
                     down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>            
+            <FD_SOCK down_thread="false" up_thread="false"/>
             <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
             <pbcast.NAKACK max_xmit_size="60000"
                            use_mcast_xmit="false" gc_lag="0"
@@ -185,11 +185,11 @@
                         down_thread="false" up_thread="false"
                         join_retry_timeout="2000" shun="false"
                         view_bundling="true"/>
-        </config>        
+        </config>
       </attribute>
-      
-      <!-- JGroups stack configuration to use for the control channel - used for control messages -->         
-              
+
+      <!-- JGroups stack configuration to use for the control channel - used for control messages -->
+
       <!-- We use udp stack for the control channel -->
       <attribute name="ControlChannelConfig">
          <config>
@@ -207,7 +207,7 @@
                  max_bundle_timeout="30"
                  use_incoming_packet_handler="true"
                  use_outgoing_packet_handler="false"
-                 ip_ttl="${jboss.messaging.ipttl:2}"
+                 ip_ttl="${jboss.messaging.ipttl:8}"
                  down_thread="false" up_thread="false"
                  enable_bundling="false"/>
             <PING timeout="2000"
@@ -235,12 +235,12 @@
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
             <pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
         </config>
-     </attribute>	
+     </attribute>
    </mbean>
-   
+
    <!-- Messaging JMS User Manager MBean config
         ======================================= -->
-      
+
    <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
       name="jboss.messaging:service=JMSUserManager"
       xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">




More information about the jboss-cvs-commits mailing list