qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject svn commit: r1542385 - in /qpid/trunk/qpid/cpp/src: ./ qpid/linearstore/ qpid/linearstore/journal/ qpid/linearstore/journal/utils/ qpid/linearstore/jrnl/
Date Fri, 15 Nov 2013 20:17:33 GMT
Author: kpvdr
Date: Fri Nov 15 20:17:32 2013
New Revision: 1542385

URL: http://svn.apache.org/r1542385
Log:
QPID-4984: Change jrnl directory to journal - aligns namespaces with journal structure

Added:
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/
      - copied from r1542064, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/AtomicCounter.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolTypes.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalLog.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalLog.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/aio.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/aio.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/aio_callback.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/aio_callback.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/cvar.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/cvar.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enums.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enums.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcfg.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jcfg.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jdir.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jdir.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jdir.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jerrno.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jerrno.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jerrno.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jexception.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jexception.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jrec.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jrec.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/slock.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/slock.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/smutex.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/smutex.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/time_ns.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/time_ns.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/time_ns.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/deq_hdr.c
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/deq_hdr.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/enq_hdr.c
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/enq_hdr.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/file_hdr.c
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/file_hdr.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_hdr.c
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_hdr.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_tail.c
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_tail.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/txn_hdr.c
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h
      - copied unchanged from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/utils/txn_hdr.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.h
      - copied, changed from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.h
Removed:
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jrec.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/
Modified:
    qpid/trunk/qpid/cpp/src/linearstore.cmake
    qpid/trunk/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
    qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
    qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp

Modified: qpid/trunk/qpid/cpp/src/linearstore.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/linearstore.cmake?rev=1542385&r1=1542384&r2=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/linearstore.cmake (original)
+++ qpid/trunk/qpid/cpp/src/linearstore.cmake Fri Nov 15 20:17:32 2013
@@ -93,27 +93,26 @@ if (BUILD_LINEARSTORE)
 
     # Journal source files
     set (linear_jrnl_SOURCES
-        qpid/linearstore/jrnl/data_tok.cpp
-        qpid/linearstore/jrnl/deq_rec.cpp
-        qpid/linearstore/jrnl/EmptyFilePool.cpp
-        qpid/linearstore/jrnl/EmptyFilePoolManager.cpp
-        qpid/linearstore/jrnl/EmptyFilePoolPartition.cpp
-        qpid/linearstore/jrnl/enq_map.cpp
-        qpid/linearstore/jrnl/enq_rec.cpp
-        qpid/linearstore/jrnl/jcntl.cpp
-        qpid/linearstore/jrnl/jdir.cpp
-        qpid/linearstore/jrnl/jerrno.cpp
-        qpid/linearstore/jrnl/jexception.cpp
-		qpid/linearstore/jrnl/JournalFile.cpp
-		qpid/linearstore/jrnl/JournalLog.cpp
-        qpid/linearstore/jrnl/jrec.cpp
-        qpid/linearstore/jrnl/LinearFileController.cpp
-        qpid/linearstore/jrnl/pmgr.cpp
-        qpid/linearstore/jrnl/RecoveryManager.cpp
-        qpid/linearstore/jrnl/time_ns.cpp
-        qpid/linearstore/jrnl/txn_map.cpp
-        qpid/linearstore/jrnl/txn_rec.cpp
-        qpid/linearstore/jrnl/wmgr.cpp
+        qpid/linearstore/journal/data_tok.cpp
+        qpid/linearstore/journal/deq_rec.cpp
+        qpid/linearstore/journal/EmptyFilePool.cpp
+        qpid/linearstore/journal/EmptyFilePoolManager.cpp
+        qpid/linearstore/journal/EmptyFilePoolPartition.cpp
+        qpid/linearstore/journal/enq_map.cpp
+        qpid/linearstore/journal/enq_rec.cpp
+        qpid/linearstore/journal/jcntl.cpp
+        qpid/linearstore/journal/jdir.cpp
+        qpid/linearstore/journal/jerrno.cpp
+        qpid/linearstore/journal/jexception.cpp
+		qpid/linearstore/journal/JournalFile.cpp
+		qpid/linearstore/journal/JournalLog.cpp
+        qpid/linearstore/journal/LinearFileController.cpp
+        qpid/linearstore/journal/pmgr.cpp
+        qpid/linearstore/journal/RecoveryManager.cpp
+        qpid/linearstore/journal/time_ns.cpp
+        qpid/linearstore/journal/txn_map.cpp
+        qpid/linearstore/journal/txn_rec.cpp
+        qpid/linearstore/journal/wmgr.cpp
     )
 
     # linearstore source files
@@ -132,12 +131,12 @@ if (BUILD_LINEARSTORE)
     )
 
     set (util_SOURCES
-        qpid/linearstore/jrnl/utils/deq_hdr.c
-        qpid/linearstore/jrnl/utils/enq_hdr.c
-        qpid/linearstore/jrnl/utils/file_hdr.c
-        qpid/linearstore/jrnl/utils/rec_hdr.c
-        qpid/linearstore/jrnl/utils/rec_tail.c
-        qpid/linearstore/jrnl/utils/txn_hdr.c
+        qpid/linearstore/journal/utils/deq_hdr.c
+        qpid/linearstore/journal/utils/enq_hdr.c
+        qpid/linearstore/journal/utils/file_hdr.c
+        qpid/linearstore/journal/utils/rec_hdr.c
+        qpid/linearstore/journal/utils/rec_tail.c
+        qpid/linearstore/journal/utils/txn_hdr.c
     )
 
     # linearstore include directories

Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h?rev=1542385&r1=1542384&r2=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h Fri Nov 15 20:17:32 2013
@@ -22,7 +22,7 @@
 #ifndef QPID_LINEARSTORE_DATATOKENIMPL_H
 #define QPID_LINEARSTORE_DATATOKENIMPL_H
 
-#include "qpid/linearstore/jrnl/data_tok.h"
+#include "qpid/linearstore/journal/data_tok.h"
 #include "qpid/broker/PersistableMessage.h"
 #include <boost/intrusive_ptr.hpp>
 

Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp?rev=1542385&r1=1542384&r2=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp Fri Nov 15 20:17:32 2013
@@ -22,9 +22,9 @@
 #include "qpid/linearstore/JournalImpl.h"
 
 #include "qpid/linearstore/JournalLogImpl.h"
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/jexception.h"
-#include "qpid/linearstore/jrnl/EmptyFilePool.h"
+#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/jexception.h"
+#include "qpid/linearstore/journal/EmptyFilePool.h"
 #include "qpid/linearstore/StoreException.h"
 #include "qpid/log/Statement.h"
 #include "qpid/management/ManagementAgent.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h?rev=1542385&r1=1542384&r2=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h Fri Nov 15 20:17:32 2013
@@ -23,9 +23,9 @@
 #define QPID_LINEARSTORE_JOURNALIMPL_H
 
 #include <set>
-#include "qpid/linearstore/jrnl/enums.h"
-#include "qpid/linearstore/jrnl/EmptyFilePoolTypes.h"
-#include "qpid/linearstore/jrnl/jcntl.h"
+#include "qpid/linearstore/journal/enums.h"
+#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
+#include "qpid/linearstore/journal/jcntl.h"
 #include "qpid/linearstore/DataTokenImpl.h"
 #include "qpid/linearstore/PreparedTransaction.h"
 #include "qpid/broker/PersistableQueue.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h?rev=1542385&r1=1542384&r2=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h Fri Nov 15 20:17:32 2013
@@ -22,7 +22,7 @@
 #ifndef QPID_LINEARSTORE_LOG_H
 #define QPID_LINEARSTORE_LOG_H
 
-#include "qpid/linearstore/jrnl/JournalLog.h"
+#include "qpid/linearstore/journal/JournalLog.h"
 #include "qpid/log/Statement.h"
 
 #define QLS_LOG(level, msg) QPID_LOG(level, "Linear Store: " << msg)

Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp?rev=1542385&r1=1542384&r2=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp Fri Nov 15 20:17:32 2013
@@ -26,8 +26,8 @@
 #include "qpid/linearstore/BindingDbt.h"
 #include "qpid/linearstore/BufferValue.h"
 #include "qpid/linearstore/IdDbt.h"
-#include "qpid/linearstore/jrnl/EmptyFilePoolManager.h"
-#include "qpid/linearstore/jrnl/txn_map.h"
+#include "qpid/linearstore/journal/EmptyFilePoolManager.h"
+#include "qpid/linearstore/journal/txn_map.h"
 #include "qpid/framing/FieldValue.h"
 #include "qmf/org/apache/qpid/linearstore/Package.h"
 #include "qpid/linearstore/StoreException.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h?rev=1542385&r1=1542384&r2=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h Fri Nov 15 20:17:32 2013
@@ -31,8 +31,8 @@
 #include "qpid/linearstore/IdSequence.h"
 #include "qpid/linearstore/JournalImpl.h"
 #include "qpid/linearstore/JournalLogImpl.h"
-#include "qpid/linearstore/jrnl/jcfg.h"
-#include "qpid/linearstore/jrnl/EmptyFilePoolTypes.h"
+#include "qpid/linearstore/journal/jcfg.h"
+#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
 #include "qpid/linearstore/PreparedTransaction.h"
 #include "qpid/broker/Broker.h"
 #include "qpid/broker/MessageStore.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp?rev=1542385&r1=1542384&r2=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp Fri Nov 15 20:17:32 2013
@@ -23,7 +23,7 @@
 
 #include <sstream>
 
-#include "qpid/linearstore/jrnl/jexception.h"
+#include "qpid/linearstore/journal/jexception.h"
 #include "qpid/linearstore/StoreException.h"
 
 namespace qpid{

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/AtomicCounter.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/AtomicCounter.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/AtomicCounter.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h Fri Nov 15 20:17:32 2013
@@ -22,7 +22,7 @@
 #ifndef QPID_LINEARSTORE_JOURNAL_ATOMICCOUNTER_H_
 #define QPID_LINEARSTORE_JOURNAL_ATOMICCOUNTER_H_
 
-#include "qpid/linearstore/jrnl/slock.h"
+#include "qpid/linearstore/journal/slock.h"
 #include <string>
 
 namespace qpid {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp Fri Nov 15 20:17:32 2013
@@ -23,13 +23,13 @@
 
 #include <cctype>
 #include <fstream>
-#include "qpid/linearstore/jrnl/EmptyFilePoolPartition.h"
-#include "qpid/linearstore/jrnl/jcfg.h"
-#include "qpid/linearstore/jrnl/jdir.h"
-#include "qpid/linearstore/jrnl/JournalFile.h"
-#include "qpid/linearstore/jrnl/JournalLog.h"
-#include "qpid/linearstore/jrnl/slock.h"
-#include "qpid/linearstore/jrnl/utils/file_hdr.h"
+#include "qpid/linearstore/journal/EmptyFilePoolPartition.h"
+#include "qpid/linearstore/journal/jcfg.h"
+#include "qpid/linearstore/journal/jdir.h"
+#include "qpid/linearstore/journal/JournalFile.h"
+#include "qpid/linearstore/journal/JournalLog.h"
+#include "qpid/linearstore/journal/slock.h"
+#include "qpid/linearstore/journal/utils/file_hdr.h"
 #include <sys/stat.h>
 #include <unistd.h>
 #include <uuid/uuid.h>

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h Fri Nov 15 20:17:32 2013
@@ -29,8 +29,8 @@ namespace journal {
 }}}
 
 #include <deque>
-#include "qpid/linearstore/jrnl/EmptyFilePoolTypes.h"
-#include "qpid/linearstore/jrnl/smutex.h"
+#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
+#include "qpid/linearstore/journal/smutex.h"
 #include <string>
 
 namespace qpid {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp Fri Nov 15 20:17:32 2013
@@ -22,10 +22,10 @@
 #include "EmptyFilePoolManager.h"
 
 #include <dirent.h>
-#include "qpid/linearstore/jrnl/EmptyFilePoolPartition.h"
-#include "qpid/linearstore/jrnl/jdir.h"
-#include "qpid/linearstore/jrnl/JournalLog.h"
-#include "qpid/linearstore/jrnl/slock.h"
+#include "qpid/linearstore/journal/EmptyFilePoolPartition.h"
+#include "qpid/linearstore/journal/jdir.h"
+#include "qpid/linearstore/journal/JournalLog.h"
+#include "qpid/linearstore/journal/slock.h"
 #include <vector>
 
 //#include <iostream> // DEBUG

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h Fri Nov 15 20:17:32 2013
@@ -23,8 +23,8 @@
 #define QPID_QLS_JRNL_EMPTYFILEPOOLMANAGER_H_
 
 #include <map>
-#include "qpid/linearstore/jrnl/EmptyFilePoolPartition.h"
-#include "qpid/linearstore/jrnl/smutex.h"
+#include "qpid/linearstore/journal/EmptyFilePoolPartition.h"
+#include "qpid/linearstore/journal/smutex.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp Fri Nov 15 20:17:32 2013
@@ -19,14 +19,14 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/EmptyFilePoolPartition.h"
+#include "qpid/linearstore/journal/EmptyFilePoolPartition.h"
 
 #include <dirent.h>
 #include <iomanip>
-#include "qpid/linearstore/jrnl/jdir.h"
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/jexception.h"
-#include "qpid/linearstore/jrnl/slock.h"
+#include "qpid/linearstore/journal/jdir.h"
+#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/jexception.h"
+#include "qpid/linearstore/journal/slock.h"
 
 //#include <iostream> // DEBUG
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h Fri Nov 15 20:17:32 2013
@@ -28,9 +28,9 @@ namespace journal {
     class EmptyFilePoolPartition;
 }}}
 
-#include "qpid/linearstore/jrnl/EmptyFilePool.h"
-#include "qpid/linearstore/jrnl/EmptyFilePoolTypes.h"
-#include "qpid/linearstore/jrnl/smutex.h"
+#include "qpid/linearstore/journal/EmptyFilePool.h"
+#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
+#include "qpid/linearstore/journal/smutex.h"
 #include <string>
 #include <map>
 #include <vector>

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp Fri Nov 15 20:17:32 2013
@@ -19,13 +19,13 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/JournalFile.h"
+#include "qpid/linearstore/journal/JournalFile.h"
 
 #include <fcntl.h>
-#include "qpid/linearstore/jrnl/jcfg.h"
-#include "qpid/linearstore/jrnl/jexception.h"
-#include "qpid/linearstore/jrnl/pmgr.h"
-#include "qpid/linearstore/jrnl/utils/file_hdr.h"
+#include "qpid/linearstore/journal/jcfg.h"
+#include "qpid/linearstore/journal/jexception.h"
+#include "qpid/linearstore/journal/pmgr.h"
+#include "qpid/linearstore/journal/utils/file_hdr.h"
 #include <unistd.h>
 
 //#include <iostream> // DEBUG

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h Fri Nov 15 20:17:32 2013
@@ -22,9 +22,9 @@
 #ifndef QPID_LINEARSTORE_JOURNAL_JOURNALFILE_H_
 #define QPID_LINEARSTORE_JOURNAL_JOURNALFILE_H_
 
-#include "qpid/linearstore/jrnl/aio.h"
-#include "qpid/linearstore/jrnl/AtomicCounter.h"
-#include "qpid/linearstore/jrnl/EmptyFilePoolTypes.h"
+#include "qpid/linearstore/journal/aio.h"
+#include "qpid/linearstore/journal/AtomicCounter.h"
+#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
 #include <stdint.h>
 #include <string>
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalLog.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalLog.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/JournalLog.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp Fri Nov 15 20:17:32 2013
@@ -19,7 +19,7 @@
  *
  */
 
-#include "JournalLog.h"
+#include "qpid/linearstore/journal/JournalLog.h"
 #include <iostream>
 
 namespace qpid {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp Fri Nov 15 20:17:32 2013
@@ -19,15 +19,15 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/LinearFileController.h"
+#include "qpid/linearstore/journal/LinearFileController.h"
 
 #include <fstream>
-#include "qpid/linearstore/jrnl/EmptyFilePool.h"
-#include "qpid/linearstore/jrnl/jcfg.h"
-#include "qpid/linearstore/jrnl/jcntl.h"
-#include "qpid/linearstore/jrnl/JournalFile.h"
-#include "qpid/linearstore/jrnl/slock.h"
-#include "qpid/linearstore/jrnl/utils/file_hdr.h"
+#include "qpid/linearstore/journal/EmptyFilePool.h"
+#include "qpid/linearstore/journal/jcfg.h"
+#include "qpid/linearstore/journal/jcntl.h"
+#include "qpid/linearstore/journal/JournalFile.h"
+#include "qpid/linearstore/journal/slock.h"
+#include "qpid/linearstore/journal/utils/file_hdr.h"
 
 //#include <iostream> // DEBUG
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h Fri Nov 15 20:17:32 2013
@@ -23,8 +23,8 @@
 #define QPID_LINEARSTORE_JOURNAL_LINEARFILECONTROLLER_H_
 
 #include <deque>
-#include "qpid/linearstore/jrnl/AtomicCounter.h"
-#include "qpid/linearstore/jrnl/EmptyFilePoolTypes.h"
+#include "qpid/linearstore/journal/AtomicCounter.h"
+#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
 
 // libaio forward declares
 typedef struct io_context* io_context_t;

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp Fri Nov 15 20:17:32 2013
@@ -19,26 +19,26 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/RecoveryManager.h"
+#include "qpid/linearstore/journal/RecoveryManager.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iomanip>
-#include "qpid/linearstore/jrnl/data_tok.h"
-#include "qpid/linearstore/jrnl/deq_rec.h"
-#include "qpid/linearstore/jrnl/EmptyFilePoolManager.h"
-#include "qpid/linearstore/jrnl/enq_map.h"
-#include "qpid/linearstore/jrnl/enq_rec.h"
-#include "qpid/linearstore/jrnl/jcfg.h"
-#include "qpid/linearstore/jrnl/jdir.h"
-#include "qpid/linearstore/jrnl/JournalFile.h"
-#include "qpid/linearstore/jrnl/JournalLog.h"
-#include "qpid/linearstore/jrnl/jrec.h"
-#include "qpid/linearstore/jrnl/LinearFileController.h"
-#include "qpid/linearstore/jrnl/txn_map.h"
-#include "qpid/linearstore/jrnl/txn_rec.h"
-#include "qpid/linearstore/jrnl/utils/enq_hdr.h"
-#include "qpid/linearstore/jrnl/utils/file_hdr.h"
+#include "qpid/linearstore/journal/data_tok.h"
+#include "qpid/linearstore/journal/deq_rec.h"
+#include "qpid/linearstore/journal/EmptyFilePoolManager.h"
+#include "qpid/linearstore/journal/enq_map.h"
+#include "qpid/linearstore/journal/enq_rec.h"
+#include "qpid/linearstore/journal/jcfg.h"
+#include "qpid/linearstore/journal/jdir.h"
+#include "qpid/linearstore/journal/JournalFile.h"
+#include "qpid/linearstore/journal/JournalLog.h"
+#include "qpid/linearstore/journal/jrec.h"
+#include "qpid/linearstore/journal/LinearFileController.h"
+#include "qpid/linearstore/journal/txn_map.h"
+#include "qpid/linearstore/journal/txn_rec.h"
+#include "qpid/linearstore/journal/utils/enq_hdr.h"
+#include "qpid/linearstore/journal/utils/file_hdr.h"
 #include <sstream>
 #include <string>
 #include <vector>

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h Fri Nov 15 20:17:32 2013
@@ -25,7 +25,7 @@
 #include <deque>
 #include <fstream>
 #include <map>
-#include "qpid/linearstore/jrnl/LinearFileController.h"
+#include "qpid/linearstore/journal/LinearFileController.h"
 #include <stdint.h>
 #include <vector>
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/cvar.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/cvar.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/cvar.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/cvar.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/cvar.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/cvar.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/cvar.h Fri Nov 15 20:17:32 2013
@@ -23,10 +23,10 @@
 #define QPID_LINEARSTORE_JOURNAL_CVAR_H
 
 #include <cstring>
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/jexception.h"
-#include "qpid/linearstore/jrnl/smutex.h"
-#include "qpid/linearstore/jrnl/time_ns.h"
+#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/jexception.h"
+#include "qpid/linearstore/journal/smutex.h"
+#include "qpid/linearstore/journal/time_ns.h"
 #include <pthread.h>
 #include <sstream>
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp Fri Nov 15 20:17:32 2013
@@ -19,12 +19,12 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/data_tok.h"
+#include "qpid/linearstore/journal/data_tok.h"
 
 #include <iomanip>
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/jexception.h"
-#include "qpid/linearstore/jrnl/slock.h"
+#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/jexception.h"
+#include "qpid/linearstore/journal/slock.h"
 #include <sstream>
 
 namespace qpid {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h Fri Nov 15 20:17:32 2013
@@ -30,7 +30,7 @@ class data_tok;
 
 #include <cassert>
 #include <cstddef>
-#include "qpid/linearstore/jrnl/smutex.h"
+#include "qpid/linearstore/journal/smutex.h"
 #include <pthread.h>
 #include <string>
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp Fri Nov 15 20:17:32 2013
@@ -19,12 +19,12 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/deq_rec.h"
+#include "qpid/linearstore/journal/deq_rec.h"
 
 #include <cassert>
 #include <cstring>
 #include <iomanip>
-#include "qpid/linearstore/jrnl/jexception.h"
+#include "qpid/linearstore/journal/jexception.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h Fri Nov 15 20:17:32 2013
@@ -22,9 +22,9 @@
 #ifndef QPID_LINEARSTORE_JOURNAL_DEQ_REQ_H
 #define QPID_LINEARSTORE_JOURNAL_DEQ_REQ_H
 
-#include "qpid/linearstore/jrnl/jrec.h"
-#include "qpid/linearstore/jrnl/utils/deq_hdr.h"
-#include "qpid/linearstore/jrnl/utils/rec_tail.h"
+#include "qpid/linearstore/journal/jrec.h"
+#include "qpid/linearstore/journal/utils/deq_hdr.h"
+#include "qpid/linearstore/journal/utils/rec_tail.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp Fri Nov 15 20:17:32 2013
@@ -19,11 +19,11 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/enq_map.h"
+#include "qpid/linearstore/journal/enq_map.h"
 
 #include <iomanip>
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/slock.h"
+#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/slock.h"
 #include <sstream>
 
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h Fri Nov 15 20:17:32 2013
@@ -28,8 +28,8 @@ namespace journal {
 class enq_map;
 }}}
 
-#include "qpid/linearstore/jrnl/jexception.h"
-#include "qpid/linearstore/jrnl/smutex.h"
+#include "qpid/linearstore/journal/jexception.h"
+#include "qpid/linearstore/journal/smutex.h"
 #include <map>
 #include <pthread.h>
 #include <vector>

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp Fri Nov 15 20:17:32 2013
@@ -19,12 +19,12 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/enq_rec.h"
+#include "qpid/linearstore/journal/enq_rec.h"
 
 #include <cassert>
 #include <cstring>
 #include <iomanip>
-#include "qpid/linearstore/jrnl/jexception.h"
+#include "qpid/linearstore/journal/jexception.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h Fri Nov 15 20:17:32 2013
@@ -22,9 +22,9 @@
 #ifndef QPID_LINEARSTORE_JOURNAL_ENQ_REC_H
 #define QPID_LINEARSTORE_JOURNAL_ENQ_REC_H
 
-#include "qpid/linearstore/jrnl/jrec.h"
-#include "qpid/linearstore/jrnl/utils/enq_hdr.h"
-#include "qpid/linearstore/jrnl/utils/rec_tail.h"
+#include "qpid/linearstore/journal/jrec.h"
+#include "qpid/linearstore/journal/utils/enq_hdr.h"
+#include "qpid/linearstore/journal/utils/rec_tail.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp Fri Nov 15 20:17:32 2013
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/jcntl.h"
+#include "qpid/linearstore/journal/jcntl.h"
 
 #include <algorithm>
 #include <cassert>
@@ -29,11 +29,11 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <qpid/linearstore/jrnl/EmptyFilePool.h>
-#include <qpid/linearstore/jrnl/EmptyFilePoolManager.h>
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/JournalLog.h"
-#include "qpid/linearstore/jrnl/utils/enq_hdr.h"
+#include <qpid/linearstore/journal/EmptyFilePool.h>
+#include <qpid/linearstore/journal/EmptyFilePoolManager.h>
+#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/JournalLog.h"
+#include "qpid/linearstore/journal/utils/enq_hdr.h"
 #include <limits>
 #include <sstream>
 #include <unistd.h>

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.h Fri Nov 15 20:17:32 2013
@@ -30,12 +30,12 @@ namespace journal {
 
 #include <cstddef>
 #include <deque>
-#include <qpid/linearstore/jrnl/LinearFileController.h>
-#include "qpid/linearstore/jrnl/jdir.h"
-#include "qpid/linearstore/jrnl/RecoveryManager.h"
-#include "qpid/linearstore/jrnl/slock.h"
-#include "qpid/linearstore/jrnl/smutex.h"
-#include "qpid/linearstore/jrnl/wmgr.h"
+#include <qpid/linearstore/journal/LinearFileController.h>
+#include "qpid/linearstore/journal/jdir.h"
+#include "qpid/linearstore/journal/RecoveryManager.h"
+#include "qpid/linearstore/journal/slock.h"
+#include "qpid/linearstore/journal/smutex.h"
+#include "qpid/linearstore/journal/wmgr.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jdir.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jdir.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jdir.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp Fri Nov 15 20:17:32 2013
@@ -19,15 +19,15 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/jdir.h"
+#include "qpid/linearstore/journal/jdir.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <cerrno>
 #include <iomanip>
-#include "qpid/linearstore/jrnl/jcfg.h"
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/jexception.h"
+#include "qpid/linearstore/journal/jcfg.h"
+#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/jexception.h"
 #include <sstream>
 #include <sys/stat.h>
 #include <unistd.h>

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jerrno.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jerrno.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jerrno.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp Fri Nov 15 20:17:32 2013
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/jerrno.h"
+#include "qpid/linearstore/journal/jerrno.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jexception.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jexception.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jexception.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp Fri Nov 15 20:17:32 2013
@@ -19,11 +19,11 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/jexception.h"
+#include "qpid/linearstore/journal/jexception.h"
 
 #include <iomanip>
 #include <sstream>
-#include "qpid/linearstore/jrnl/jerrno.h"
+#include "qpid/linearstore/journal/jerrno.h"
 
 #define CATLEN(p) MAX_MSG_SIZE - std::strlen(p) - 1
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jexception.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jexception.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jexception.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.h Fri Nov 15 20:17:32 2013
@@ -33,7 +33,7 @@ class jexception;
 #include <cstdlib>
 #include <cstring>
 #include <exception>
-#include "qpid/linearstore/jrnl/jerrno.h"
+#include "qpid/linearstore/journal/jerrno.h"
 #include <sstream>
 #include <string>
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jrec.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jrec.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jrec.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jrec.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jrec.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/jrec.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jrec.h Fri Nov 15 20:17:32 2013
@@ -24,7 +24,7 @@
 
 #include <cstddef>
 #include <fstream>
-#include "qpid/linearstore/jrnl/jcfg.h"
+#include "qpid/linearstore/journal/jcfg.h"
 #include <stdint.h>
 #include <string>
 
@@ -43,8 +43,8 @@ namespace journal {
 class jrec
 {
 public:
-    jrec();
-    virtual ~jrec();
+    jrec() {}
+    virtual ~jrec() {}
 
     /**
     * \brief Encode this instance of jrec into the write buffer at the disk-block-aligned

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp Fri Nov 15 20:17:32 2013
@@ -19,14 +19,14 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/pmgr.h"
+#include "qpid/linearstore/journal/pmgr.h"
 
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
-#include "qpid/linearstore/jrnl/jcfg.h"
-#include "qpid/linearstore/jrnl/jcntl.h"
-#include "qpid/linearstore/jrnl/jerrno.h"
+#include "qpid/linearstore/journal/jcfg.h"
+#include "qpid/linearstore/journal/jcntl.h"
+#include "qpid/linearstore/journal/jerrno.h"
 #include <sstream>
 
 namespace qpid {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.h Fri Nov 15 20:17:32 2013
@@ -30,14 +30,14 @@ namespace journal {
 }}}
 
 #include <deque>
-#include "qpid/linearstore/jrnl/aio.h"
-#include "qpid/linearstore/jrnl/aio_callback.h"
-#include "qpid/linearstore/jrnl/data_tok.h"
-#include "qpid/linearstore/jrnl/deq_rec.h"
-#include "qpid/linearstore/jrnl/enq_map.h"
-#include "qpid/linearstore/jrnl/enq_rec.h"
-#include "qpid/linearstore/jrnl/txn_map.h"
-#include "qpid/linearstore/jrnl/txn_rec.h"
+#include "qpid/linearstore/journal/aio.h"
+#include "qpid/linearstore/journal/aio_callback.h"
+#include "qpid/linearstore/journal/data_tok.h"
+#include "qpid/linearstore/journal/deq_rec.h"
+#include "qpid/linearstore/journal/enq_map.h"
+#include "qpid/linearstore/journal/enq_rec.h"
+#include "qpid/linearstore/journal/txn_map.h"
+#include "qpid/linearstore/journal/txn_rec.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/slock.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/slock.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/slock.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/slock.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/slock.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/slock.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/slock.h Fri Nov 15 20:17:32 2013
@@ -22,8 +22,8 @@
 #ifndef QPID_LINEARSTORE_JOURNAL_SLOCK_H
 #define QPID_LINEARSTORE_JOURNAL_SLOCK_H
 
-#include "qpid/linearstore/jrnl/jexception.h"
-#include "qpid/linearstore/jrnl/smutex.h"
+#include "qpid/linearstore/journal/jexception.h"
+#include "qpid/linearstore/journal/smutex.h"
 #include <pthread.h>
 
 namespace qpid {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/smutex.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/smutex.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/smutex.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/smutex.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/smutex.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/smutex.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/smutex.h Fri Nov 15 20:17:32 2013
@@ -22,7 +22,7 @@
 #ifndef QPID_LINEARSTORE_JOURNAL_SMUTEX_H
 #define QPID_LINEARSTORE_JOURNAL_SMUTEX_H
 
-#include "qpid/linearstore/jrnl/jexception.h"
+#include "qpid/linearstore/journal/jexception.h"
 #include <pthread.h>
 
 namespace qpid {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/time_ns.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/time_ns.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/time_ns.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp Fri Nov 15 20:17:32 2013
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/time_ns.h"
+#include "qpid/linearstore/journal/time_ns.h"
 
 #include <sstream>
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp Fri Nov 15 20:17:32 2013
@@ -19,12 +19,12 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/txn_map.h"
+#include "qpid/linearstore/journal/txn_map.h"
 
 #include <iomanip>
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/jexception.h"
-#include "qpid/linearstore/jrnl/slock.h"
+#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/jexception.h"
+#include "qpid/linearstore/journal/slock.h"
 #include <sstream>
 
 namespace qpid {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.h Fri Nov 15 20:17:32 2013
@@ -28,7 +28,7 @@ namespace journal {
     class txn_map;
 }}}
 
-#include "qpid/linearstore/jrnl/smutex.h"
+#include "qpid/linearstore/journal/smutex.h"
 #include <map>
 #include <pthread.h>
 #include <string>

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp Fri Nov 15 20:17:32 2013
@@ -19,12 +19,12 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/txn_rec.h"
+#include "qpid/linearstore/journal/txn_rec.h"
 
 #include <cassert>
 #include <cstring>
 #include <iomanip>
-#include "qpid/linearstore/jrnl/jexception.h"
+#include "qpid/linearstore/journal/jexception.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h Fri Nov 15 20:17:32 2013
@@ -22,9 +22,9 @@
 #ifndef QPID_LINEARSTORE_JOURNAL_TXN_REC_H
 #define QPID_LINEARSTORE_JOURNAL_TXN_REC_H
 
-#include "qpid/linearstore/jrnl/jrec.h"
-#include "qpid/linearstore/jrnl/utils/txn_hdr.h"
-#include "qpid/linearstore/jrnl/utils/rec_tail.h"
+#include "qpid/linearstore/journal/jrec.h"
+#include "qpid/linearstore/journal/utils/txn_hdr.h"
+#include "qpid/linearstore/journal/utils/rec_tail.h"
 
 namespace qpid {
 namespace linearstore {

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.cpp&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp Fri Nov 15 20:17:32 2013
@@ -19,17 +19,17 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/wmgr.h"
+#include "qpid/linearstore/journal/wmgr.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
-#include "qpid/linearstore/jrnl/utils/file_hdr.h"
-#include "qpid/linearstore/jrnl/jcfg.h"
-#include "qpid/linearstore/jrnl/jcntl.h"
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/JournalFile.h"
+#include "qpid/linearstore/journal/utils/file_hdr.h"
+#include "qpid/linearstore/journal/jcfg.h"
+#include "qpid/linearstore/journal/jcntl.h"
+#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/JournalFile.h"
 #include <sstream>
 #include <stdint.h>
 

Copied: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.h (from r1542066, qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.h?p2=qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.h&p1=qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.h&r1=1542066&r2=1542385&rev=1542385&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.h Fri Nov 15 20:17:32 2013
@@ -29,9 +29,9 @@ class wmgr;
 }}}
 
 #include <cstring>
-#include "qpid/linearstore/jrnl/EmptyFilePoolTypes.h"
-#include "qpid/linearstore/jrnl/enums.h"
-#include "qpid/linearstore/jrnl/pmgr.h"
+#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
+#include "qpid/linearstore/journal/enums.h"
+#include "qpid/linearstore/journal/pmgr.h"
 #include <set>
 
 class file_hdr_t;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message