Author: aidan
Date: Tue Apr 15 09:57:42 2008
New Revision: 648328
URL: http://svn.apache.org/viewvc?rev=648328&view=rev
Log:
QPID-831 Remove some broker introspection stuff and transaction bumpf
Removed:
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/messageStore/
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java?rev=648328&r1=648327&r2=648328&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
Tue Apr 15 09:57:42 2008
@@ -20,6 +20,8 @@
*/
package org.apache.qpid;
+import javax.management.JMException;
+
import org.apache.qpid.protocol.AMQConstant;
/**
@@ -38,7 +40,7 @@
{
/** Holds the AMQ error code constant associated with this exception. */
private AMQConstant _errorCode;
-
+
/**
* Creates an exception with an optional error code, optional message and
optional underlying cause.
*
@@ -52,6 +54,28 @@
_errorCode = errorCode;
}
+ /*
+ * Deprecated constructors brought from M2.1
+ */
+ @Deprecated
+ public AMQException (String msg)
+ {
+ this(null, (msg == null) ? "" : msg);
+ }
+
+ @Deprecated
+ public AMQException (AMQConstant errorCode, String msg)
+ {
+ this(errorCode, (msg == null) ? "" : msg, null);
+ }
+
+ @Deprecated
+ public AMQException(String msg, Exception cause)
+ {
+ this(null, msg, cause);
+ }
+
+
/**
* Gets the AMQ protocol exception code associated with this exception.
*
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java?rev=648328&r1=648327&r2=648328&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
Tue Apr 15 09:57:42 2008
@@ -33,8 +33,6 @@
import org.apache.qpid.server.registry.IApplicationRegistry;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.SkeletonMessageStore;
-import org.apache.qpid.server.txn.MemoryTransactionManager;
-import org.apache.qpid.server.txn.TransactionManager;
import org.apache.qpid.server.virtualhost.VirtualHost;
import javax.management.JMException;
@@ -49,7 +47,6 @@
private static final Logger log =
Logger.getLogger(AMQProtocolSessionMBeanTest.class);
private MessageStore _messageStore = new SkeletonMessageStore();
- private TransactionManager _txm = new MemoryTransactionManager();
private AMQMinaProtocolSession _protocolSession;
private AMQChannel _channel;
private AMQProtocolSessionMBean _mbean;
@@ -64,7 +61,7 @@
new
AMQShortString("test"),
true,
_protocolSession.getVirtualHost());
- AMQChannel channel = new AMQChannel(_protocolSession, 2, _txm,
_messageStore);
+ AMQChannel channel = new AMQChannel(_protocolSession, 2,
_messageStore);
channel.setDefaultQueue(queue);
_protocolSession.addChannel(channel);
@@ -76,7 +73,7 @@
assertTrue(_mbean.getMaximumNumberOfChannels() == 1000L);
// check APIs
- AMQChannel channel3 = new AMQChannel(_protocolSession, 3, _txm,
_messageStore);
+ AMQChannel channel3 = new AMQChannel(_protocolSession, 3,
_messageStore);
channel3.setLocalTransactional();
_protocolSession.addChannel(channel3);
_mbean.rollbackTransactions(2);
@@ -96,14 +93,14 @@
}
// check if closing of session works
- _protocolSession.addChannel(new AMQChannel(_protocolSession, 5, _txm,
_messageStore));
+ _protocolSession.addChannel(new AMQChannel(_protocolSession, 5,
_messageStore));
_mbean.closeConnection();
try
{
channelCount = _mbean.channels().size();
assertTrue(channelCount == 0);
// session is now closed so adding another channel should throw an
exception
- _protocolSession.addChannel(new AMQChannel(_protocolSession, 6,
_txm, _messageStore));
+ _protocolSession.addChannel(new AMQChannel(_protocolSession, 6,
_messageStore));
fail();
}
catch (AMQException ex)
@@ -122,7 +119,7 @@
new AMQMinaProtocolSession(new MockIoSession(),
appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true),
null);
_protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
- _channel = new AMQChannel(_protocolSession, 1, _txm, _messageStore);
+ _channel = new AMQChannel(_protocolSession, 1, _messageStore);
_protocolSession.addChannel(_channel);
_mbean = (AMQProtocolSessionMBean) _protocolSession.getManagedObject();
}
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java?rev=648328&r1=648327&r2=648328&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
Tue Apr 15 09:57:42 2008
@@ -57,7 +57,7 @@
{
for (long currentChannel = 0L; currentChannel < maxChannels;
currentChannel++)
{
- _protocolSession.addChannel(new AMQChannel(_protocolSession,
(int) currentChannel, null, null));
+ _protocolSession.addChannel(new AMQChannel(_protocolSession,
(int) currentChannel, null));
}
}
catch (AMQException e)
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java?rev=648328&r1=648327&r2=648328&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
Tue Apr 15 09:57:42 2008
@@ -34,7 +34,6 @@
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.store.StoreContext;
import org.apache.qpid.server.store.TestableMemoryMessageStore;
-import org.apache.qpid.server.txn.MemoryTransactionManager;
import org.apache.qpid.server.txn.NonTransactionalContext;
import org.apache.qpid.server.txn.TransactionalContext;
import org.apache.qpid.server.util.NullApplicationRegistry;
@@ -56,8 +55,6 @@
private TestableMemoryMessageStore _messageStore;
- private MemoryTransactionManager _txm;
-
private StoreContext _storeContext = new StoreContext();
private AMQChannel _channel;
@@ -77,9 +74,8 @@
{
super.setUp();
_messageStore = new TestableMemoryMessageStore();
- _txm = new MemoryTransactionManager();
_protocolSession = new MockProtocolSession(_messageStore);
- _channel = new AMQChannel(_protocolSession, 5, _txm, _messageStore);
+ _channel = new AMQChannel(_protocolSession, 5, _messageStore);
_protocolSession.addChannel(_channel);
_subscriptionManager = new SubscriptionSet();
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java?rev=648328&r1=648327&r2=648328&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
Tue Apr 15 09:57:42 2008
@@ -88,7 +88,12 @@
{
return null;
}
-
+
+ public void start()
+ {
+ //no-op
+ }
+
public void queueDeleted(AMQQueue queue)
{
}
@@ -157,4 +162,5 @@
{
return key.toString();
}
+
}
