revert introduction of exchange declaration

there is no particular need for it

Author: rade

test/src/com/rabbitmq/examples/ConsumerMain.java

@@ -117,13 +117,8 @@ private void runIt() throws IOException {
         String queueName = "test queue";
         channel.queueDeclare(queueName, true, false, false, null);
 
-        String testExchangeName = "test exchange";
-        channel.exchangeDeclare(testExchangeName, "fanout");
-
-        channel.queueBind(queueName, testExchangeName, "");
-
         String exchangeName = "test completion";
-        channel.exchangeDeclare(exchangeName, "fanout");
+        channel.exchangeDeclare(exchangeName, "fanout", false, false, null);
 
         String completionQueue = channel.queueDeclare().getQueue();
         channel.queueBind(completionQueue, exchangeName, "");
@@ -140,9 +135,6 @@ private void runIt() throws IOException {
 
         System.out.println("Deleting completion queue.");
         channel.queueDelete(completionQueue);
-        
-        System.out.println("Deleting test exchange.");
-        channel.exchangeDelete(testExchangeName);
 
         System.out.println("Closing the channel.");
         channel.close();

test/src/com/rabbitmq/examples/ProducerMain.java

@@ -151,19 +151,15 @@ private void runIt() throws IOException {
         _channel = _connection.createChannel();
 
         String queueName = "test queue";
-        String exchangeName = "test exchange";
-        
         _channel.queueDeclare(queueName, true, false, false, null);
-        _channel.exchangeDeclare(exchangeName, "fanout");
-        _channel.queueBind(queueName, exchangeName, "");
 
         if (shouldCommit()) {
             _channel.txSelect();
         }
-        sendBatch(exchangeName, queueName);
+        sendBatch(queueName);
 
         if (_sendCompletion) {
-            exchangeName = "test completion";
+            String exchangeName = "test completion";
             _channel.exchangeDeclarePassive(exchangeName);
             _channel.basicPublish(exchangeName, "", MessageProperties.BASIC, new byte[0]);
             if (shouldCommit())
@@ -186,7 +182,7 @@ public void primeServer(String queueName) throws IOException {
         System.out.println("...starting.");
     }
 
-    public void sendBatch(String exchangeName, String queueName) throws IOException {
+    public void sendBatch(String queueName) throws IOException {
         //primeServer(queueName);
 
         long startTime = System.currentTimeMillis();
@@ -213,8 +209,7 @@ public void sendBatch(String exchangeName, String queueName) throws IOException
             acc.flush();
             byte[] message0 = acc.toByteArray();
             System.arraycopy(message0, 0, message, 0, message0.length);
-            _channel.basicPublish(exchangeName, queueName, props,
-                    message);
+            _channel.basicPublish("", queueName, props, message);
             sent++;
             if (shouldCommit()) {
                 if ((sent % _commitEvery) == 0) {