QPID-4984: Change jrnl directory to journal - aligns namespaces with journal structure

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

71 files changed, 180 insertions, 219 deletions

diff --git a/qpid/cpp/src/linearstore.cmake b/qpid/cpp/src/linearstore.cmake
index a42b94699c..2930ef9531 100644
--- a/qpid/cpp/src/linearstore.cmake
+++ b/qpid/cpp/src/linearstore.cmake
@@ -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
diff --git a/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h
index 154dacc5cb..7152cef6a0 100644
--- a/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h
@@ -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>
 
diff --git a/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp b/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
index 354fca4f7e..4092bc4ab9 100644
--- a/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
@@ -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"
diff --git a/qpid/cpp/src/qpid/linearstore/JournalImpl.h b/qpid/cpp/src/qpid/linearstore/JournalImpl.h
index 59050e3875..ec1fb99434 100644
--- a/qpid/cpp/src/qpid/linearstore/JournalImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/JournalImpl.h
@@ -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"
diff --git a/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
index 538b383945..e674c6dcc8 100644
--- a/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
@@ -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)
diff --git a/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
index 3d06adaa67..dcb53ff55d 100644
--- a/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
@@ -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"
diff --git a/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
index fd2ab603d1..6992c17bef 100644
--- a/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
@@ -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"
diff --git a/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp b/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
index 945f190608..213d5865e1 100644
--- a/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
+++ b/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
@@ -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{
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/AtomicCounter.h b/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h
index 7181a43857..73e5fecf93 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/AtomicCounter.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.cpp b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
index da3d63f462..29f8b0b988 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
@@ -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>
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
index a866d0dea4..ccaeb02567 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePool.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
index 4b8602318d..2aadb90a8a 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
@@ -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
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
index 1b1f293a1c..beb884b91d 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolManager.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.cpp b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
index 2d84ba4296..bcebd571c2 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
@@ -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
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
index 9a2b5a5d75..3afee79816 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolPartition.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
@@ -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>
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolTypes.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
index d8e8225697..d8e8225697 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/EmptyFilePoolTypes.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.cpp b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
index 1e6c10eea7..15cbe33ad8 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
@@ -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
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.h b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h
index 687b2c4866..ef97d10e3a 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/JournalFile.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h
@@ -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>
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/JournalLog.cpp b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp
index 96a6432624..9a2438ae0b 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/JournalLog.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "JournalLog.h"
+#include "qpid/linearstore/journal/JournalLog.h"
 #include <iostream>
 
 namespace qpid {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/JournalLog.h b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.h
index cf503cb9d2..cf503cb9d2 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/JournalLog.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.cpp b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
index 9daebaba80..99883d2722 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
@@ -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
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.h b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h
index 1e8d9c9200..436c07f289 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/LinearFileController.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h
@@ -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;
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
index 361ee1aeda..8ae82c7b80 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
@@ -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>
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.h b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h
index 7655eb6831..153b0f0511 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h
@@ -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>
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/aio.h b/qpid/cpp/src/qpid/linearstore/journal/aio.h
index 3a4a762439..3a4a762439 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/aio.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/aio.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/aio_callback.h b/qpid/cpp/src/qpid/linearstore/journal/aio_callback.h
index f21b62617b..f21b62617b 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/aio_callback.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/aio_callback.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/cvar.h b/qpid/cpp/src/qpid/linearstore/journal/cvar.h
index 243c817946..89ba8cbb13 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/cvar.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/cvar.h
@@ -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>
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.cpp b/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp
index a07a89b02a..830720f9d7 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.h b/qpid/cpp/src/qpid/linearstore/journal/data_tok.h
index f727243cb0..ff854730d2 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/data_tok.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/data_tok.h
@@ -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>
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.cpp b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
index ca8de61607..0a9fee20f2 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.h b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h
index b4941895be..5b283c15d5 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/deq_rec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp b/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp
index 010968bdf7..2ccd271865 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp
@@ -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>
 
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.h b/qpid/cpp/src/qpid/linearstore/journal/enq_map.h
index aff839a022..97bad07ec6 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_map.h
@@ -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>
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.cpp b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
index 8096d309f9..f75fc2228d 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.h b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h
index 24ed9e99e1..0ce956425c 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/enq_rec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/enums.h b/qpid/cpp/src/qpid/linearstore/journal/enums.h
index 106f58cf5f..106f58cf5f 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/enums.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/enums.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jcfg.h b/qpid/cpp/src/qpid/linearstore/journal/jcfg.h
index 83c61bcb5f..83c61bcb5f 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jcfg.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcfg.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.cpp b/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
index 099c32b18d..c36a38d1d2 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
@@ -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>
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.h b/qpid/cpp/src/qpid/linearstore/journal/jcntl.h
index 76d2a9877d..612b510cb3 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jcntl.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcntl.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jdir.cpp b/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
index 734493074f..6f28a48a7f 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jdir.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
@@ -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>
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jdir.h b/qpid/cpp/src/qpid/linearstore/journal/jdir.h
index c13a5f5af0..c13a5f5af0 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jdir.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jdir.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jerrno.cpp b/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp
index a68966030b..51e90c6bb8 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jerrno.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/jerrno.h"
+#include "qpid/linearstore/journal/jerrno.h"
 
 namespace qpid {
 namespace linearstore {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jerrno.h b/qpid/cpp/src/qpid/linearstore/journal/jerrno.h
index 5af0a7ada0..5af0a7ada0 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jerrno.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jerrno.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jexception.cpp b/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp
index 44e9142698..eb6e80d2b3 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jexception.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp
@@ -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
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jexception.h b/qpid/cpp/src/qpid/linearstore/journal/jexception.h
index 712b357254..d03ee32e3f 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jexception.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jexception.h
@@ -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>
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jrec.h b/qpid/cpp/src/qpid/linearstore/journal/jrec.h
index ef481cc3ed..8a728bba29 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jrec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jrec.h
@@ -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
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.cpp b/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp
index b561c6ca2b..11553aaf47 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.h b/qpid/cpp/src/qpid/linearstore/journal/pmgr.h
index 787828af01..5de253c3d3 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/pmgr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/pmgr.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/slock.h b/qpid/cpp/src/qpid/linearstore/journal/slock.h
index b118f71bde..17ed06dfce 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/slock.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/slock.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/smutex.h b/qpid/cpp/src/qpid/linearstore/journal/smutex.h
index 91520ce1ae..b43f55944c 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/smutex.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/smutex.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/time_ns.cpp b/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp
index 5bb04496a4..39f2cd1d88 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/time_ns.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qpid/linearstore/jrnl/time_ns.h"
+#include "qpid/linearstore/journal/time_ns.h"
 
 #include <sstream>
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/time_ns.h b/qpid/cpp/src/qpid/linearstore/journal/time_ns.h
index a228d47475..a228d47475 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/time_ns.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/time_ns.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.cpp b/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp
index 2cc7966efb..6d84c6c451 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.h b/qpid/cpp/src/qpid/linearstore/journal/txn_map.h
index 419e043529..ef01e1df92 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/txn_map.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_map.h
@@ -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>
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.cpp b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
index 20333be622..ed4853ba1b 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.h b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h
index f256891664..29f52ec46a 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/txn_rec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h
@@ -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 {
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/deq_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
index 144ce4125a..144ce4125a 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/deq_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/deq_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h
index 3392867153..3392867153 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/deq_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/enq_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c
index b4e8b62ff1..b4e8b62ff1 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/enq_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/enq_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h
index 00108792bc..00108792bc 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/enq_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/file_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
index 35b4ea219e..35b4ea219e 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/file_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/file_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
index 53ca686fb8..53ca686fb8 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/file_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
index ad5262f9a3..ad5262f9a3 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h
index 64349b5ab8..64349b5ab8 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_tail.c b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
index 88c68e2b78..88c68e2b78 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_tail.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_tail.h b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
index 5163580ead..5163580ead 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/rec_tail.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/txn_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c
index 58d4cdebe4..58d4cdebe4 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/txn_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/utils/txn_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h
index 442a1d373d..442a1d373d 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/utils/txn_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.cpp b/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
index 9f91132f80..9af2764ab5 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
@@ -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>
 
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.h b/qpid/cpp/src/qpid/linearstore/journal/wmgr.h
index 0278317ae9..c55c0db577 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/wmgr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/wmgr.h
@@ -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;
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/jrec.cpp b/qpid/cpp/src/qpid/linearstore/jrnl/jrec.cpp
deleted file mode 100644
index 45f0197f8b..0000000000
--- a/qpid/cpp/src/qpid/linearstore/jrnl/jrec.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include "qpid/linearstore/jrnl/jrec.h"
-
-#include <iomanip>
-#include "qpid/linearstore/jrnl/jerrno.h"
-#include "qpid/linearstore/jrnl/jexception.h"
-#include "qpid/linearstore/jrnl/utils/rec_hdr.h"
-#include "qpid/linearstore/jrnl/utils/rec_tail.h"
-#include <sstream>
-
-namespace qpid {
-namespace linearstore {
-namespace journal {
-
-jrec::jrec() {}
-jrec::~jrec() {}
-
-}}}