2006-12-01 Jim Meyering <meyering@redhat.com>

This delta imposes two major changes on the C++ hierarchy:
  - adds autoconf, automake, libtool support
  - makes the hierarchy flatter and renames a few files (e.g., Queue.h,
  Queue.cpp) that appeared twice, once under client/ and again under broker/.

In the process, I've changed many #include directives, mostly
to remove a qpid/ or qpid/framing/ prefix from the file name argument.
Although most changes were to .cpp and .h files under qpid/cpp/, there
were also several to template files under qpid/gentools, and even one
to CppGenerator.java.

Nearly all files are moved to a new position in the hierarchy.
The new hierarchy looks like this:

  src               # this is the new home of qpidd.cpp
  tests             # all tests are here.  See Makefile.am.
  gen               # As before, all generated files go here.
  lib               # This is just a container for the 3 lib dirs:
  lib/client
  lib/broker
  lib/common
  lib/common/framing
  lib/common/sys
  lib/common/sys/posix
  lib/common/sys/apr
  build-aux
  m4


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

1 files changed, 0 insertions, 113 deletions

diff --git a/cpp/test/unit/qpid/broker/TxAckTest.cpp b/cpp/test/unit/qpid/broker/TxAckTest.cpp
deleted file mode 100644
index 47693a7133..0000000000
--- a/cpp/test/unit/qpid/broker/TxAckTest.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-#include <qpid/broker/NullMessageStore.h>
-#include <qpid/broker/RecoveryManager.h>
-#include <qpid/broker/TxAck.h>
-#include <qpid_test_plugin.h>
-#include <iostream>
-#include <list>
-#include <vector>
-
-using std::list;
-using std::vector;
-using namespace qpid::broker;
-using namespace qpid::framing;
-
-class TxAckTest : public CppUnit::TestCase  
-{
-
-    class TestMessageStore : public NullMessageStore
-    {
-    public:
-        vector<Message::shared_ptr> dequeued;
-
-        void dequeue(TransactionContext*, Message::shared_ptr& msg, const Queue& /*queue*/, const string * const /*xid*/)
-        {
-            dequeued.push_back(msg);
-        }
-
-        TestMessageStore() : NullMessageStore(false) {}
-        ~TestMessageStore(){}
-    };
-
-    CPPUNIT_TEST_SUITE(TxAckTest);
-    CPPUNIT_TEST(testPrepare);
-    CPPUNIT_TEST(testCommit);
-    CPPUNIT_TEST_SUITE_END();
-
-
-    AccumulatedAck acked;
-    TestMessageStore store;
-    Queue::shared_ptr queue;
-    vector<Message::shared_ptr> messages;
-    list<DeliveryRecord> deliveries;
-    TxAck op;
-
-
-public:
-
-    TxAckTest() : queue(new Queue("my_queue", false, &store, 0)), op(acked, deliveries)
-    {
-        for(int i = 0; i < 10; i++){
-            Message::shared_ptr msg(new Message(0, "exchange", "routing_key", false, false));
-            msg->setHeader(AMQHeaderBody::shared_ptr(new AMQHeaderBody(BASIC)));
-            msg->getHeaderProperties()->setDeliveryMode(PERSISTENT);
-            messages.push_back(msg);
-            deliveries.push_back(DeliveryRecord(msg, queue, "xyz", (i+1)));
-        }
-
-        //assume msgs 1-5, 7 and 9 are all acked (i.e. 6, 8 & 10 are not)
-        acked.range = 5;
-        acked.individual.push_back(7);
-        acked.individual.push_back(9);
-    }      
-
-    void testPrepare()
-    {
-        //ensure acked messages are discarded, i.e. dequeued from store
-        op.prepare(0);
-        CPPUNIT_ASSERT_EQUAL((size_t) 7, store.dequeued.size());
-        CPPUNIT_ASSERT_EQUAL((size_t) 10, deliveries.size());
-        CPPUNIT_ASSERT_EQUAL(messages[0], store.dequeued[0]);//msg 1
-        CPPUNIT_ASSERT_EQUAL(messages[1], store.dequeued[1]);//msg 2
-        CPPUNIT_ASSERT_EQUAL(messages[2], store.dequeued[2]);//msg 3
-        CPPUNIT_ASSERT_EQUAL(messages[3], store.dequeued[3]);//msg 4
-        CPPUNIT_ASSERT_EQUAL(messages[4], store.dequeued[4]);//msg 5
-        CPPUNIT_ASSERT_EQUAL(messages[6], store.dequeued[5]);//msg 7
-        CPPUNIT_ASSERT_EQUAL(messages[8], store.dequeued[6]);//msg 9
-    }
-
-    void testCommit()
-    {
-        //emsure acked messages are removed from list
-        op.commit();
-        CPPUNIT_ASSERT_EQUAL((size_t) 3, deliveries.size());
-        list<DeliveryRecord>::iterator i = deliveries.begin();
-        CPPUNIT_ASSERT(i->matches(6));//msg 6
-        CPPUNIT_ASSERT((++i)->matches(8));//msg 8
-        CPPUNIT_ASSERT((++i)->matches(10));//msg 10
-    }
-};
-
-// Make this test suite a plugin.
-CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(TxAckTest);
-