[jboss-cvs] JBoss Messaging SVN: r2817 - in trunk: src/main/org/jboss/jms/server/bridge and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jun 29 06:42:18 EDT 2007


Author: timfox
Date: 2007-06-29 06:42:18 -0400 (Fri, 29 Jun 2007)
New Revision: 2817

Modified:
   trunk/src/main/org/jboss/jms/message/JBossMessage.java
   trunk/src/main/org/jboss/jms/server/bridge/Bridge.java
   trunk/src/main/org/jboss/jms/server/bridge/BridgeService.java
   trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/PostOfficeTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-1007 and http://jira.jboss.com/jira/browse/JBMESSAGING-287


Modified: trunk/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossMessage.java	2007-06-28 21:51:09 UTC (rev 2816)
+++ trunk/src/main/org/jboss/jms/message/JBossMessage.java	2007-06-29 10:42:18 UTC (rev 2817)
@@ -94,12 +94,18 @@
    
    public static final String JMS_JBOSS_SCHEDULED_DELIVERY_PROP_NAME = "JMS_JBOSS_SCHEDULED_DELIVERY";
    
+   //Used when sending a message to the DLQ
    public static final String JBOSS_MESSAGING_ORIG_DESTINATION = "JBM_ORIG_DESTINATION";
 
+   //Used when sending a message to the DLQ
    public static final String JBOSS_MESSAGING_ORIG_MESSAGE_ID = "JBM_ORIG_MESSAGE_ID";
    
+   //Used when sending a mesage to the DLQ
    public static final String JBOSS_MESSAGING_ACTUAL_EXPIRY_TIME = "JBM_ACTUAL_EXPIRY";
    
+   //Used when bridging a message
+   public static final String JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST = "JBM_BRIDGE_MSG_ID_LIST";
+   
    private static final Logger log = Logger.getLogger(JBossMessage.class);   
       
    // Static --------------------------------------------------------

Modified: trunk/src/main/org/jboss/jms/server/bridge/Bridge.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/bridge/Bridge.java	2007-06-28 21:51:09 UTC (rev 2816)
+++ trunk/src/main/org/jboss/jms/server/bridge/Bridge.java	2007-06-29 10:42:18 UTC (rev 2817)
@@ -21,8 +21,11 @@
  */
 package org.jboss.jms.server.bridge;
 
+import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.Map;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -41,6 +44,7 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
 
+import org.jboss.jms.message.JBossMessage;
 import org.jboss.logging.Logger;
 import org.jboss.messaging.core.contract.MessagingComponent;
 import org.jboss.tm.TransactionManagerLocator;
@@ -153,6 +157,10 @@
    
    private String clientID;
    
+   private volatile boolean addMessageIDInHeader;
+   
+      
+   
    private boolean started;
    
    private LinkedList messages;
@@ -193,7 +201,6 @@
    
    private boolean usingXA;
    
-   
    /*
     * Constructor for MBean
     */
@@ -212,7 +219,8 @@
                  int maxRetries,
                  int qosMode,
                  int maxBatchSize, long maxBatchTime,
-                 String subName, String clientID)
+                 String subName, String clientID,
+                 boolean addMessageIDInHeader)
    {            
       this();
       
@@ -247,6 +255,8 @@
       this.subName = subName;
       
       this.clientID = clientID;
+      
+      this.addMessageIDInHeader = addMessageIDInHeader;
             
       if (trace)
       {
@@ -640,6 +650,16 @@
       
       this.clientID = clientID; 
    }
+   
+   public boolean isAddMessageIDInHeader()
+   {
+   	return this.addMessageIDInHeader;
+   }
+   
+   public void setAddMessageIDInHeader(boolean value)
+   {
+   	this.addMessageIDInHeader = value;
+   }
       
    public synchronized boolean isPaused()
    {
@@ -1167,6 +1187,11 @@
          {
             msg = (Message)iter.next();
             
+            if (addMessageIDInHeader)
+            {
+            	addMessageIDInHeader(msg);            	
+            }
+            
             if (trace) { log.trace("Sending message " + msg); }
             
             producer.send(msg);
@@ -1256,6 +1281,70 @@
       t.start();         
    }
    
+   private void addMessageIDInHeader(Message msg) throws Exception
+   {
+   	//We concatenate the old message id as a header in the message
+   	//This allows the target to then use this as the JMSCorrelationID of any response message
+   	//thus enabling a distributed request-response pattern.
+   	//Each bridge (if there are more than one) in the chain can contenate the message id
+   	//So in the case of multiple bridges having routed the message this can be used in a multi-hop
+   	//distributed request/response
+   	if (trace) { log.trace("Adding old message id in Message header"); }
+   	
+   	//Now JMS is really dumb and does not let you add a property on received message without first
+   	//calling clearProperties, so we need to save and re-add all the old properties so we
+   	//don't lose them!!
+   	
+   	Enumeration en = msg.getPropertyNames();
+   	
+   	Map oldProps = null;
+   	
+   	while (en.hasMoreElements())
+   	{
+   		String propName = (String)en.nextElement();
+   		
+   		if (oldProps == null)
+   		{
+   			oldProps = new HashMap();
+   		}
+   		
+   		oldProps.put(propName, msg.getObjectProperty(propName));
+   	}
+   	            	
+   	msg.clearProperties();
+   	
+   	if (oldProps != null)
+   	{
+   		Iterator iter2 = oldProps.entrySet().iterator();
+   		
+   		while (iter2.hasNext())
+   		{
+   			Map.Entry entry = (Map.Entry)iter2.next();
+   			
+   			msg.setObjectProperty((String)entry.getKey(), entry.getValue());
+   		}
+   	}
+   	
+   	String val = null;
+   	
+   	val = msg.getStringProperty(JBossMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST);
+   	
+   	if (val == null)
+   	{
+   		val = msg.getJMSMessageID();
+   	}
+   	else
+   	{
+   		StringBuffer sb = new StringBuffer(val);
+   		
+   		sb.append(",").append(msg.getJMSMessageID());
+   		
+   		val = sb.toString();
+   	}
+   	
+   	msg.setStringProperty(JBossMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST, val);            	   
+   }
+   
    // Inner classes ---------------------------------------------------------------
    
    private class FailureHandler implements Runnable

Modified: trunk/src/main/org/jboss/jms/server/bridge/BridgeService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/bridge/BridgeService.java	2007-06-28 21:51:09 UTC (rev 2816)
+++ trunk/src/main/org/jboss/jms/server/bridge/BridgeService.java	2007-06-29 10:42:18 UTC (rev 2817)
@@ -240,6 +240,16 @@
       bridge.setMaxRetries(retries);
    }
    
+   public boolean isAddMessageIDInHeader()
+   {
+   	return bridge.isAddMessageIDInHeader();
+   }
+   
+   public void setAddMessageIDInHeader(boolean value)
+   {
+   	bridge.setAddMessageIDInHeader(value);
+   }
+   
    public boolean isFailed()
    {
       return bridge.isFailed();

Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/PostOfficeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/PostOfficeTest.java	2007-06-28 21:51:09 UTC (rev 2816)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/PostOfficeTest.java	2007-06-29 10:42:18 UTC (rev 2817)
@@ -64,7 +64,7 @@
    }
 
    // Public --------------------------------------------------------
-
+   
    public final void testBindUnbind() throws Throwable
    {
       PostOffice office1 = null;
@@ -80,7 +80,7 @@
          //Bind one durable
              
          MessagingQueue queue1 =
-            new MessagingQueue(1, "durableQueue", channelIDManager.getID(), ms, pm, true, 1, null, false, false);
+            new MessagingQueue(1, "durableQueue", channelIDManager.getID(), ms, pm, true, -1, null, false, false);
          queue1.activate();
          
          Condition condition1 = new SimpleCondition("condition1");
@@ -104,7 +104,7 @@
          {
          
 	         MessagingQueue queuexx =
-	            new MessagingQueue(777, "durableQueue", channelIDManager.getID(), ms, pm, true, 1, null, false, false);
+	            new MessagingQueue(777, "durableQueue", channelIDManager.getID(), ms, pm, true, -1, null, false, false);
 	         queuexx.activate();
 	         office1.addBinding(new Binding(condition1, queuexx, false), false);
             fail();

Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java	2007-06-28 21:51:09 UTC (rev 2816)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java	2007-06-29 10:42:18 UTC (rev 2817)
@@ -103,7 +103,7 @@
                                    "/queue/sourceQueue", "/queue/targetQueue",
                                    null, null, null, null,
                                    Bridge.QOS_AT_MOST_ONCE, null, 1,
-                                   -1, null, null, 5000, -1);
+                                   -1, null, null, 5000, -1, false);
       log.info("Deployed bridge");
       
       ServerManagement.getServer(0).invoke(on, "create", new Object[0], new String[0]);
@@ -320,7 +320,7 @@
                            "/queue/sourceQueue", "/queue/targetQueue",
                            null, null, null, null,
                            Bridge.QOS_ONCE_AND_ONLY_ONCE, null, 1,
-                           -1, null, null, 5000, -1);
+                           -1, null, null, 5000, -1, false);
          
          log.trace("Constructed bridge");
          
@@ -650,7 +650,7 @@
             String targetUsername, String targetPassword,
             int qos, String selector, int maxBatchSize,
             long maxBatchTime, String subName, String clientID,
-            long failureRetryInterval, int maxRetries) throws Exception
+            long failureRetryInterval, int maxRetries, boolean addMessageIDInHeader) throws Exception
    {
       String config = 
          "<mbean code=\"org.jboss.jms.server.bridge.BridgeService\" " +
@@ -691,8 +691,11 @@
       {
          config += "<attribute name=\"ClientID\">" + clientID + "</attribute>";
       }
-      config += "<attribute name=\"FailureRetryInterval\">" + failureRetryInterval + "</attribute>"+      
-      "<attribute name=\"MaxRetries\">" + maxRetries +"</attribute>";
+      config += "<attribute name=\"FailureRetryInterval\">" + failureRetryInterval + "</attribute>";    
+      
+      config += "<attribute name=\"MaxRetries\">" + maxRetries +"</attribute>";
+      
+      config += "<attribute name=\"AddMessageIDInHeader\">" + addMessageIDInHeader + "</attribute>";
       config += "</mbean>";
       
       return ServerManagement.getServer(server).deploy(config);            

Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java	2007-06-28 21:51:09 UTC (rev 2816)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java	2007-06-29 10:42:18 UTC (rev 2817)
@@ -21,6 +21,10 @@
  */
 package org.jboss.test.messaging.jms.bridge;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
 import javax.jms.Message;
@@ -31,6 +35,7 @@
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
+import org.jboss.jms.message.JBossMessage;
 import org.jboss.jms.server.bridge.Bridge;
 import org.jboss.logging.Logger;
 import org.jboss.test.messaging.tools.ServerManagement;
@@ -371,7 +376,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, failureRetryInterval, maxRetries, qosMode,
                                batchSize, maxBatchTime,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -384,7 +389,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, failureRetryInterval, maxRetries, qosMode,
                                batchSize, maxBatchTime,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -397,7 +402,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, failureRetryInterval, maxRetries, qosMode,
                                batchSize, maxBatchTime,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -410,7 +415,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, failureRetryInterval, maxRetries, qosMode,
                                batchSize, maxBatchTime,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -423,7 +428,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, -2, maxRetries, qosMode,
                                batchSize, maxBatchTime,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -436,7 +441,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, -1, 10, qosMode,
                                batchSize, maxBatchTime,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -449,7 +454,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, failureRetryInterval, maxRetries, -2,
                                batchSize, maxBatchTime,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -462,7 +467,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, failureRetryInterval, maxRetries, 3,
                                batchSize, maxBatchTime,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -475,7 +480,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, failureRetryInterval, maxRetries, 3,
                                0, maxBatchTime,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -488,7 +493,7 @@
                                sourceUsername, sourcePassword, destUsername, destPassword,
                                selector, failureRetryInterval, maxRetries, 3,
                                batchSize, -2,
-                               subName, clientID);
+                               subName, clientID, false);
          }
          catch (IllegalArgumentException e)
          {
@@ -524,7 +529,7 @@
                   null, null, null, null,
                   selector, 5000, 10, Bridge.QOS_AT_MOST_ONCE,
                   1, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
             
@@ -650,7 +655,7 @@
                   null, null, null, null,
                   null, 5000, 10, Bridge.QOS_AT_MOST_ONCE,
                   1, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
          
@@ -707,7 +712,7 @@
                   null, null, null, null,
                   null, 5000, 10, Bridge.QOS_AT_MOST_ONCE,
                   1, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
             
@@ -741,7 +746,7 @@
                   null, null, null, null,
                   null, 5000, 10, Bridge.QOS_AT_MOST_ONCE,
                   1, -1,
-                  "subTest", "clientid123");
+                  "subTest", "clientid123", false);
          
          bridge.start();
             
@@ -775,7 +780,7 @@
                   null, null, null, null,
                   null, 5000, 10, Bridge.QOS_AT_MOST_ONCE,
                   NUM_MESSAGES, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
          
@@ -815,7 +820,230 @@
       }                  
    }
    
+   public void testMessageIDInHeader() throws Exception
+   { 
+      Bridge bridge = null;
+      
+      Connection connSource = null;
+      
+      Connection connTarget = null;
+            
+      try
+      {
+         this.setUpAdministeredObjects(true);
+         
+         final int NUM_MESSAGES = 10;
+         
+         bridge = new Bridge(cff0, cff1, sourceQueue, destQueue,
+                  null, null, null, null,
+                  null, 5000, 10, Bridge.QOS_AT_MOST_ONCE,
+                  1, -1,
+                  null, null, true);
+         
+         bridge.start();
+         
+         connSource = cf0.createConnection();
+         
+         connTarget = cf1.createConnection();
+                    
+         log.trace("Sending " + NUM_MESSAGES + " messages");
+         
+         List ids1 = new ArrayList();
+     
+         Session sessSource = connSource.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         
+         MessageProducer prod = sessSource.createProducer(sourceQueue);
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sessSource.createTextMessage("message" + i);
+            
+            //We add some headers to make sure they get passed through ok
+            tm.setStringProperty("wib", "uhuh");
+            tm.setBooleanProperty("cheese", true);
+            tm.setIntProperty("Sausages", 23);
+            
+            prod.send(tm);
+            
+            ids1.add(tm.getJMSMessageID());
+         }
+
+         log.trace("Sent the first messages");
+         
+         Session sessTarget = connTarget.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         
+         MessageConsumer cons = sessTarget.createConsumer(destQueue);
+         
+         connTarget.start();
+         
+         List msgs = new ArrayList();
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons.receive(5000);
+            
+            assertNotNull(tm);
+            
+            assertEquals("message" + i, tm.getText());
+            
+            assertEquals("uhuh", tm.getStringProperty("wib"));
+            assertTrue(tm.getBooleanProperty("cheese"));
+            assertEquals(23, tm.getIntProperty("Sausages"));
+            
+            String header = tm.getStringProperty(JBossMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST);
+            
+            assertNotNull(header);
+            
+            assertEquals(ids1.get(i), header);
+            
+            msgs.add(tm);
+         }
+         
+         //Now we send them again back to the source
+         
+         Iterator iter = msgs.iterator();
+         
+         List ids2 = new ArrayList();
+         
+         while (iter.hasNext())
+         {
+         	Message msg = (Message)iter.next();
+         	
+         	prod.send(msg);
+            
+            ids2.add(msg.getJMSMessageID());
+         }
+                               
+         //And consume them again
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons.receive(5000);
+            
+            assertNotNull(tm);
+            
+            assertEquals("message" + i, tm.getText());
+            
+            assertEquals("uhuh", tm.getStringProperty("wib"));
+            assertTrue(tm.getBooleanProperty("cheese"));
+            assertEquals(23, tm.getIntProperty("Sausages"));
+            
+            String header = tm.getStringProperty(JBossMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST);
+            
+            assertNotNull(header);
+            
+            assertEquals(ids1.get(i) + "," + ids2.get(i), header);
+         }
+         
+      }
+      finally
+      {                        
+         if (bridge != null)
+         {
+            bridge.stop();
+         }
+         
+         if (connSource != null)
+         {
+            connSource.close();
+         }
+         
+         if (connTarget != null)
+         {
+            connTarget.close();
+         }
+      }                  
+   }
    
+   public void testNoMessageIDInHeader() throws Exception
+   { 
+      Bridge bridge = null;
+      
+      Connection connSource = null;
+      
+      Connection connTarget = null;
+            
+      try
+      {
+         this.setUpAdministeredObjects(true);
+         
+         final int NUM_MESSAGES = 10;
+         
+         bridge = new Bridge(cff0, cff1, sourceQueue, destQueue,
+                  null, null, null, null,
+                  null, 5000, 10, Bridge.QOS_AT_MOST_ONCE,
+                  1, -1,
+                  null, null, false);
+         
+         bridge.start();
+         
+         connSource = cf0.createConnection();
+         
+         connTarget = cf1.createConnection();
+                    
+         log.trace("Sending " + NUM_MESSAGES + " messages");
+         
+         Session sessSource = connSource.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         
+         MessageProducer prod = sessSource.createProducer(sourceQueue);
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sessSource.createTextMessage("message" + i);
+            
+            //We add some headers to make sure they get passed through ok
+            tm.setStringProperty("wib", "uhuh");
+            tm.setBooleanProperty("cheese", true);
+            tm.setIntProperty("Sausages", 23);
+            
+            prod.send(tm);
+         }
+
+         log.trace("Sent the first messages");
+         
+         Session sessTarget = connTarget.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         
+         MessageConsumer cons = sessTarget.createConsumer(destQueue);
+         
+         connTarget.start();
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons.receive(5000);
+            
+            assertNotNull(tm);
+            
+            assertEquals("message" + i, tm.getText());
+            
+            assertEquals("uhuh", tm.getStringProperty("wib"));
+            assertTrue(tm.getBooleanProperty("cheese"));
+            assertEquals(23, tm.getIntProperty("Sausages"));
+            
+            String header = tm.getStringProperty(JBossMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST);
+            
+            assertNull(header);
+         }                 
+      }
+      finally
+      {                        
+         if (bridge != null)
+         {
+            bridge.stop();
+         }
+         
+         if (connSource != null)
+         {
+            connSource.close();
+         }
+         
+         if (connTarget != null)
+         {
+            connTarget.close();
+         }
+      }                  
+   }
+   
+   
    // Private -------------------------------------------------------------------------------
              
    private void testStress(int qosMode, boolean persistent, int batchSize) throws Exception
@@ -834,7 +1062,7 @@
                   null, null, null, null,
                   null, 5000, 10, qosMode,
                   batchSize, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
             
@@ -914,7 +1142,7 @@
                   null, null, null, null,
                   null, 5000, 10, qosMode,
                   batchSize, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
             
@@ -992,7 +1220,7 @@
                   null, null, null, null,
                   null, 5000, 10, qosMode,
                   NUM_MESSAGES, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
             
@@ -1061,7 +1289,7 @@
                   null, null, null, null,
                   null, 5000, 10, qosMode,
                   NUM_MESSAGES, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
             
@@ -1129,7 +1357,7 @@
                   null, null, null, null,
                   null, 5000, 10, qosMode,
                   MAX_BATCH_SIZE, MAX_BATCH_TIME,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
             
@@ -1183,7 +1411,7 @@
                   null, null, null, null,
                   null, 5000, 10, qosMode,
                   MAX_BATCH_SIZE, MAX_BATCH_TIME,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
          

Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java	2007-06-28 21:51:09 UTC (rev 2816)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java	2007-06-29 10:42:18 UTC (rev 2817)
@@ -121,7 +121,7 @@
             null, null, null, null,
             null, 1000, -1, Bridge.QOS_DUPLICATES_OK,
             10, -1,
-            null, null);
+            null, null, false);
       
       try
       {
@@ -167,7 +167,7 @@
                   null, null, null, null,
                   null, 1000, -1, qosMode,
                   10, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
             
@@ -255,7 +255,7 @@
                   null, null, null, null,
                   null, 1000, -1, Bridge.QOS_ONCE_AND_ONLY_ONCE,
                   10, 5000,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
          

Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java	2007-06-28 21:51:09 UTC (rev 2816)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java	2007-06-29 10:42:18 UTC (rev 2817)
@@ -102,7 +102,7 @@
                   null, null, null, null,
                   null, 1000, -1, Bridge.QOS_ONCE_AND_ONLY_ONCE,
                   NUM_MESSAGES, -1,
-                  null, null);
+                  null, null, false);
          
          bridge.start();
          

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java	2007-06-28 21:51:09 UTC (rev 2816)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java	2007-06-29 10:42:18 UTC (rev 2817)
@@ -21,6 +21,8 @@
   */
 package org.jboss.test.thirdparty.remoting;
 
+import java.util.HashMap;
+
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
@@ -150,9 +152,6 @@
       }
    }
 
-   /**
-    * TODO: Commented out until fixed. See http://jira.jboss.org/jira/browse/JBMESSAGING-287
-    */
    public void testConnectionListener() throws Throwable
    {
       // Start a server
@@ -177,7 +176,13 @@
 
       try
       {
-         Client client = new Client(serverLocator);
+         HashMap metadata = new HashMap();
+         
+         metadata.put(InvokerLocator.FORCE_REMOTE, "true");
+         
+         metadata.put(Client.ENABLE_LEASE, "true");
+         
+         Client client = new Client(serverLocator, metadata);
 
          client.connect();
 




More information about the jboss-cvs-commits mailing list