svn commit: r479441 - in /incubator/qpid/branches/new_persistence/java: broker/src/main/java/org/apache/qpid/server/queue/ systests/src/test/java/org/apache/qpid/server/queue/ systests/src/test/java/org/apache/qpid/server/store/

[rgreig]

Author: rgreig
Date: Sun Nov 26 14:54:33 2006
New Revision: 479441

URL: http://svn.apache.org/viewvc?view=rev&rev=479441
Log:
Work in progress.

Modified:
    
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
    
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
    
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java

Modified: 
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java?view=diff&rev=479441&r1=479440&r2=479441
==============================================================================
--- 
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
 (original)
+++ 
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
 Sun Nov 26 14:54:33 2006
@@ -167,6 +167,21 @@
         }
     }
 
+    /**
+     * Used in testing only. This allows the passing of the content header 
immediately
+     * on construction.
+     * @param messageId
+     * @param publishBody
+     * @param txnContext
+     * @param contentHeader
+     */
+    public AMQMessage(long messageId, BasicPublishBody publishBody, 
TransactionalContext txnContext,
+                      ContentHeaderBody contentHeader) throws AMQException
+    {
+        this(messageId, publishBody, txnContext);
+        setContentHeaderBody(contentHeader);
+    }
+
     protected AMQMessage(AMQMessage msg) throws AMQException
     {
         _publisher = msg._publisher;

Modified: 
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java?view=diff&rev=479441&r1=479440&r2=479441
==============================================================================
--- 
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
 (original)
+++ 
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
 Sun Nov 26 14:54:33 2006
@@ -26,14 +26,22 @@
 import org.apache.qpid.server.store.SkeletonMessageStore;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.util.TestApplicationRegistry;
+import org.apache.qpid.server.txn.TransactionalContext;
+import org.apache.qpid.server.txn.NonTransactionalContext;
+import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.AMQException;
 
 import junit.framework.TestCase;
 
+import java.util.LinkedList;
+
 class MessageTestHelper extends TestCase
 {
     private final MessageStore _messageStore = new SkeletonMessageStore();
 
+    private final TransactionalContext _txnContext = new 
NonTransactionalContext(_messageStore, null,
+                                                                               
  new LinkedList<RequiredDeliveryException>());
+
     MessageTestHelper() throws Exception
     {
         ApplicationRegistry.initialise(new TestApplicationRegistry());
@@ -48,7 +56,8 @@
     {
         BasicPublishBody publish = new BasicPublishBody();
         publish.immediate = immediate;
-        return new AMQMessage(_messageStore, publish, new ContentHeaderBody(), 
null);
+        return new AMQMessage(_messageStore.getNewMessageId(), publish, 
_txnContext,
+                              new ContentHeaderBody());        
     }
 
 }

Modified: 
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java?view=diff&rev=479441&r1=479440&r2=479441
==============================================================================
--- 
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
 (original)
+++ 
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
 Sun Nov 26 14:54:33 2006
@@ -20,11 +20,12 @@
  */
 package org.apache.qpid.server.store;
 
-import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.commons.configuration.Configuration;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.MessageMetaData;
 import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.AMQException;
-import org.apache.commons.configuration.Configuration;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
@@ -47,11 +48,7 @@
 
     public void close() throws Exception
     {
-    }
-
-    public void put(AMQMessage msg)
-    {
-    }
+    }    
 
     public void removeMessage(long messageId)
     {
@@ -98,5 +95,25 @@
     public long getNewMessageId()
     {
         return _messageId.getAndIncrement();
+    }
+
+    public void storeContentBodyChunk(long messageId, int index, ContentBody 
contentBody) throws AMQException
+    {
+
+    }
+
+    public void storeMessageMetaData(long messageId, MessageMetaData 
messageMetaData) throws AMQException
+    {
+
+    }
+
+    public MessageMetaData getMessageMetaData(long messageId) throws 
AMQException
+    {
+        return null;
+    }
+
+    public ContentBody getContentBodyChunk(long messageId, int index) throws 
AMQException
+    {
+        return null;
     }
 }