Undoing commits of stuff that was meant for my 1-0 sandbox

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

2 files changed, 20 insertions, 31 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 8755724cfc..6db1560fb7 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -100,14 +100,14 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
 
         return bind(queueName, queueName, getHeadersMap(bindings));
     }
-
+    
     protected void unbind(TestQueue queue, String... bindings) throws AMQException
     {
         String queueName = queue.getName();
         //TODO - check this
         exchange.onUnbind(new Binding(null,queueName, queue, exchange, getHeadersMap(bindings)));
     }
-
+    
     protected int getCount()
     {
         return count;
@@ -120,7 +120,7 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
         exchange.onBind(new Binding(null,key, queue, exchange, args));
         return queue;
     }
-
+    
 
     protected int route(Message m) throws AMQException
     {
@@ -175,14 +175,14 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
             }
 
     }
-
+    
     static Map<String,Object> getHeadersMap(String... entries)
     {
         if(entries == null)
         {
             return null;
         }
-
+        
         Map<String,Object> headers = new HashMap<String,Object>();
 
         for (String s : entries)
@@ -276,7 +276,7 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
     static ContentHeaderBody getContentHeader(FieldTable headers)
     {
         ContentHeaderBody header = new ContentHeaderBody();
-        header.properties = getProperties(headers);
+        header.setProperties(getProperties(headers));
         return header;
     }
 
@@ -428,21 +428,11 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
                     //To change body of implemented methods use File | Settings | File Templates.
                 }
 
-                public void reject(Subscription subscription)
-                {
-                    //To change body of implemented methods use File | Settings | File Templates.
-                }
-
-                public boolean isRejectedBy(Subscription subscription)
+                public boolean isRejectedBy(long subscriptionId)
                 {
                     return false;  //To change body of implemented methods use File | Settings | File Templates.
                 }
 
-                public void requeue(Subscription subscription)
-                {
-                    //To change body of implemented methods use File | Settings | File Templates.
-                }
-
                 public void dequeue()
                 {
                     //To change body of implemented methods use File | Settings | File Templates.
@@ -482,6 +472,16 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
                 {
                     return 0;  //To change body of implemented methods use File | Settings | File Templates.
                 }
+
+                public boolean isDequeued()
+                {
+                    return false;
+                }
+
+                public boolean isDispensed()
+                {
+                    return false;
+                }
             };
 
             if(action != null)
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
index 790511017a..422105e410 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
@@ -31,10 +31,10 @@ import org.apache.qpid.server.message.ServerMessage;
 /**
  * Mock Server Message allowing its persistent flag to be controlled from test.
  */
-class MockServerMessage implements ServerMessage<MockServerMessage>
+class MockServerMessage implements ServerMessage
 {
     /**
-     *
+     * 
      */
     private final boolean persistent;
 
@@ -46,67 +46,56 @@ class MockServerMessage implements ServerMessage<MockServerMessage>
         this.persistent = persistent;
     }
 
-
     public boolean isPersistent()
     {
         return persistent;
     }
 
-
-    public MessageReference<MockServerMessage> newReference()
+    public MessageReference newReference()
     {
         throw new NotImplementedException();
     }
 
-
     public boolean isImmediate()
     {
         throw new NotImplementedException();
     }
 
-
     public long getSize()
     {
         throw new NotImplementedException();
     }
 
-
     public SessionConfig getSessionConfig()
     {
         throw new NotImplementedException();
     }
 
-
     public String getRoutingKey()
     {
         throw new NotImplementedException();
     }
 
-
     public AMQMessageHeader getMessageHeader()
     {
         throw new NotImplementedException();
     }
 
-
     public long getExpiration()
     {
         throw new NotImplementedException();
     }
 
-
     public int getContent(ByteBuffer buf, int offset)
     {
         throw new NotImplementedException();
     }
 
-
     public long getArrivalTime()
     {
         throw new NotImplementedException();
     }
 
-
     public Long getMessageNumber()
     {
         return 0L;