QPID-1726 ASF licensed, Qpid hosted store module

Remove corporate copyright notices.



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

83 files changed, 6 insertions, 278 deletions

diff --git a/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp b/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
index f4bd2be0a6..52ae4f0a77 100644
--- a/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #include "BindingDbt.h"
 
 namespace mrg {
diff --git a/qpid/cpp/src/qpid/legacystore/BindingDbt.h b/qpid/cpp/src/qpid/legacystore/BindingDbt.h
index ae47ad276c..9a58ae2561 100644
--- a/qpid/cpp/src/qpid/legacystore/BindingDbt.h
+++ b/qpid/cpp/src/qpid/legacystore/BindingDbt.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _BindingDbt_
 #define _BindingDbt_
 
diff --git a/qpid/cpp/src/qpid/legacystore/BufferValue.cpp b/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
index af90518252..325f22f275 100644
--- a/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
+++ b/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
@@ -19,11 +19,7 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
-#include "BufferValue.h"
+/#include "BufferValue.h"
 
 namespace mrg {
 namespace msgstore {
diff --git a/qpid/cpp/src/qpid/legacystore/BufferValue.h b/qpid/cpp/src/qpid/legacystore/BufferValue.h
index 66639b29bd..2f02833b70 100644
--- a/qpid/cpp/src/qpid/legacystore/BufferValue.h
+++ b/qpid/cpp/src/qpid/legacystore/BufferValue.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _BufferValue_
 #define _BufferValue_
 
diff --git a/qpid/cpp/src/qpid/legacystore/Cursor.h b/qpid/cpp/src/qpid/legacystore/Cursor.h
index 87c0bb9b6b..bd7157f15b 100644
--- a/qpid/cpp/src/qpid/legacystore/Cursor.h
+++ b/qpid/cpp/src/qpid/legacystore/Cursor.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _Cursor_
 #define _Cursor_
 
diff --git a/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
index 736460c03e..89aeb9218e 100644
--- a/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #include "DataTokenImpl.h"
 
 using namespace mrg::msgstore;
diff --git a/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
index 33f38b1ec2..6de0f9e00f 100644
--- a/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _DataTokenImpl_
 #define _DataTokenImpl_
 
diff --git a/qpid/cpp/src/qpid/legacystore/IdDbt.cpp b/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
index 69f9920683..3d55cf0e10 100644
--- a/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #include "IdDbt.h"
 
 using namespace mrg::msgstore;
diff --git a/qpid/cpp/src/qpid/legacystore/IdDbt.h b/qpid/cpp/src/qpid/legacystore/IdDbt.h
index fd244d2bf6..6d8610c027 100644
--- a/qpid/cpp/src/qpid/legacystore/IdDbt.h
+++ b/qpid/cpp/src/qpid/legacystore/IdDbt.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _IdDbt_
 #define _IdDbt_
 
diff --git a/qpid/cpp/src/qpid/legacystore/IdSequence.cpp b/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
index f53a0dacb7..8dcf389071 100644
--- a/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
+++ b/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #include "IdSequence.h"
 
 using namespace mrg::msgstore;
diff --git a/qpid/cpp/src/qpid/legacystore/IdSequence.h b/qpid/cpp/src/qpid/legacystore/IdSequence.h
index 6f13e919fa..3865ddbdfc 100644
--- a/qpid/cpp/src/qpid/legacystore/IdSequence.h
+++ b/qpid/cpp/src/qpid/legacystore/IdSequence.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _IdSequence_
 #define _IdSequence_
 
diff --git a/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp b/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
index c15c9d2b68..e50959760b 100644
--- a/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #include "JournalImpl.h"
 
 #include "jrnl/jerrno.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/JournalImpl.h b/qpid/cpp/src/qpid/legacystore/JournalImpl.h
index b026e84b1b..2b7b44b4ad 100644
--- a/qpid/cpp/src/qpid/legacystore/JournalImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/JournalImpl.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _JournalImpl_
 #define _JournalImpl_
 
diff --git a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
index aaec224306..bab292899e 100644
--- a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #include "MessageStoreImpl.h"
 
 #include "BindingDbt.h"
diff --git a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
index 19b19853b3..568d59578e 100644
--- a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _MessageStoreImpl_
 #define _MessageStoreImpl_
 
diff --git a/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
index 5a6801158c..26db59f1c8 100644
--- a/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
+++ b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #include "PreparedTransaction.h"
 #include <algorithm>
 
diff --git a/qpid/cpp/src/qpid/legacystore/PreparedTransaction.h b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.h
index 3e93a2a6ba..a58a841935 100644
--- a/qpid/cpp/src/qpid/legacystore/PreparedTransaction.h
+++ b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _PreparedTransaction_
 #define _PreparedTransaction_
 
diff --git a/qpid/cpp/src/qpid/legacystore/StoreException.h b/qpid/cpp/src/qpid/legacystore/StoreException.h
index 16395c3362..2bc7e8d32e 100644
--- a/qpid/cpp/src/qpid/legacystore/StoreException.h
+++ b/qpid/cpp/src/qpid/legacystore/StoreException.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _StoreException_
 #define _StoreException_
 
diff --git a/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp b/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
index d5aba62e0c..b1e3aa4240 100644
--- a/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
+++ b/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #include "qpid/broker/Broker.h"
 #include "qpid/Plugin.h"
 #include "qpid/Options.h"
diff --git a/qpid/cpp/src/qpid/legacystore/TxnCtxt.h b/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
index 5b80045a23..0fd49d6104 100644
--- a/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
+++ b/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
@@ -19,10 +19,6 @@
  *
  */
 
-/*
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- */
-
 #ifndef _TxnCtxt_
 #define _TxnCtxt_
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
index 1df8218fae..7d3a26434e 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
@@ -28,9 +28,6 @@
  * encapsulation). See comments in file aio.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat Inc.
- *
  */
 
 #include "aio.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/aio.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/aio.hpp
index ed807c1a8f..082535c8c1 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/aio.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio.hpp
@@ -28,9 +28,6 @@
  * by the journal.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_aio_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/aio_callback.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/aio_callback.hpp
index 3d6285e02a..a65e9a784b 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/aio_callback.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio_callback.hpp
@@ -28,9 +28,6 @@
  * pointer.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_aio_callback_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
index 8e988dbe59..3248254313 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
@@ -28,9 +28,6 @@
  * comments in file cvar.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat Inc.
- *
  */
 
 #include "jrnl/cvar.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/cvar.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.hpp
index e0149adeb7..bbc2e8e9fc 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/cvar.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.hpp
@@ -27,9 +27,6 @@
  * This file contains a posix condition variable class.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_cvar_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
index 8582dea84f..73484d5d6d 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
@@ -28,9 +28,6 @@
  * See comments in file data_tok.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #include "jrnl/data_tok.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.hpp
index 860bce6b1f..16537f59cc 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.hpp
@@ -28,9 +28,6 @@
  * See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_data_tok_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.hpp
index 5575c05a31..48b8673dc3 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.hpp
@@ -28,9 +28,6 @@
  * used to dequeue a previously enqueued record.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_deq_hdr_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
index 1c1dbe330a..ec6ba9ecf1 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
@@ -28,9 +28,6 @@
  * record) class. See comments in file deq_rec.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #include "jrnl/deq_rec.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.hpp
index cf7f79b293..a3059035e3 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.hpp
@@ -28,9 +28,6 @@
  * record) class. See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_deq_rec_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.hpp
index d04a39c701..a593db59c0 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.hpp
@@ -28,9 +28,6 @@
  * used to start an enqueue record in the journal.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_enq_hdr_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
index 4baf12fa73..3da8900366 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
@@ -28,9 +28,6 @@
  * comments in file enq_map.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009, 2010 Red Hat Inc.
- *
  */
 
 #include "jrnl/enq_map.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.hpp
index cf274240b5..34a802cfda 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.hpp
@@ -28,9 +28,6 @@
  * See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009, 2010 Red Hat Inc.
- *
  */
 
 #ifndef mrg_journal_enq_map_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
index d0fecb146b..d736ee54b3 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
@@ -28,9 +28,6 @@
  * record) class. See comments in file enq_rec.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #include "jrnl/enq_rec.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.hpp
index f151f73b1a..ce3d881d4e 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.hpp
@@ -26,9 +26,6 @@
  *
  * This file contains the code for the mrg::journal::enq_rec (journal enqueue
  * record) class. See class documentation for details.
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_enq_rec_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enums.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/enums.hpp
index 9020c64e1e..8dade01aa3 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enums.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enums.hpp
@@ -27,9 +27,6 @@
  * File containing definitions for namespace mrg::journal enums.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_enums_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
index ca3785b7d1..ef4b1a079d 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
@@ -27,9 +27,6 @@
  * File containing code for class mrg::journal::fcntl (non-logging file
  * handle), used for controlling journal log files. See comments in file
  * fcntl.hpp for details.
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #include "jrnl/fcntl.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.hpp
index 820d54c6ed..a7b28b2fe9 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.hpp
@@ -29,9 +29,6 @@
  * details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_fcntl_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.hpp
index 2bdd171587..4466ef5617 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.hpp
@@ -29,9 +29,6 @@
  * file metadata and information to aid journal recovery.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_file_hdr_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.hpp
index 08788b2ad6..183223fe7f 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.hpp
@@ -28,9 +28,6 @@
  * the journal.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_jcfg_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
index 2a1b483d6d..a96be022ae 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
@@ -28,9 +28,6 @@
  * mrg::journal::jcntl.  See comments in file jcntl.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009, 2010 Red Hat, Inc.
- *
  */
 
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.hpp
index 7b4902eda2..b7d4cc7ca7 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.hpp
@@ -28,9 +28,6 @@
  * mrg::journal::jcntl. See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009, 2010 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_jcntl_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
index e2598b2a52..9eedbb9a68 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
@@ -29,9 +29,6 @@
  * direcories and files. See comments in file jdir.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #include "jrnl/jdir.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jdir.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.hpp
index d9c531d150..364be32e56 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jdir.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.hpp
@@ -29,9 +29,6 @@
  * directories and files. See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_jdir_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
index 00b9244064..b2ecefdfb2 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
@@ -30,9 +30,6 @@
  * See file jerrno.hpp for class details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #include "jrnl/jerrno.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.hpp
index b27628c1e8..3709e3a651 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.hpp
@@ -28,9 +28,6 @@
  * codes). See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_jerrno_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
index 04f0515ff7..965a239753 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
@@ -28,9 +28,6 @@
  * in file jexception.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #include "jrnl/jexception.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jexception.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.hpp
index 62420c4672..33e9563642 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jexception.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.hpp
@@ -30,9 +30,6 @@
  * class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_jrnl_exception_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
index 6043525c3d..9d5ef1db84 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
@@ -29,9 +29,6 @@
  * See jinf.hpp comments for details of this class.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #include "jrnl/jinf.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jinf.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.hpp
index 4274f4bb03..0d3c9aa552 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jinf.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.hpp
@@ -27,9 +27,6 @@
  * This file contains the code for the mrg::journal::jinf class.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_jinf_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
index 2b3b28599d..49299a126c 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
@@ -28,9 +28,6 @@
  * jrecord). See comments in file jrec.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #include "jrnl/jrec.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jrec.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.hpp
index 69d038ba48..abb77bbd2d 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jrec.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.hpp
@@ -28,9 +28,6 @@
  * jrecord). See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_jrec_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
index fa55c3ebd3..bbfe9794d8 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
@@ -28,9 +28,6 @@
  * comments in file lp_map.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2008, 2009 Red Hat Inc.
- *
  */
 
 #include "jrnl/lp_map.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.hpp
index 6562f61d9c..6ac39695d2 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.hpp
@@ -28,9 +28,6 @@
  * See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2008, 2009 Red Hat Inc.
- *
  */
 
 #ifndef mrg_journal_lp_map_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
index 0e0c0c34fd..f7e9176172 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
@@ -29,9 +29,6 @@
  * lpmgr.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2008, 2009 Red Hat, Inc.
- *
  */
 
 #include "jrnl/lpmgr.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.hpp
index bc9654314a..3528db6f72 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.hpp
@@ -27,9 +27,6 @@
  * Class mrg::journal::lpmgr. See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_lpmgr_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
index c2e7625afa..f5e26231e9 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
@@ -28,9 +28,6 @@
  * comments in file pmgr.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #include "jrnl/pmgr.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.hpp
index bca22deb40..3ce8851d70 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.hpp
@@ -28,9 +28,6 @@
  * class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_pmgr_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.hpp
index bebcbb33ce..90f5a5ad58 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.hpp
@@ -27,9 +27,6 @@
  * Contains structure for recovery status and offset data.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_rcvdat_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.hpp
index 31ed4c3b1d..852aabd7b6 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.hpp
@@ -29,9 +29,6 @@
  * except the record tail (rec_tail).
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_rec_hdr_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.hpp
index 134e4df4e7..914e21d5c9 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.hpp
@@ -29,9 +29,6 @@
  * position in the journal file indicates that the record write was completed.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_rec_tail_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
index a269ea1cc3..95b55696dc 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
@@ -28,9 +28,6 @@
  * file controller). See comments in file rfc.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2008, 2009 Red Hat, Inc.
- *
  */
 
 #include "jrnl/rfc.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rfc.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.hpp
index f12ee55453..6b0483da5a 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rfc.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.hpp
@@ -28,9 +28,6 @@
  * file controller). See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_rfc_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
index f714716f7f..4485019b75 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
@@ -28,9 +28,6 @@
  * comments in file rmgr.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009, 2010 Red Hat, Inc.
- *
  */
 
 #include "jrnl/rmgr.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.hpp
index d9ad68efa4..8f053b9dfc 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.hpp
@@ -28,9 +28,6 @@
  * class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_rmgr_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
index 5b644d629b..9dd061838a 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
@@ -28,11 +28,6 @@
  * file controller). See comments in file rrfc.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
- * This file is part of the Qpid async store library msgstore.so.
- *
  */
 
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.hpp
index dd76e00eff..afd5f71f3c 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.hpp
@@ -28,9 +28,6 @@
  * file controller). See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_rrfc_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
index cb9f6ce3c0..f5047b7598 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
@@ -28,9 +28,6 @@
  * comments in file slock.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat Inc.
- *
  */
 
 #include "jrnl/slock.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/slock.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/slock.hpp
index 264d88af4c..2e8fc68c25 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/slock.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/slock.hpp
@@ -28,9 +28,6 @@
  * class mrg::journal::stlock.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_slock_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
index fd1de019e9..d00bade5f4 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
@@ -28,9 +28,6 @@
  * comments in file smutex.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2010 Red Hat Inc.
- *
  */
 
 #include "jrnl/smutex.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/smutex.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.hpp
index 14a1f65506..a0c21cbb4d 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/smutex.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.hpp
@@ -27,9 +27,6 @@
  * Messaging journal scoped mutex class mrg::journal::smutex.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2010 Red Hat, Inc.
- *
  */
 
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
index 7be24bad11..8205e3bc2e 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
@@ -28,9 +28,6 @@
  * the timespec struct and provided with helper functions.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2008 Red Hat, Inc.
- *
  */
 
 #include "time_ns.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.hpp
index 024e05f393..fd910f8e4c 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.hpp
@@ -28,9 +28,6 @@
  * the timespec struct and provided with helper functions.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_jtt_time_ns_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.hpp
index 24785e46b2..e9a9b3137c 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.hpp
@@ -28,9 +28,6 @@
  * record header), used to start a transaction (commit or abort) record.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_txn_hdr_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
index e35eb05e88..ce8bdcaee3 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
@@ -28,9 +28,6 @@
  * comments in file txn_map.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009, 2010 Red Hat Inc.
- *
  */
 
 #include "jrnl/txn_map.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.hpp
index 25038506c2..dab7aa76d1 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.hpp
@@ -28,9 +28,6 @@
  * See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009, 2010 Red Hat Inc.
- *
  */
 
 #ifndef mrg_journal_txn_map_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
index 5376269dc2..f4d6f67971 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
@@ -28,9 +28,6 @@
  * record) class. See comments in file txn_rec.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #include "jrnl/txn_rec.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.hpp
index 52c1d62ad2..a295f56612 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.hpp
@@ -28,9 +28,6 @@
  * record) class. See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_txn_rec_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
index 65c01756e3..6d264c0a0d 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
@@ -28,9 +28,6 @@
  * comments in file wmgr.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009, 2010 Red Hat, Inc.
- *
  */
 
 #include "jrnl/wmgr.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.hpp
index b26ab58c14..8496f091e6 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.hpp
@@ -28,9 +28,6 @@
  * class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_wmgr_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
index f254169623..ede6de62e8 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
@@ -28,9 +28,6 @@
  * file controller). See comments in file rrfc.hpp for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #include "jrnl/wrfc.hpp"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.hpp b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.hpp
index b2a1763ec2..f71eb4f317 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.hpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.hpp
@@ -28,9 +28,6 @@
  * file controller). See class documentation for details.
  *
  * \author Kim van der Riet
- *
- * Copyright (c) 2007, 2008, 2009 Red Hat, Inc.
- *
  */
 
 #ifndef mrg_journal_wrfc_hpp
diff --git a/qpid/cpp/src/qpid/legacystore/management-schema.xml b/qpid/cpp/src/qpid/legacystore/management-schema.xml
index 6f96fc4398..65969f0fb2 100644
--- a/qpid/cpp/src/qpid/legacystore/management-schema.xml
+++ b/qpid/cpp/src/qpid/legacystore/management-schema.xml
@@ -8,9 +8,9 @@
  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
@@ -19,10 +19,6 @@
  under the License.
 -->
 
-<!--
- Copyright (c) 2007, 2008 Red Hat, Inc.
- -->
-
   <class name="Store">
     <property name="brokerRef"               type="objId"  access="RO" references="qpid.Broker" index="y" parentRef="y"/>
     <property name="location"                type="sstr"   access="RO"              desc="Logical directory on disk"/>
@@ -35,7 +31,7 @@
     <property name="tplInitialFileCount"     type="uint16" access="RO" unit="file"  desc="Number of files initially allocated to transaction prepared list journal"/>
     <property name="tplDataFileSize"         type="uint32" access="RO" unit="byte"  desc="Size of each journal data file in transaction prepared list journal"/>
     <property name="tplCurrentFileCount"     type="uint32" access="RO" unit="file"  desc="Number of files currently allocated to transaction prepared list journal"/>
-    
+
     <statistic name="tplTransactionDepth"    type="hilo32"  unit="txn"    desc="Number of currently enqueued prepared transactions"/>
     <statistic name="tplTxnPrepares"         type="count64" unit="record" desc="Total transaction prepares on transaction prepared list"/>
     <statistic name="tplTxnCommits"          type="count64" unit="record" desc="Total transaction commits on transaction prepared list"/>
@@ -57,7 +53,7 @@
     <property name="currentFileCount"   type="uint16" access="RO" unit="file"  desc="Number of files currently allocated to this journal"/>
     <property name="maxFileCount"       type="uint16" access="RO" unit="file"  desc="Max number of files allowed for this journal"/>
     <property name="dataFileSize"       type="uint32" access="RO" unit="byte"  desc="Size of each journal data file"/>
-    
+
     <statistic name="recordDepth"       type="hilo32"  unit="record" desc="Number of currently enqueued records (durable messages)"/>
     <statistic name="enqueues"          type="count64" unit="record" desc="Total enqueued records on journal"/>
     <statistic name="dequeues"          type="count64" unit="record" desc="Total dequeued records on journal"/>
@@ -84,7 +80,7 @@
       <arg name="by" type="uint32" dir="I" desc="Number of files to increase journal size by"/>
     </method>
   </class>
- 
+
   <eventArguments>
     <arg name="autoExpand" type="bool"   desc="Journal auto-expand enabled"/>
     <arg name="fileSize"   type="uint32" desc="Journal file size in bytes"/>