From 9b1bf6023a9869af744e2fbc03664d41ced37df6 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Wed, 30 Oct 2013 21:38:03 +0000 Subject: QPID-4534: unify client heartbeat system properties/connection url options. * Connection url 'heartbeat' broker-option (and deprecated 'idle_timeout') now understood for all protocols * System property 'qpid.heartbeat' (and deprecated 'amqj.heartbeat.delay' and 'idle_timeout') now understood for all protocols * Enhanced heartbeat system tests * Docbook updates Original patch from Keith Wall, plus updates from Robbie Gemmell git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1537313 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/CPPExcludes | 3 ++- qpid/java/test-profiles/Java010Excludes | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'qpid/java/test-profiles') diff --git a/qpid/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes index 8ea592daf9..6ce0936c08 100755 --- a/qpid/java/test-profiles/CPPExcludes +++ b/qpid/java/test-profiles/CPPExcludes @@ -186,7 +186,8 @@ org.apache.qpid.client.ssl.SSLTest#testCreateSSLandTCPonSamePort // QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based -org.apache.qpid.client.HeartbeatTest#testReadOnlyConnectionHeartbeats +org.apache.qpid.client.HeartbeatTest#testUnidirectionalHeartbeating +org.apache.qpid.client.HeartbeatTest#testHeartbeatsEnabledBrokerSide // Exclude java broker specific behavior allowing queue re-bind to topic exchanges on 0.8/0-10 paths org.apache.qpid.server.queue.QueueBindTest#testQueueCanBeReboundOnTopicExchange diff --git a/qpid/java/test-profiles/Java010Excludes b/qpid/java/test-profiles/Java010Excludes index 02c2db1134..093821647d 100755 --- a/qpid/java/test-profiles/Java010Excludes +++ b/qpid/java/test-profiles/Java010Excludes @@ -68,7 +68,8 @@ org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testFlowContro org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessageListener // QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based -org.apache.qpid.client.HeartbeatTest#testReadOnlyConnectionHeartbeats +org.apache.qpid.client.HeartbeatTest#testUnidirectionalHeartbeating +org.apache.qpid.client.HeartbeatTest#testHeartbeatsEnabledBrokerSide // Java 0-10 client does not support re-binding the queue to the same exchange org.apache.qpid.server.queue.QueueBindTest#testQueueCanBeReboundOnTopicExchange -- cgit v1.2.1