[jboss-cvs] JBoss Messaging SVN: r7848 - in branches/Branch_1_4: integration/AS5/etc and 2 other directories.

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

Author: gaohoward
Date: 2009-10-12 05:11:47 -0400 (Mon, 12 Oct 2009)
New Revision: 7848

Modified:
   branches/Branch_1_4/build-thirdparty-AS5.xml
   branches/Branch_1_4/integration/AS5/etc/aop-messaging-client.xml
   branches/Branch_1_4/integration/AS5/etc/xmdesc/ConnectionFactory-xmbean.xml
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeManagementTest.java
Log:
1.4.6.GA update: jgroups version to 2.6.13.GA-brew
test failures



Modified: branches/Branch_1_4/build-thirdparty-AS5.xml
===================================================================
--- branches/Branch_1_4/build-thirdparty-AS5.xml	2009-10-12 06:12:29 UTC (rev 7847)
+++ branches/Branch_1_4/build-thirdparty-AS5.xml	2009-10-12 09:11:47 UTC (rev 7848)
@@ -85,7 +85,7 @@
       <componentref name="oswego-concurrent" version="1.3.4-jboss-update1"/>
       <componentref name="apache-log4j" version="1.2.14"/>
       <componentref name="javassist" version="3.9.0.GA"/>
-      <componentref name="jgroups" version="2.6.13.GA"/>
+      <componentref name="jgroups" version="2.6.13.GA-brew"/>
       <componentref name="trove" version="1.0.2"/>
       <componentref name="jboss/common-core" version="2.2.14.GA"/>
       <componentref name="jboss/common-logging-jdk" version="2.1.0.GA"/>

Modified: branches/Branch_1_4/integration/AS5/etc/aop-messaging-client.xml
===================================================================
--- branches/Branch_1_4/integration/AS5/etc/aop-messaging-client.xml	2009-10-12 06:12:29 UTC (rev 7847)
+++ branches/Branch_1_4/integration/AS5/etc/aop-messaging-client.xml	2009-10-12 09:11:47 UTC (rev 7848)
@@ -260,6 +260,12 @@
    <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->close())">
       <advice name="handleClose" aspect="org.jboss.jms.client.container.ProducerAspect"/>
    </bind>    
+   <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->enableOrderingGroup(..))">
+      <advice name="handleEnableOrderingGroup" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+   </bind>    
+   <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->disableOrderingGroup())">
+      <advice name="handleDisableOrderingGroup" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+   </bind>    
    <!-- Producers never go to the server - so no need for a failover interceptor -->   
 
    <!--

Modified: branches/Branch_1_4/integration/AS5/etc/xmdesc/ConnectionFactory-xmbean.xml
===================================================================
--- branches/Branch_1_4/integration/AS5/etc/xmdesc/ConnectionFactory-xmbean.xml	2009-10-12 06:12:29 UTC (rev 7847)
+++ branches/Branch_1_4/integration/AS5/etc/xmdesc/ConnectionFactory-xmbean.xml	2009-10-12 09:11:47 UTC (rev 7848)
@@ -129,6 +129,24 @@
       <name>DisableRemotingChecks</name>
       <type>boolean</type>
    </attribute>
+   
+   <attribute access="read-write" getMethod="isDisableRemotingChecks" setMethod="setDisableRemotingChecks">
+      <description>Disable remoting connector parameter sanity checks. There is rarely a good reason to set this to true</description>
+      <name>DisableRemotingChecks</name>
+      <type>boolean</type>
+   </attribute>
+   
+   <attribute access="read-write" getMethod="isEnableOrderingGroup" setMethod="setEnableOrderingGroup">
+      <description>Enable/Disable message ordering group on connection factory. Default is false.</description>
+      <name>EnableOrderingGroup</name>
+      <type>boolean</type>
+   </attribute>
+   
+   <attribute access="read-write" getMethod="getDefaultOrderingGroupName" setMethod="setDefaultOrderingGroupName">
+      <description>The default name for message ordering group, only make sense when ordering group is enabled on the connection factory.</description>
+      <name>DefaultOrderingGroupName</name>
+      <type>java.lang.String</type>
+   </attribute>
 
    <!-- Managed operations -->
 

Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeManagementTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeManagementTest.java	2009-10-12 06:12:29 UTC (rev 7847)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeManagementTest.java	2009-10-12 09:11:47 UTC (rev 7848)
@@ -94,18 +94,30 @@
       ObjectName poName = ServerManagement.getServer(0).getPostOfficeObjectName();
       MessagingPostOffice office = (MessagingPostOffice)ServerManagement.getAttribute(poName, "Instance");
       
+      String partitionName = (String)ServerManagement.getAttribute(poName, "ChannelPartitionName");
+      
       String groupName = office.getGroupMember().getGroupName();
       
-      //Note: some hudson test scripts define jboss.messaging.groupname, so we 
-      //need to check this.
-      String sysGroupName = System.getProperty("jboss.messaging.groupname");
-      if (sysGroupName != null)
+      //if the channelPartitionName is defined, the group name should be set with it.
+      if (partitionName != null)
       {
-         assertEquals(sysGroupName, groupName);
+         assertEquals(partitionName, groupName);
       }
       else
       {
-         assertEquals("MessagingPostOffice", groupName);
+         //Note: some hudson test scripts define jboss.messaging.groupname, so we 
+         //need to check this.
+         log.info("groupName is: " + groupName);
+         String sysGroupName = System.getProperty("jboss.messaging.groupname");
+         log.info("systemgroupName is: " + sysGroupName);
+         if (sysGroupName != null)
+         {
+            assertEquals(sysGroupName, groupName);
+         }
+         else
+         {
+            assertEquals("MessagingPostOffice", groupName);
+         }
       }
 
       ServerManagement.stop(0);