Author: chug
Date: Fri Dec 21 16:33:56 2012
New Revision: 1425009
URL: http://svn.apache.org/viewvc?rev=1425009&view=rev
Log:
QPID-1726 ASF licensed, Qpid hosted store module
Change included file references in #include to specify the full path
name relative to qpid/cpp/src.
Modified:
qpid/trunk/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/StoreException.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp Fri Dec 21 16:33:56
2012
@@ -19,7 +19,7 @@
*
*/
-#include "BindingDbt.h"
+#include "qpid/legacystore/BindingDbt.h"
namespace mrg {
namespace msgstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/BufferValue.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/BufferValue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/BufferValue.cpp Fri Dec 21
16:33:56 2012
@@ -19,7 +19,7 @@
*
*/
-#include "BufferValue.h"
+#include "qpid/legacystore/BufferValue.h"
namespace mrg {
namespace msgstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp Fri Dec 21
16:33:56 2012
@@ -19,7 +19,7 @@
*
*/
-#include "DataTokenImpl.h"
+#include "qpid/legacystore/DataTokenImpl.h"
using namespace mrg::msgstore;
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h Fri Dec 21
16:33:56 2012
@@ -22,7 +22,7 @@
#ifndef QPID_LEGACYSTORE_DATATOKENIMPL_H
#define QPID_LEGACYSTORE_DATATOKENIMPL_H
-#include "jrnl/data_tok.h"
+#include "qpid/legacystore/jrnl/data_tok.h"
#include "qpid/broker/PersistableMessage.h"
#include <boost/intrusive_ptr.hpp>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/IdDbt.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/IdDbt.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/IdDbt.cpp Fri Dec 21 16:33:56 2012
@@ -19,7 +19,7 @@
*
*/
-#include "IdDbt.h"
+#include "qpid/legacystore/IdDbt.h"
using namespace mrg::msgstore;
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/IdSequence.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/IdSequence.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/IdSequence.cpp Fri Dec 21 16:33:56
2012
@@ -19,7 +19,7 @@
*
*/
-#include "IdSequence.h"
+#include "qpid/legacystore/IdSequence.h"
using namespace mrg::msgstore;
using qpid::sys::Mutex;
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp Fri Dec 21
16:33:56 2012
@@ -19,10 +19,10 @@
*
*/
-#include "JournalImpl.h"
+#include "qpid/legacystore/JournalImpl.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include "qpid/log/Statement.h"
#include "qpid/management/ManagementAgent.h"
#include "qmf/org/apache/qpid/legacystore/ArgsJournalExpand.h"
@@ -32,7 +32,7 @@
#include "qmf/org/apache/qpid/legacystore/EventRecovered.h"
#include "qpid/sys/Monitor.h"
#include "qpid/sys/Timer.h"
-#include "StoreException.h"
+#include "qpid/legacystore/StoreException.h"
using namespace mrg::msgstore;
using namespace mrg::journal;
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/JournalImpl.h Fri Dec 21 16:33:56
2012
@@ -23,10 +23,10 @@
#define QPID_LEGACYSTORE_JOURNALIMPL_H
#include <set>
-#include "jrnl/enums.h"
-#include "jrnl/jcntl.h"
-#include "DataTokenImpl.h"
-#include "PreparedTransaction.h"
+#include "qpid/legacystore/jrnl/enums.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/DataTokenImpl.h"
+#include "qpid/legacystore/PreparedTransaction.h"
#include "qpid/broker/PersistableQueue.h"
#include "qpid/sys/Timer.h"
#include "qpid/sys/Time.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp Fri Dec 21
16:33:56 2012
@@ -19,16 +19,16 @@
*
*/
-#include "MessageStoreImpl.h"
+#include "qpid/legacystore/MessageStoreImpl.h"
-#include "BindingDbt.h"
-#include "BufferValue.h"
-#include "IdDbt.h"
-#include "jrnl/txn_map.h"
+#include "qpid/legacystore/BindingDbt.h"
+#include "qpid/legacystore/BufferValue.h"
+#include "qpid/legacystore/IdDbt.h"
+#include "qpid/legacystore/jrnl/txn_map.h"
#include "qpid/framing/FieldValue.h"
#include "qpid/log/Statement.h"
#include "qmf/org/apache/qpid/legacystore/Package.h"
-#include "StoreException.h"
+#include "qpid/legacystore/StoreException.h"
#include <dirent.h>
#include <db.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h Fri Dec 21
16:33:56 2012
@@ -25,17 +25,17 @@
#include <string>
#include "db-inc.h"
-#include "Cursor.h"
-#include "IdDbt.h"
-#include "IdSequence.h"
-#include "JournalImpl.h"
-#include "jrnl/jcfg.h"
-#include "PreparedTransaction.h"
+#include "qpid/legacystore/Cursor.h"
+#include "qpid/legacystore/IdDbt.h"
+#include "qpid/legacystore/IdSequence.h"
+#include "qpid/legacystore/JournalImpl.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
+#include "qpid/legacystore/PreparedTransaction.h"
#include "qpid/broker/Broker.h"
#include "qpid/broker/MessageStore.h"
#include "qpid/management/Manageable.h"
#include "qmf/org/apache/qpid/legacystore/Store.h"
-#include "TxnCtxt.h"
+#include "qpid/legacystore/TxnCtxt.h"
// Assume DB_VERSION_MAJOR == 4
#if (DB_VERSION_MINOR == 2)
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp Fri Dec 21
16:33:56 2012
@@ -19,7 +19,7 @@
*
*/
-#include "PreparedTransaction.h"
+#include "qpid/legacystore/PreparedTransaction.h"
#include <algorithm>
using namespace mrg::msgstore;
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/StoreException.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/StoreException.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/StoreException.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/StoreException.h Fri Dec 21
16:33:56 2012
@@ -22,7 +22,7 @@
#ifndef QPID_LEGACYSTORE_STOREEXCEPTION_H
#define QPID_LEGACYSTORE_STOREEXCEPTION_H
-#include "IdDbt.h"
+#include "qpid/legacystore/IdDbt.h"
#include <boost/format.hpp>
namespace mrg{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp Fri Dec 21
16:33:56 2012
@@ -24,7 +24,7 @@
#include "qpid/Options.h"
#include "qpid/DataDir.h"
#include "qpid/log/Statement.h"
-#include "MessageStoreImpl.h"
+#include "qpid/legacystore/MessageStoreImpl.h"
using mrg::msgstore::MessageStoreImpl;
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp Fri Dec 21 16:33:56
2012
@@ -19,12 +19,12 @@
*
*/
-#include "TxnCtxt.h"
+#include "qpid/legacystore/TxnCtxt.h"
#include <sstream>
-#include "jrnl/jexception.h"
-#include "StoreException.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/StoreException.h"
namespace mrg {
namespace msgstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/TxnCtxt.h Fri Dec 21 16:33:56 2012
@@ -22,14 +22,14 @@
#ifndef QPID_LEGACYSTORE_TXNCTXT_H
#define QPID_LEGACYSTORE_TXNCTXT_H
-#include <db-inc.h>
+#include "db-inc.h"
#include <memory>
#include <set>
#include <string>
-#include "DataTokenImpl.h"
-#include "IdSequence.h"
-#include "JournalImpl.h"
+#include "qpid/legacystore/DataTokenImpl.h"
+#include "qpid/legacystore/IdSequence.h"
+#include "qpid/legacystore/JournalImpl.h"
#include "qpid/broker/PersistableQueue.h"
#include "qpid/broker/TransactionalStore.h"
#include "qpid/sys/Mutex.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp Fri Dec 21 16:33:56
2012
@@ -30,7 +30,7 @@
* \author Kim van der Riet
*/
-#include "aio.h"
+#include "qpid/legacystore/jrnl/aio.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp Fri Dec 21 16:33:56
2012
@@ -30,4 +30,4 @@
* \author Kim van der Riet
*/
-#include "jrnl/cvar.h"
+#include "qpid/legacystore/jrnl/cvar.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h Fri Dec 21 16:33:56
2012
@@ -33,10 +33,10 @@
#define QPID_LEGACYSTORE_JRNL_CVAR_H
#include <cstring>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
-#include "jrnl/smutex.h"
-#include "jrnl/time_ns.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/time_ns.h"
#include <pthread.h>
#include <sstream>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp Fri Dec 21
16:33:56 2012
@@ -30,12 +30,12 @@
* \author Kim van der Riet
*/
-#include "jrnl/data_tok.h"
+#include "qpid/legacystore/jrnl/data_tok.h"
#include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
-#include "jrnl/slock.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/slock.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h Fri Dec 21
16:33:56 2012
@@ -43,7 +43,7 @@ class data_tok;
#include <cassert>
#include <cstddef>
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/smutex.h"
#include <pthread.h>
#include <string>
#include <sys/types.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h Fri Dec 21 16:33:56
2012
@@ -34,7 +34,7 @@
#define QPID_LEGACYSTORE_JRNL_DEQ_HDR_H
#include <cstddef>
-#include "jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp Fri Dec 21
16:33:56 2012
@@ -37,8 +37,8 @@
#include <cstdlib>
#include <cstring>
#include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h Fri Dec 21 16:33:56
2012
@@ -42,8 +42,8 @@ class deq_rec;
}
#include <cstddef>
-#include "jrnl/deq_hdr.h"
-#include "jrnl/jrec.h"
+#include "qpid/legacystore/jrnl/deq_hdr.h"
+#include "qpid/legacystore/jrnl/jrec.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h Fri Dec 21 16:33:56
2012
@@ -34,7 +34,7 @@
#define QPID_LEGACYSTORE_JRNL_ENQ_HDR_H
#include <cstddef>
-#include "jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp Fri Dec 21
16:33:56 2012
@@ -30,11 +30,11 @@
* \author Kim van der Riet
*/
-#include "jrnl/enq_map.h"
+#include "qpid/legacystore/jrnl/enq_map.h"
#include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/slock.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/slock.h"
#include <sstream>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h Fri Dec 21 16:33:56
2012
@@ -41,8 +41,8 @@ class enq_map;
}
}
-#include "jrnl/jexception.h"
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/smutex.h"
#include <map>
#include <pthread.h>
#include <vector>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp Fri Dec 21
16:33:56 2012
@@ -30,15 +30,15 @@
* \author Kim van der Riet
*/
-#include "jrnl/enq_rec.h"
+#include "qpid/legacystore/jrnl/enq_rec.h"
#include <cassert>
#include <cerrno>
#include <cstdlib>
#include <cstring>
#include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h Fri Dec 21 16:33:56
2012
@@ -40,8 +40,8 @@ class enq_rec;
}
#include <cstddef>
-#include "jrnl/enq_hdr.h"
-#include "jrnl/jrec.h"
+#include "qpid/legacystore/jrnl/enq_hdr.h"
+#include "qpid/legacystore/jrnl/jrec.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp Fri Dec 21 16:33:56
2012
@@ -29,15 +29,15 @@
* fcntl.h for details.
*/
-#include "jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
#include <cerrno>
#include <cstdlib>
#include <cstring>
#include <fcntl.h>
#include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <sstream>
#include <unistd.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h Fri Dec 21 16:33:56
2012
@@ -44,7 +44,7 @@ class fcntl;
#include <cstddef>
#include <string>
-#include "jrnl/rcvdat.h"
+#include "qpid/legacystore/jrnl/rcvdat.h"
#include <sys/types.h>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h Fri Dec 21
16:33:56 2012
@@ -36,9 +36,9 @@
#include <cerrno>
#include <ctime>
-#include "jrnl/rec_hdr.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp Fri Dec 21 16:33:56
2012
@@ -31,7 +31,7 @@
*/
-#include "jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
#include <algorithm>
#include <cassert>
@@ -41,9 +41,9 @@
#include <fstream>
#include <iomanip>
#include <iostream>
-#include "jrnl/file_hdr.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/jinf.h"
+#include "qpid/legacystore/jrnl/file_hdr.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jinf.h"
#include <limits>
#include <sstream>
#include <unistd.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h Fri Dec 21 16:33:56
2012
@@ -43,15 +43,15 @@ namespace journal
#include <cstddef>
#include <deque>
-#include "jrnl/jdir.h"
-#include "jrnl/fcntl.h"
-#include "jrnl/lpmgr.h"
-#include "jrnl/rcvdat.h"
-#include "jrnl/slock.h"
-#include "jrnl/smutex.h"
-#include "jrnl/rmgr.h"
-#include "jrnl/wmgr.h"
-#include "jrnl/wrfc.h"
+#include "qpid/legacystore/jrnl/jdir.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/lpmgr.h"
+#include "qpid/legacystore/jrnl/rcvdat.h"
+#include "qpid/legacystore/jrnl/slock.h"
+#include "qpid/legacystore/jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/rmgr.h"
+#include "qpid/legacystore/jrnl/wmgr.h"
+#include "qpid/legacystore/jrnl/wrfc.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp Fri Dec 21 16:33:56
2012
@@ -31,15 +31,15 @@
* \author Kim van der Riet
*/
-#include "jrnl/jdir.h"
+#include "qpid/legacystore/jrnl/jdir.h"
#include <cstdlib>
#include <cstring>
#include <cerrno>
#include <iomanip>
-#include "jrnl/jcfg.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <sstream>
#include <sys/stat.h>
#include <unistd.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h Fri Dec 21 16:33:56
2012
@@ -42,7 +42,7 @@ class jdir;
}
}
-#include "jrnl/jinf.h"
+#include "qpid/legacystore/jrnl/jinf.h"
#include <dirent.h>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp Fri Dec 21
16:33:56 2012
@@ -32,7 +32,7 @@
* \author Kim van der Riet
*/
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp Fri Dec 21
16:33:56 2012
@@ -30,11 +30,11 @@
* \author Kim van der Riet
*/
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <iomanip>
#include <sstream>
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
#define CATLEN(p) MAX_MSG_SIZE - std::strlen(p) - 1
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h Fri Dec 21
16:33:56 2012
@@ -48,7 +48,7 @@ class jexception;
#include <cstdlib>
#include <cstring>
#include <exception>
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
#include <sstream>
#include <string>
#include <sys/types.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp Fri Dec 21 16:33:56
2012
@@ -37,10 +37,10 @@
#include <cstring>
#include <ctime>
#include <fstream>
-#include "jrnl/file_hdr.h"
-#include "jrnl/jcntl.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/lp_map.h"
+#include "qpid/legacystore/jrnl/file_hdr.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/lp_map.h"
#include <sstream>
#include <sys/stat.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp Fri Dec 21 16:33:56
2012
@@ -30,11 +30,11 @@
* \author Kim van der Riet
*/
-#include "jrnl/jrec.h"
+#include "qpid/legacystore/jrnl/jrec.h"
#include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h Fri Dec 21 16:33:56
2012
@@ -43,8 +43,8 @@ class jrec;
#include <cstddef>
#include <fstream>
-#include "jrnl/rec_hdr.h"
-#include "jrnl/rec_tail.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/rec_tail.h"
#include <string>
#include <sys/types.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp Fri Dec 21
16:33:56 2012
@@ -30,10 +30,10 @@
* \author Kim van der Riet
*/
-#include "jrnl/lp_map.h"
+#include "qpid/legacystore/jrnl/lp_map.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp Fri Dec 21 16:33:56
2012
@@ -31,11 +31,11 @@
* \author Kim van der Riet
*/
-#include "jrnl/lpmgr.h"
+#include "qpid/legacystore/jrnl/lpmgr.h"
#include <cassert>
-#include <jrnl/jerrno.h>
-#include <jrnl/jexception.h>
+#include <qpid/legacystore/jrnl/jerrno.h>
+#include <qpid/legacystore/jrnl/jexception.h>
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h Fri Dec 21 16:33:56
2012
@@ -41,7 +41,7 @@ namespace journal
}
}
-#include "jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
#include <vector>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp Fri Dec 21 16:33:56
2012
@@ -30,14 +30,14 @@
* \author Kim van der Riet
*/
-#include "jrnl/pmgr.h"
+#include "qpid/legacystore/jrnl/pmgr.h"
#include <cerrno>
#include <cstdlib>
#include <cstring>
-#include "jrnl/jcfg.h"
-#include "jrnl/jcntl.h"
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
#include <sstream>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h Fri Dec 21 16:33:56
2012
@@ -43,15 +43,15 @@ namespace journal
}
#include <deque>
-#include "jrnl/aio.h"
-#include "jrnl/aio_callback.h"
-#include "jrnl/data_tok.h"
-#include "jrnl/deq_rec.h"
-#include "jrnl/enq_map.h"
-#include "jrnl/enq_rec.h"
-#include "jrnl/fcntl.h"
-#include "jrnl/txn_map.h"
-#include "jrnl/txn_rec.h"
+#include "qpid/legacystore/jrnl/aio.h"
+#include "qpid/legacystore/jrnl/aio_callback.h"
+#include "qpid/legacystore/jrnl/data_tok.h"
+#include "qpid/legacystore/jrnl/deq_rec.h"
+#include "qpid/legacystore/jrnl/enq_map.h"
+#include "qpid/legacystore/jrnl/enq_rec.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/txn_map.h"
+#include "qpid/legacystore/jrnl/txn_rec.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h Fri Dec 21 16:33:56
2012
@@ -35,7 +35,7 @@
#include <cstddef>
#include <iomanip>
#include <map>
-#include "jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
#include <sstream>
#include <sys/types.h>
#include <vector>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h Fri Dec 21 16:33:56
2012
@@ -35,7 +35,7 @@
#define QPID_LEGACYSTORE_JRNL_REC_HDR_H
#include <cstddef>
-#include "jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
#include <sys/types.h>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h Fri Dec 21
16:33:56 2012
@@ -35,7 +35,7 @@
#define QPID_LEGACYSTORE_JRNL_REC_TAIL_H
#include <cstddef>
-#include "jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp Fri Dec 21 16:33:56
2012
@@ -30,7 +30,7 @@
* \author Kim van der Riet
*/
-#include "jrnl/rfc.h"
+#include "qpid/legacystore/jrnl/rfc.h"
#include <cassert>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h Fri Dec 21 16:33:56 2012
@@ -41,8 +41,8 @@ class rfc;
}
}
-#include "jrnl/lpmgr.h"
-#include "jrnl/enums.h"
+#include "qpid/legacystore/jrnl/lpmgr.h"
+#include "qpid/legacystore/jrnl/enums.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp Fri Dec 21 16:33:56
2012
@@ -30,13 +30,13 @@
* \author Kim van der Riet
*/
-#include "jrnl/rmgr.h"
+#include "qpid/legacystore/jrnl/rmgr.h"
#include <cassert>
#include <cerrno>
#include <cstdlib>
-#include "jrnl/jcntl.h"
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp Fri Dec 21 16:33:56
2012
@@ -31,13 +31,13 @@
*/
-#include "jrnl/rrfc.h"
+#include "qpid/legacystore/jrnl/rrfc.h"
#include <cerrno>
#include <fcntl.h>
#include <unistd.h>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h Fri Dec 21 16:33:56
2012
@@ -41,8 +41,8 @@ class rrfc;
}
}
-#include "jrnl/fcntl.h"
-#include "jrnl/rfc.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/rfc.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp Fri Dec 21 16:33:56
2012
@@ -30,4 +30,4 @@
* \author Kim van der Riet
*/
-#include "jrnl/slock.h"
+#include "qpid/legacystore/jrnl/slock.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/slock.h Fri Dec 21 16:33:56
2012
@@ -33,8 +33,8 @@
#ifndef QPID_LEGACYSTORE_JRNL_SLOCK_H
#define QPID_LEGACYSTORE_JRNL_SLOCK_H
-#include "jrnl/jexception.h"
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/smutex.h"
#include <pthread.h>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp Fri Dec 21
16:33:56 2012
@@ -30,4 +30,4 @@
* \author Kim van der Riet
*/
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/smutex.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h Fri Dec 21 16:33:56
2012
@@ -33,7 +33,7 @@
#ifndef QPID_LEGACYSTORE_JRNL_SMUTEX_H
#define QPID_LEGACYSTORE_JRNL_SMUTEX_H
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <pthread.h>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp Fri Dec 21
16:33:56 2012
@@ -30,7 +30,7 @@
* \author Kim van der Riet
*/
-#include "time_ns.h"
+#include "qpid/legacystore/jrnl/time_ns.h"
#include <sstream>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h Fri Dec 21 16:33:56
2012
@@ -34,7 +34,7 @@
#define QPID_LEGACYSTORE_JRNL_TXN_HDR_H
#include <cstddef>
-#include "jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp Fri Dec 21
16:33:56 2012
@@ -30,12 +30,12 @@
* \author Kim van der Riet
*/
-#include "jrnl/txn_map.h"
+#include "qpid/legacystore/jrnl/txn_map.h"
#include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
-#include "jrnl/slock.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/slock.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h Fri Dec 21 16:33:56
2012
@@ -41,7 +41,7 @@ namespace journal
}
}
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/smutex.h"
#include <map>
#include <pthread.h>
#include <string>
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp Fri Dec 21
16:33:56 2012
@@ -30,15 +30,15 @@
* \author Kim van der Riet
*/
-#include "jrnl/txn_rec.h"
+#include "qpid/legacystore/jrnl/txn_rec.h"
#include <cassert>
#include <cerrno>
#include <cstdlib>
#include <cstring>
#include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h Fri Dec 21 16:33:56
2012
@@ -42,8 +42,8 @@ class txn_rec;
}
#include <cstddef>
-#include "jrnl/jrec.h"
-#include "jrnl/txn_hdr.h"
+#include "qpid/legacystore/jrnl/jrec.h"
+#include "qpid/legacystore/jrnl/txn_hdr.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp Fri Dec 21 16:33:56
2012
@@ -24,21 +24,21 @@
*
* Qpid asynchronous store plugin library
*
- * File containing code for class mrg::journal::wmgr (read manager). See
+ * File containing code for class mrg::journal::wmgr (write manager). See
* comments in file wmgr.h for details.
*
* \author Kim van der Riet
*/
-#include "jrnl/wmgr.h"
+#include "qpid/legacystore/jrnl/wmgr.h"
#include <cassert>
#include <cerrno>
#include <cstdlib>
#include <cstring>
-#include "jrnl/file_hdr.h"
-#include "jrnl/jcntl.h"
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/file_hdr.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
#include <sstream>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h Fri Dec 21 16:33:56
2012
@@ -24,7 +24,7 @@
*
* Qpid asynchronous store plugin library
*
- * File containing code for class mrg::journal::wmgr (read manager). See
+ * File containing code for class mrg::journal::wmgr (write manager). See
* class documentation for details.
*
* \author Kim van der Riet
@@ -42,9 +42,9 @@ class wmgr;
}
#include <cstring>
-#include "jrnl/enums.h"
-#include "jrnl/pmgr.h"
-#include "jrnl/wrfc.h"
+#include "qpid/legacystore/jrnl/enums.h"
+#include "qpid/legacystore/jrnl/pmgr.h"
+#include "qpid/legacystore/jrnl/wrfc.h"
#include <set>
namespace mrg
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp Fri Dec 21 16:33:56
2012
@@ -24,17 +24,17 @@
*
* Qpid asynchronous store plugin library
*
- * File containing code for class mrg::journal::rrfc (rotating
- * file controller). See comments in file rrfc.h for details.
+ * File containing code for class mrg::journal::wrfc (rotating
+ * file controller). See comments in file wrfc.h for details.
*
* \author Kim van der Riet
*/
-#include "jrnl/wrfc.h"
+#include "qpid/legacystore/jrnl/wrfc.h"
#include <cmath>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
namespace mrg
{
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h?rev=1425009&r1=1425008&r2=1425009&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h Fri Dec 21 16:33:56
2012
@@ -42,8 +42,8 @@ class wrfc;
}
#include <cstddef>
-#include "jrnl/enums.h"
-#include "jrnl/rrfc.h"
+#include "qpid/legacystore/jrnl/enums.h"
+#include "qpid/legacystore/jrnl/rrfc.h"
namespace mrg
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
