QPID-3401 Checking the proposed changes into a branch to preserve history & continue working until such time it's accepted into trunk.address-refactor

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/address-refactor@1183532 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 8 insertions, 10 deletions

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Drain.java b/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
index b43031ad23..e2db7c37b1 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
@@ -26,9 +26,7 @@ import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.Session;
 
-import org.apache.qpid.client.AMQAnyDestination;
-import org.apache.qpid.client.AMQConnection;
-import org.slf4j.Logger;
+import org.apache.qpid.client.AddressBasedDestination;
 
 public class Drain extends OptionParser
 {
@@ -66,7 +64,7 @@ public class Drain extends OptionParser
         Connection con = createConnection();
         con.start();
         Session ssn = con.createSession(false,Session.AUTO_ACKNOWLEDGE);     
-        Destination dest = new AMQAnyDestination(address);
+        Destination dest = new AddressBasedDestination(address);
         MessageConsumer consumer = ssn.createConsumer(dest);
         Message msg;
         
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java b/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
index 89db04f8d3..ae71a121de 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
@@ -27,8 +27,8 @@ import javax.jms.MapMessage;
 import javax.jms.MessageConsumer;
 import javax.jms.Session;
 
-import org.apache.qpid.client.AMQAnyDestination;
 import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AddressBasedDestination;
 
 
 public class MapReceiver {
@@ -41,7 +41,7 @@ public class MapReceiver {
         connection.start();
         
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        Destination queue = new AMQAnyDestination("ADDR:message_queue; {create: always}");
+        Destination queue = new AddressBasedDestination("message_queue; {create: always}");
         MessageConsumer consumer = session.createConsumer(queue);
 
         MapMessage m = (MapMessage)consumer.receive();
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java b/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java
index 0ce9383add..fa85c00a51 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java
@@ -33,8 +33,8 @@ import javax.jms.MapMessage;
 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.AddressBasedDestination;
 
 
 public class MapSender {
@@ -45,7 +45,7 @@ public class MapSender {
             new AMQConnection("amqp://guest:guest@test/?brokerlist='tcp://localhost:5672'");
         
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        Destination queue = new AMQAnyDestination("ADDR:message_queue; {create: always}");
+        Destination queue = new AddressBasedDestination("ADDR:message_queue; {create: always}");
         MessageProducer producer = session.createProducer(queue);
 
         MapMessage m = session.createMapMessage();
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Spout.java b/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
index 5da319a658..6e7b7c85ba 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
@@ -27,7 +27,7 @@ import javax.jms.Message;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.qpid.client.AMQAnyDestination;
+import org.apache.qpid.client.AddressBasedDestination;
 
 public class Spout extends OptionParser
 {
@@ -87,7 +87,7 @@ public class Spout extends OptionParser
         Connection con = createConnection();
         con.start();
         Session ssn = con.createSession(false,Session.AUTO_ACKNOWLEDGE);     
-        Destination dest = new AMQAnyDestination(address);
+        Destination dest = new AddressBasedDestination(address);
         MessageProducer producer = ssn.createProducer(dest);
         
         int count = Integer.parseInt(getOp(COUNT));