[jboss-cvs] JBossAS SVN: r67252 - in branches/JBPAPP_4_2: messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar and 1 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2007-11-19 10:36:24 -0500 (Mon, 19 Nov 2007)
New Revision: 67252

Modified:
   branches/JBPAPP_4_2/messaging/src/etc/server-jbm/clustered/deploy/jboss-messaging.sar/messaging-service.xml
   branches/JBPAPP_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml
   branches/JBPAPP_4_2/testsuite/src/resources/test-configs/jbm-cluster2/deploy/jboss-messaging.sar/messaging-service.xml
Log:
Update ServerPeer configuration

Modified: branches/JBPAPP_4_2/messaging/src/etc/server-jbm/clustered/deploy/jboss-messaging.sar/messaging-service.xml
===================================================================
--- branches/JBPAPP_4_2/messaging/src/etc/server-jbm/clustered/deploy/jboss-messaging.sar/messaging-service.xml	2007-11-19 15:31:59 UTC (rev 67251)
+++ branches/JBPAPP_4_2/messaging/src/etc/server-jbm/clustered/deploy/jboss-messaging.sar/messaging-service.xml	2007-11-19 15:36:24 UTC (rev 67252)
@@ -3,7 +3,7 @@
 <!--
      The JBoss Messaging service deployment descriptor.
 
-     $Id: messaging-service.xml 3204 2007-10-19 12:42:17Z timfox $
+     $Id: messaging-service.xml 3337 2007-11-16 12:22:58Z timfox $
  -->
 
 <server>
@@ -81,10 +81,6 @@
       
       <attribute name="ClusterPullConnectionFactoryName">jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory</attribute>
       
-      <!-- Use XA when pulling persistent messages from a remote node to this one. -->
-      
-      <attribute name="UseXAForMessagePull">false</attribute>
-      
       <!-- When redistributing messages in the cluster. Do we need to preserve the order of messages received
             by a particular consumer from a particular producer? -->
             

Modified: branches/JBPAPP_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml
===================================================================
--- branches/JBPAPP_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml	2007-11-19 15:31:59 UTC (rev 67251)
+++ branches/JBPAPP_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml	2007-11-19 15:36:24 UTC (rev 67252)
@@ -3,7 +3,7 @@
 <!--
      The JBoss Messaging service deployment descriptor.
 
-     $Id: messaging-service.xml 3204 2007-10-19 12:42:17Z timfox $
+     $Id: messaging-service.xml 3337 2007-11-16 12:22:58Z timfox $
  -->
 
 <server>
@@ -81,10 +81,6 @@
       
       <attribute name="ClusterPullConnectionFactoryName">jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory</attribute>
       
-      <!-- Use XA when pulling persistent messages from a remote node to this one. -->
-      
-      <attribute name="UseXAForMessagePull">false</attribute>
-      
       <!-- When redistributing messages in the cluster. Do we need to preserve the order of messages received
             by a particular consumer from a particular producer? -->
             

Modified: branches/JBPAPP_4_2/testsuite/src/resources/test-configs/jbm-cluster2/deploy/jboss-messaging.sar/messaging-service.xml
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/resources/test-configs/jbm-cluster2/deploy/jboss-messaging.sar/messaging-service.xml	2007-11-19 15:31:59 UTC (rev 67251)
+++ branches/JBPAPP_4_2/testsuite/src/resources/test-configs/jbm-cluster2/deploy/jboss-messaging.sar/messaging-service.xml	2007-11-19 15:36:24 UTC (rev 67252)
@@ -3,7 +3,7 @@
 <!--
      The JBoss Messaging service deployment descriptor.
 
-     $Id: messaging-service.xml 64130 2007-07-18 23:21:27Z clebert.suconic at jboss.com $
+     $Id: messaging-service.xml 3337 2007-11-16 12:22:58Z timfox $
  -->
 
 <server>
@@ -37,8 +37,6 @@
       
       <attribute name="DefaultSecurityConfig">
         <security>
-            <role name="Administrator" read="true" write="true" create="true"/>
-            <role name="Manager" read="true" write="true" create="true"/>
             <role name="guest" read="true" write="true" create="true"/>
         </security>
       </attribute>
@@ -74,8 +72,6 @@
            it has detected failure -->
       
       <attribute name="FailoverCompleteTimeout">300000</attribute>
-
-      <attribute name="StrictTck">true</attribute>
       
       <!-- The maximum number of days results to maintain in the message counter history -->
       
@@ -85,10 +81,6 @@
       
       <attribute name="ClusterPullConnectionFactoryName">jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory</attribute>
       
-      <!-- Use XA when pulling persistent messages from a remote node to this one. -->
-      
-      <attribute name="UseXAForMessagePull">true</attribute>
-      
       <!-- When redistributing messages in the cluster. Do we need to preserve the order of messages received
             by a particular consumer from a particular producer? -->
             
@@ -97,6 +89,11 @@
       <!-- Max. time to hold previously delivered messages back waiting for clients to reconnect after failover -->
       
       <attribute name="RecoverDeliveriesTimeout">300000</attribute>
+      
+      <!-- The password used by the message sucker connections to create connections.
+           THIS SHOULD ALWAYS BE CHANGED AT INSTALL TIME TO SECURE SYSTEM
+      <attribute name="SuckerPassword"></attribute>
+      -->
 
       <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>