Fixes to transaction handling.

- This line, and those below, will be ignored--

M    java/broker/test/src/org/apache/qpid/server/UnitTests.java
M    java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java
A    java/broker/test/src/org/apache/qpid/server/txn
AM   java/broker/test/src/org/apache/qpid/server/txn/UnitTests.java
AM   java/broker/test/src/org/apache/qpid/server/txn/TxnBufferTest.java
M    java/broker/test/src/org/apache/qpid/server/util/UnitTests.java
AM   java/broker/test/src/org/apache/qpid/server/util/OrderedMapHelperTest.java
M    java/broker/src/org/apache/qpid/server/queue/SubscriptionImpl.java
M    java/broker/src/org/apache/qpid/server/queue/DeliveryManager.java
AM   java/broker/src/org/apache/qpid/server/queue/FailedDequeueException.java
M    java/broker/src/org/apache/qpid/server/queue/AMQMessage.java
M    java/broker/src/org/apache/qpid/server/queue/AMQQueue.java
M    java/broker/src/org/apache/qpid/server/queue/Subscription.java
M    java/broker/src/org/apache/qpid/server/queue/NoConsumersException.java
M    java/broker/src/org/apache/qpid/server/AMQChannel.java
M    java/broker/src/org/apache/qpid/server/txn/TxnBuffer.java
M    java/broker/src/org/apache/qpid/server/txn/TxnOp.java
AM   java/broker/src/org/apache/qpid/server/util/OrderedMapHelper.java
M    java/broker/src/org/apache/qpid/server/handler/TxCommitHandler.java
AM   java/client/test/src/org/apache/qpid/transacted/UnitTests.java
M    java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java


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

2 files changed, 34 insertions, 1 deletions

diff --git a/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java b/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
index 2e5f2ddbac..0ecd715284 100644
--- a/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
+++ b/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
@@ -32,7 +32,8 @@ import org.junit.runners.Suite;
         org.apache.qpid.client.message.UnitTests.class,
         org.apache.qpid.forwardall.UnitTests.class,
         org.apache.qpid.destinationurl.UnitTests.class,
-        org.apache.qpid.jndi.referenceabletest.UnitTests.class
+        org.apache.qpid.jndi.referenceabletest.UnitTests.class,
+        org.apache.qpid.transacted.UnitTests.class
         })
 public class AllClientUnitTests
 {
diff --git a/java/client/test/src/org/apache/qpid/transacted/UnitTests.java b/java/client/test/src/org/apache/qpid/transacted/UnitTests.java
new file mode 100644
index 0000000000..8d43287d6f
--- /dev/null
+++ b/java/client/test/src/org/apache/qpid/transacted/UnitTests.java
@@ -0,0 +1,32 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.qpid.transacted;
+
+import junit.framework.JUnit4TestAdapter;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({TransactedTest.class})
+public class UnitTests
+{
+    public static junit.framework.Test suite()
+    {
+        return new JUnit4TestAdapter(UnitTests.class);
+    }
+}