Author: rgodfrey
Date: Wed Apr 16 04:26:39 2008
New Revision: 648669
URL: http://svn.apache.org/viewvc?rev=648669&view=rev
Log:
QPID-932 : Remove references to unusued constructor argument "browsedAcks" of
NonTransactionalContext
Modified:
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
Modified:
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java?rev=648669&r1=648668&r2=648669&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
(original)
+++
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
Wed Apr 16 04:26:39 2008
@@ -38,8 +38,6 @@
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import java.util.HashSet;
-import java.util.List;
import java.util.LinkedList;
public class DestWildExchangeTest extends TestCase
@@ -565,8 +563,8 @@
MessagePublishInfo info = new PublishInfo(new AMQShortString(s));
TransactionalContext trancontext = new NonTransactionalContext(_store,
_context, null,
- new
LinkedList<RequiredDeliveryException>(),
- new
HashSet<Long>());
+ new
LinkedList<RequiredDeliveryException>()
+ );
AMQMessage message = new AMQMessage(0L, info, trancontext);
message.setContentHeaderBody(new ContentHeaderBody());
Modified:
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java?rev=648669&r1=648668&r2=648669&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
(original)
+++
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
Wed Apr 16 04:26:39 2008
@@ -40,7 +40,6 @@
import javax.management.Notification;
import java.util.LinkedList;
-import java.util.HashSet;
/** This class tests all the alerts an AMQQueue can throw based on threshold
values of different parameters */
public class AMQQueueAlertTest extends TestCase
@@ -57,8 +56,8 @@
private StoreContext _storeContext = new StoreContext();
private TransactionalContext _transactionalContext = new
NonTransactionalContext(_messageStore, _storeContext,
null,
-
new LinkedList<RequiredDeliveryException>(),
-
new HashSet<Long>());
+
new LinkedList<RequiredDeliveryException>()
+ );
/**
* Tests if the alert gets thrown when message count increases the
threshold limit
Modified:
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java?rev=648669&r1=648668&r2=648669&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
(original)
+++
incubator/qpid/branches/M2.1/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
Wed Apr 16 04:26:39 2008
@@ -44,7 +44,6 @@
import javax.management.JMException;
import java.util.LinkedList;
-import java.util.HashSet;
/**
* Test class to test AMQQueueMBean attribtues and operations
@@ -272,8 +271,8 @@
_transactionalContext = new NonTransactionalContext(_messageStore,
_storeContext,
null,
- new
LinkedList<RequiredDeliveryException>(),
- new
HashSet<Long>());
+ new
LinkedList<RequiredDeliveryException>()
+ );
_queue = new AMQQueue(new AMQShortString("testQueue"), false, new
AMQShortString("AMQueueMBeanTest"), false, _virtualHost);
_queueMBean = new AMQQueueMBean(_queue);
Modified:
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java?rev=648669&r1=648668&r2=648669&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
(original)
+++
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
Wed Apr 16 04:26:39 2008
@@ -22,10 +22,8 @@
import junit.framework.TestCase;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicPublishBody;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.AMQFrameDecodingException;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.server.RequiredDeliveryException;
import org.apache.qpid.server.queue.AMQMessage;
@@ -103,8 +101,8 @@
{
TransactionalContext txnContext = new NonTransactionalContext(new
TestableMemoryMessageStore(),
_storeContext, null,
- new
LinkedList<RequiredDeliveryException>(),
- new
HashSet<Long>());
+ new
LinkedList<RequiredDeliveryException>()
+ );
for (int i = 0; i < messageCount; i++)
{
long deliveryTag = i + 1;
Modified:
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?rev=648669&r1=648668&r2=648669&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
(original)
+++
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
Wed Apr 16 04:26:39 2008
@@ -268,8 +268,8 @@
private static TransactionalContext _txnContext = new
NonTransactionalContext(_messageStore, _storeContext,
null,
- new
LinkedList<RequiredDeliveryException>(),
- new
HashSet<Long>());
+ new
LinkedList<RequiredDeliveryException>()
+ );
Message(String id, String... headers) throws AMQException
{
Modified:
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java?rev=648669&r1=648668&r2=648669&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
(original)
+++
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
Wed Apr 16 04:26:39 2008
@@ -40,7 +40,6 @@
import java.util.LinkedList;
import java.util.Set;
-import java.util.HashSet;
/**
* Tests that acknowledgements are handled correctly.
@@ -90,8 +89,8 @@
private void publishMessages(int count, boolean persistent) throws
AMQException
{
TransactionalContext txnContext = new
NonTransactionalContext(_messageStore, _storeContext, null,
- new
LinkedList<RequiredDeliveryException>(),
- new
HashSet<Long>());
+ new
LinkedList<RequiredDeliveryException>()
+ );
MessageHandleFactory factory = new MessageHandleFactory();
for (int i = 1; i <= count; i++)
{
Modified:
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java?rev=648669&r1=648668&r2=648669&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
(original)
+++
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
Wed Apr 16 04:26:39 2008
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.queue;
-import org.apache.qpid.framing.BasicPublishBody;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
@@ -28,7 +27,6 @@
import org.apache.qpid.server.store.SkeletonMessageStore;
import org.apache.qpid.server.store.StoreContext;
import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.util.TestApplicationRegistry;
import org.apache.qpid.server.util.NullApplicationRegistry;
import org.apache.qpid.server.txn.TransactionalContext;
import org.apache.qpid.server.txn.NonTransactionalContext;
@@ -38,7 +36,6 @@
import junit.framework.TestCase;
import java.util.LinkedList;
-import java.util.HashSet;
class MessageTestHelper extends TestCase
{
@@ -47,8 +44,8 @@
private final StoreContext _storeContext = new StoreContext();
private final TransactionalContext _txnContext = new
NonTransactionalContext(_messageStore, _storeContext, null,
-
new LinkedList<RequiredDeliveryException>(),
-
new HashSet<Long>());
+
new LinkedList<RequiredDeliveryException>()
+ );
MessageTestHelper() throws Exception
{
Modified:
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java?rev=648669&r1=648668&r2=648669&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
(original)
+++
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
Wed Apr 16 04:26:39 2008
@@ -23,7 +23,6 @@
import junit.framework.TestCase;
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.BasicPublishBody;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
@@ -83,7 +82,7 @@
};
AMQMessage message = new AMQMessage(_store.getNewMessageId(), info,
- new
NonTransactionalContext(_store, _storeContext, null, null, null),
+ new
NonTransactionalContext(_store, _storeContext, null, null),
createPersistentContentHeader());
message = message.takeReference();
@@ -137,7 +136,7 @@
AMQMessage message = new AMQMessage(_store.getNewMessageId(),
info,
- new
NonTransactionalContext(_store, _storeContext, null, null, null),
+ new
NonTransactionalContext(_store, _storeContext, null, null),
createPersistentContentHeader());
message = message.takeReference();
