More example fixes and updated pom

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486165 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 6 insertions, 36 deletions

diff --git a/java/client/example/pom.xml b/java/client/example/pom.xml
index d02b09edd5..ac0081c00b 100644
--- a/java/client/example/pom.xml
+++ b/java/client/example/pom.xml
@@ -49,26 +49,9 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-filter-ssl</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>jmscts</groupId>
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java b/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
index be42e0e413..2bde4ec35c 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
@@ -75,7 +75,7 @@ public class Publisher
 
             //lookup the example queue and use it
             //Queue is non-exclusive and not deleted when last consumer detaches
-            _destination = _session.createQueue((String)ctx.lookup("MyQueue"));
+            _destination = (Queue) ctx.lookup("MyQueue");
 
             //create a message producer
             _producer = _session.createProducer(_destination);
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
index 9c195aef40..1d2e5e0e66 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
@@ -39,7 +39,7 @@ public class MonitoredSubscriber extends Subscriber
     {
         super();
         //lookup queue name and append suffix
-        _monitorDestinationName = _destinationName + Statics.MONITOR_QUEUE_SUFFIX;
+        _monitorDestinationName = _destination.toString() + Statics.MONITOR_QUEUE_SUFFIX;
     }
 
     /**
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
index 34c7d6c7bb..4e92a6c678 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
@@ -45,7 +45,7 @@ public class Subscriber
 
     protected static AMQConnectionFactory _connectionFactory;
 
-    protected String _destinationName;
+    protected Destination _destination;
 
     public Subscriber()
     {
@@ -58,8 +58,8 @@ public class Subscriber
             //then create a connection using the AMQConnectionFactory
             _connectionFactory = (AMQConnectionFactory) ctx.lookup("local");
 
-            //lookup queue name
-            _destinationName = (String) ctx.lookup("MyQueue");
+            //lookup queue from context
+            _destination = (Destination) ctx.lookup("MyQueue");
 
         }
         catch (Exception e)
@@ -79,7 +79,6 @@ public class Subscriber
         public ExampleMessageListener(String name)
         {
             _name = name;
-
         }
 
         /**
@@ -127,11 +126,8 @@ public class Subscriber
              //create a transactional session
             Session session =  _connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
 
-            //Queue is non-exclusive and not deleted when last consumer detaches
-            Destination destination = session.createQueue(_destinationName);
-
             //Create a consumer with a destination of our queue which will use defaults for prefetch etc
-            _consumer = session.createConsumer(destination);
+            _consumer = session.createConsumer(_destination);
 
             //give the message listener a name of it's own
             _consumer.setMessageListener(new ExampleMessageListener("MessageListener " + System.currentTimeMillis()));
@@ -161,15 +157,6 @@ public class Subscriber
     }
 
     /**
-     * Set destination (queue or topic) name
-     * @param name
-     */
-    public void setDestinationName(String name)
-    {
-        _destinationName = name;
-    }
-
-    /**
      * Stop consuming and close connection
      */
     public void stop()