diff options
Diffstat (limited to 'java/tools/src/main/java/org/apache')
4 files changed, 13 insertions, 21 deletions
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java b/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java index b4294ee4cc..651d401596 100644 --- a/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java +++ b/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java @@ -25,15 +25,14 @@ import java.util.ArrayList; import java.util.List; import javax.jms.Connection; -import javax.jms.Destination; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageListener; import javax.jms.MessageProducer; import javax.jms.TextMessage; -import org.apache.qpid.client.AMQAnyDestination; import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AddressBasedDestination; /** * A generic receiver which consumes messages @@ -82,7 +81,7 @@ public class Receiver extends Client implements MessageListener { super(con); setSsn(con.createSession(isTransacted(), getAck_mode())); - consumer = getSsn().createConsumer(new AMQAnyDestination(addr)); + consumer = getSsn().createConsumer(new AddressBasedDestination(addr)); if (!syncRcv) { consumer.setMessageListener(this); diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java b/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java index 14b9b7302f..806571b47a 100644 --- a/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java +++ b/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java @@ -36,8 +36,8 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.qpid.client.AMQAnyDestination; import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AddressBasedDestination; import org.apache.qpid.tools.MessageFactory; /** @@ -95,7 +95,7 @@ public class Sender extends Client this.iterations = Integer.getInteger("iterations", -1); this.sleep_time = Long.getLong("sleep_time", 1000); this.setSsn(con.createSession(isTransacted(),Session.AUTO_ACKNOWLEDGE)); - this.dest = new AMQAnyDestination(addr); + this.dest = new AddressBasedDestination(addr); this.producer = getSsn().createProducer(dest); this.replyTo = getSsn().createTemporaryQueue(); diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java b/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java index 72ca48e1c9..2d93daa3b2 100644 --- a/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java +++ b/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java @@ -29,9 +29,7 @@ import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.jms.Destination; import javax.jms.JMSException; @@ -44,11 +42,8 @@ import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; -import org.apache.qpid.client.AMQAnyDestination; import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.client.AddressBasedDestination; import org.apache.qpid.thread.Threading; /** @@ -144,7 +139,7 @@ public class TestLauncher implements ErrorHandler controlCon = new AMQConnection(url); controlCon.start(); - controlDest = new AMQAnyDestination("control; {create: always}"); // durable + controlDest = new AddressBasedDestination("control; {create: always}"); // durable // Create the session to setup the messages controlSession = controlCon.createSession(false, Session.AUTO_ACKNOWLEDGE); diff --git a/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java b/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java index 121e94cea1..a71e6ac55c 100644 --- a/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java +++ b/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java @@ -31,11 +31,9 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -import org.apache.qpid.client.AMQAnyDestination; import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession_0_10; -import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.client.AddressBasedDestination; import org.apache.qpid.messaging.Address; public class PerfBase @@ -142,7 +140,7 @@ public class PerfBase controllerSession = con.createSession(false, Session.AUTO_ACKNOWLEDGE); dest = createDestination(); - controllerQueue = new AMQAnyDestination(CONTROLLER_ADDR); + controllerQueue = new AddressBasedDestination(CONTROLLER_ADDR); myControlQueue = session.createQueue(myControlQueueAddr); msgType = MessageType.getType(params.getMessageType()); System.out.println("Using " + msgType + " messages"); @@ -157,10 +155,10 @@ public class PerfBase { System.out.println("Prefix : " + prefix); Address addr = Address.parse(params.getAddress()); - AMQAnyDestination temp = new AMQAnyDestination(params.getAddress()); - int type = ((AMQSession_0_10)session).resolveAddressType(temp); + AddressBasedDestination temp = new AddressBasedDestination(addr); + temp.resolveAddress((AMQSession_0_10)session); - if ( type == AMQDestination.TOPIC_TYPE) + if (temp.isTopic()) { addr = new Address(addr.getName(),addr.getSubject() + "." + prefix,addr.getOptions()); System.out.println("Setting subject : " + addr); @@ -171,11 +169,11 @@ public class PerfBase System.out.println("Setting name : " + addr); } - return new AMQAnyDestination(addr); + return new AddressBasedDestination(addr); } else { - return new AMQAnyDestination(params.getAddress()); + return new AddressBasedDestination(params.getAddress()); } } |