1 files changed, 49 insertions, 59 deletions

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
index 7942ce5ca3..21f9c43cd2 100755
--- a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
@@ -1,115 +1,105 @@
 package org.apache.qpid.example.amqpexample.fanout;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
 
-import java.nio.ByteBuffer;
 
-import org.apache.qpid.api.Message;
-import org.apache.qpid.nclient.Client;
-import org.apache.qpid.nclient.Connection;
-import org.apache.qpid.nclient.Session;
-import org.apache.qpid.nclient.util.MessageListener;
-import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import java.nio.ByteBuffer;
 
+import org.apache.qpid.transport.Connection;
 import org.apache.qpid.transport.MessageAcceptMode;
 import org.apache.qpid.transport.MessageAcquireMode;
 import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageTransfer;
+import org.apache.qpid.transport.Session;
+import org.apache.qpid.transport.SessionException;
+import org.apache.qpid.transport.SessionListener;
 
 /**
  * This listens to messages on a queue and terminates
  * when it sees the final message
  *
  */
-public class Listener implements MessageListener
+public class Listener implements SessionListener
 {
-    boolean finish = false;
 
-    public void onMessage(Message m)
+    public void opened(Session ssn) {}
+
+    public void resumed(Session ssn) {}
+
+    public void message(Session ssn, MessageTransfer xfr)
     {
-        String data = null;
-
-        try
-        {
-            ByteBuffer buf = m.readData();
-            byte[] b = new byte[buf.remaining()];
-            buf.get(b);
-            data = new String(b);
-        }
-        catch(Exception e)
-        {
-            System.out.print("Error reading message");
-            e.printStackTrace();
-        }
-
-        System.out.println("Message: " + data);
-
-        if (data != null && data.equals("That's all, folks!"))
-        {
-            finish = true;
-        }
+        System.out.println("Message: " + xfr);
     }
 
-    public boolean isFinished()
+    public void exception(Session ssn, SessionException exc)
     {
-        return finish;
+        exc.printStackTrace();
     }
 
+    public void closed(Session ssn) {}
+
     /**
      *  This sends 10 messages to the
      *  amq.direct exchange using the
      *  routing key as "routing_key"
      *
      */
-    public static void main(String[] args)
+    public static void main(String[] args) throws InterruptedException
     {
         // Create connection
-        Connection con = Client.createConnection();
-        try
-        {
-            con.connect("localhost", 5672, "test", "guest", "guest");
-        }
-        catch(Exception e)
-        {
-            System.out.print("Error connecting to broker");
-            e.printStackTrace();
-        }
+        Connection con = new Connection();
+        con.connect("localhost", 5672, "test", "guest", "guest",false);
 
         // Create session
         Session session = con.createSession(0);
 
         // Create an instance of the listener
         Listener listener = new Listener();
+        session.setSessionListener(listener);
 
         // create a subscription
         session.messageSubscribe("message_queue",
                                  "listener_destination",
-                                 Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
-                                 Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
-                                 new MessagePartListenerAdapter(listener), null);
+                                 MessageAcceptMode.NONE,
+                                 MessageAcquireMode.PRE_ACQUIRED,
+                                 null, 0, null);
 
 
         // issue credits
         // XXX
-        session.messageFlow("listener_destination", MessageCreditUnit.BYTE, Session.MESSAGE_FLOW_MAX_BYTES);
+        session.messageFlow("listener_destination", MessageCreditUnit.BYTE, Session.UNLIMITED_CREDIT);
         session.messageFlow("listener_destination", MessageCreditUnit.MESSAGE, 11);
 
         // confirm completion
         session.sync();
 
         // check to see if we have received all the messages
-        while (!listener.isFinished()){}
+        System.out.println("Waiting 100 seconds for messages from listener_destination");
+        Thread.sleep(100*1000);
         System.out.println("Shutting down listener for listener_destination");
         session.messageCancel("listener_destination");
 
         //cleanup
-        session.sessionDetach(session.getName());
-        try
-        {
-            con.close();
-        }
-        catch(Exception e)
-        {
-            System.out.print("Error closing broker connection");
-            e.printStackTrace();
-        }
+        session.close();
+        con.close();
     }
 
 }