You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2012/08/28 20:30:19 UTC
svn commit: r1378257 - in /qpid/branches/asyncstore/cpp/src:
qpid/asyncStore/ qpid/asyncStore/jrnl2/ qpid/broker/
tests/storePerftools/asyncPerf/ tests/storePerftools/common/
Author: kpvdr
Date: Tue Aug 28 18:30:16 2012
New Revision: 1378257
URL: http://svn.apache.org/viewvc?rev=1378257&view=rev
Log:
QPID-3858: Cleanup, removed old comments and tidied up include statements
Modified:
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncOperation.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EventHandleImpl.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/RunState.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/State.h
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h
qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.h
qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.h
qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.h
qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.h
qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.h
qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.h
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliverable.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.h
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.h
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.h
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueue.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.h
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.h
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.h
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.h
qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.h
qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.cpp
qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Parameters.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Streamable.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestOptions.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestResult.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Thread.cpp
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncOperation.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncOperation.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncOperation.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncOperation.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file AsyncOperation.cpp
*/
-#include "AsyncOperation.h"
+#include "qpid/asyncStore/AsyncOperation.h"
#include "qpid/broker/AsyncResultHandle.h"
#include "qpid/broker/AsyncResultHandleImpl.h"
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp Tue Aug 28 18:30:16 2012
@@ -21,16 +21,15 @@
* \file AsyncStoreImpl.cpp
*/
-#include "AsyncStoreImpl.h"
-
-#include "AsyncOperation.h"
-#include "ConfigHandleImpl.h"
-#include "EnqueueHandleImpl.h"
-#include "EventHandleImpl.h"
-#include "MessageHandleImpl.h"
-#include "QueueHandleImpl.h"
-#include "TxnHandleImpl.h"
+#include "qpid/asyncStore/AsyncStoreImpl.h"
+#include "qpid/asyncStore/AsyncOperation.h"
+#include "qpid/asyncStore/ConfigHandleImpl.h"
+#include "qpid/asyncStore/EnqueueHandleImpl.h"
+#include "qpid/asyncStore/EventHandleImpl.h"
+#include "qpid/asyncStore/MessageHandleImpl.h"
+#include "qpid/asyncStore/QueueHandleImpl.h"
+#include "qpid/asyncStore/TxnHandleImpl.h"
#include "qpid/broker/ConfigHandle.h"
#include "qpid/broker/EnqueueHandle.h"
#include "qpid/broker/EventHandle.h"
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreImpl.h Tue Aug 28 18:30:16 2012
@@ -24,11 +24,10 @@
#ifndef qpid_asyncStore_AsyncStoreImpl_h_
#define qpid_asyncStore_AsyncStoreImpl_h_
-#include "AsyncStoreOptions.h"
-#include "RunState.h"
-#include "OperationQueue.h"
-
+#include "qpid/asyncStore/AsyncStoreOptions.h"
#include "qpid/asyncStore/jrnl2/RecordIdCounter.h"
+#include "qpid/asyncStore/RunState.h"
+#include "qpid/asyncStore/OperationQueue.h"
#include "qpid/broker/AsyncStore.h"
namespace qpid {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file AsyncStoreOptions.cpp
*/
-#include "AsyncStoreOptions.h"
+#include "qpid/asyncStore/AsyncStoreOptions.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file ConfigHandleImpl.cpp
*/
-#include "ConfigHandleImpl.h"
+#include "qpid/asyncStore/ConfigHandleImpl.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file EnqueueHandleImpl.cpp
*/
-#include "EnqueueHandleImpl.h"
+#include "qpid/asyncStore/EnqueueHandleImpl.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EventHandleImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EventHandleImpl.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EventHandleImpl.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/EventHandleImpl.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file EventHandleImpl.cpp
*/
-#include "EventHandleImpl.h"
+#include "qpid/asyncStore/EventHandleImpl.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file MessageHandleImpl.cpp
*/
-#include "MessageHandleImpl.h"
+#include "qpid/asyncStore/MessageHandleImpl.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file OperationQueue.cpp
*/
-#include "OperationQueue.h"
+#include "qpid/asyncStore/OperationQueue.h"
#include "qpid/broker/AsyncResultHandle.h"
#include "qpid/broker/AsyncResultHandleImpl.h"
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/OperationQueue.h Tue Aug 28 18:30:16 2012
@@ -24,8 +24,7 @@
#ifndef qpid_asyncStore_OperationQueue_h_
#define qpid_asyncStore_OperationQueue_h_
-#include "AsyncOperation.h"
-
+#include "qpid/asyncStore/AsyncOperation.h"
#include "qpid/sys/PollableQueue.h"
namespace qpid {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp Tue Aug 28 18:30:16 2012
@@ -1,4 +1,27 @@
-#include "PersistableMessageContext.h"
+/*
+ * 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.
+ */
+
+/**
+ * \file PersistableMessageContext.cpp
+ */
+
+#include "qpid/asyncStore/PersistableMessageContext.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/PersistableMessageContext.h Tue Aug 28 18:30:16 2012
@@ -1,3 +1,26 @@
+/*
+ * 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.
+ */
+
+/**
+ * \file PersistableMessageContext.h
+ */
+
#ifndef qpid_asyncStore_PersistableMessageContext_h_
#define qpid_asyncStore_PersistableMessageContext_h_
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.cpp Tue Aug 28 18:30:16 2012
@@ -21,10 +21,9 @@
* \file Plugin.cpp
*/
-#include "Plugin.h"
-
-#include "AsyncStoreImpl.h"
+#include "qpid/asyncStore/Plugin.h"
+#include "qpid/asyncStore/AsyncStoreImpl.h"
#include "qpid/broker/Broker.h"
namespace qpid {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/Plugin.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_broker_Plugin_h_
#define qpid_broker_Plugin_h_
-#include "AsyncStoreOptions.h"
+#include "qpid/asyncStore/AsyncStoreOptions.h"
#include "qpid/Plugin.h"
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file QueueHandleImpl.cpp
*/
-#include "QueueHandleImpl.h"
+#include "qpid/asyncStore/QueueHandleImpl.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/RunState.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/RunState.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/RunState.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/RunState.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file RunState.cpp
*/
-#include "RunState.h"
+#include "qpid/asyncStore/RunState.h"
#include "qpid/Exception.h"
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file TxnHandleImpl.cpp
*/
-#include "TxnHandleImpl.h"
+#include "qpid/asyncStore/TxnHandleImpl.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h Tue Aug 28 18:30:16 2012
@@ -24,9 +24,9 @@
#ifndef qpid_asyncStore_jrnl2_AsyncJournal_h_
#define qpid_asyncStore_jrnl2_AsyncJournal_h_
-#include "JournalDirectory.h"
-#include "JournalRunState.h"
-#include "ScopedLock.h"
+#include "qpid/asyncStore/jrnl2/JournalDirectory.h"
+#include "qpid/asyncStore/jrnl2/JournalRunState.h"
+#include "qpid/asyncStore/jrnl2/ScopedLock.h"
#include <string>
#include <stdint.h> // uint64_t, uint32_t, etc.
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_asyncStore_jrnl2_AtomicCounter_h_
#define qpid_asyncStore_jrnl2_AtomicCounter_h_
-#include "ScopedLock.h"
+#include "qpid/asyncStore/jrnl2/ScopedLock.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file DataOpState.cpp
*/
-#include "DataOpState.h"
+#include "qpid/asyncStore/jrnl2/DataOpState.h"
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
#include <sstream> // std::ostringstream
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_asyncStore_jrnl2_DataOpState_h_
#define qpid_asyncStore_jrnl2_DataOpState_h_
-#include "State.h"
+#include "qpid/asyncStore/jrnl2/State.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file DataToken.cpp
*/
-#include "DataToken.h"
+#include "qpid/asyncStore/jrnl2/DataToken.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataToken.h Tue Aug 28 18:30:16 2012
@@ -24,9 +24,9 @@
#ifndef qpid_jrnl2_asyncStore_DataToken_h_
#define qpid_jrnl2_asyncStore_DataToken_h_
-#include "DataOpState.h"
-#include "DataWrComplState.h"
-#include "RecordIdCounter.h"
+#include "qpid/asyncStore/jrnl2/DataOpState.h"
+#include "qpid/asyncStore/jrnl2/DataWrComplState.h"
+#include "qpid/asyncStore/jrnl2/RecordIdCounter.h"
#include <string>
#include <stdint.h> // uint64_t
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file DataWrComplState.cpp
*/
-#include "DataWrComplState.h"
+#include "qpid/asyncStore/jrnl2/DataWrComplState.h"
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
#include <sstream> // std::ostringstream
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_asyncStore_jrnl2_DataWrComplState_h_
#define qpid_asyncStore_jrnl2_DataWrComplState_h_
-#include "State.h"
+#include "qpid/asyncStore/jrnl2/State.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file DequeueHeader.cpp
*/
-#include "DequeueHeader.h"
+#include "qpid/asyncStore/jrnl2/DequeueHeader.h"
-#include "RecordTail.h"
+#include "qpid/asyncStore/jrnl2/RecordTail.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h Tue Aug 28 18:30:16 2012
@@ -54,7 +54,7 @@
#ifndef qpid_asyncStore_jrnl2_DequeueHeader_h_
#define qpid_asyncStore_jrnl2_DequeueHeader_h_
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file EnqueueHeader.cpp
*/
-#include "EnqueueHeader.h"
+#include "qpid/asyncStore/jrnl2/EnqueueHeader.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h Tue Aug 28 18:30:16 2012
@@ -54,7 +54,7 @@
#ifndef qpid_asyncStore_jrnl2_EnqueueHeader_h_
#define qpid_asyncStore_jrnl2_EnqueueHeader_h_
-#include "EventHeader.h"
+#include "qpid/asyncStore/jrnl2/EventHeader.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file EventHeader.cpp
*/
-#include "EventHeader.h"
+#include "qpid/asyncStore/jrnl2/EventHeader.h"
-#include "RecordTail.h"
+#include "qpid/asyncStore/jrnl2/RecordTail.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h Tue Aug 28 18:30:16 2012
@@ -54,7 +54,7 @@
#ifndef qpid_asyncStore_jrnl2_EventHeader_h_
#define qpid_asyncStore_jrnl2_EventHeader_h_
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file FileHeader.cpp
*/
-#include "FileHeader.h"
+#include "qpid/asyncStore/jrnl2/FileHeader.h"
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
#include <cerrno>
#include <cstring>
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h Tue Aug 28 18:30:16 2012
@@ -54,7 +54,7 @@
#ifndef qpid_asyncStore_jrnl2_FileHeader_h_
#define qpid_asyncStore_jrnl2_FileHeader_h_
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
struct timespec;
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp Tue Aug 28 18:30:16 2012
@@ -20,9 +20,9 @@
/**
* \file JournalDirectory.cpp
*/
-#include "JournalDirectory.h"
+#include "qpid/asyncStore/jrnl2/JournalDirectory.h"
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
#include <cstring>
#include <dirent.h>
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file JournalError.cpp
*/
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
#include <iomanip> // std::setfill(), std::setw()
#include <sstream> // std::ostringstream
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalError.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_asyncStore_jrnl2_JournalError_hpp_
#define qpid_asyncStore_jrnl2_JournalError_hpp_
-#include "Streamable.h"
+#include "qpid/asyncStore/jrnl2/Streamable.h"
#include <map>
#include <stdexcept> // std::runtime_error
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file JournalParameters.cpp
*/
-#include "JournalParameters.h"
+#include "qpid/asyncStore/jrnl2/JournalParameters.h"
#include <sstream>
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file JournalRunState.cpp
*/
-#include "JournalRunState.h"
+#include "qpid/asyncStore/jrnl2/JournalRunState.h"
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
#include <sstream>
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_asyncStore_jrnl2_JournalRunState_h_
#define qpid_asyncStore_jrnl2_JournalRunState_h_
-#include "State.h"
+#include "qpid/asyncStore/jrnl2/State.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file RecordHeader.cpp
*/
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
-#include "Configuration.h"
+#include "qpid/asyncStore/jrnl2/Configuration.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_asyncStore_jrnl2_RecordCounter_h_
#define qpid_asyncStore_jrnl2_RecordCounter_h_
-#include "AtomicCounter.h"
+#include "qpid/asyncStore/jrnl2/AtomicCounter.h"
#include <stdint.h> // uint64_t
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp Tue Aug 28 18:30:16 2012
@@ -22,9 +22,9 @@
*/
-#include "RecordTail.h"
+#include "qpid/asyncStore/jrnl2/RecordTail.h"
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file ScopedLock.cpp
*/
-#include "ScopedLock.h"
+#include "qpid/asyncStore/jrnl2/ScopedLock.h"
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
#include <cerrno> // EBUSY
#include <cstring> // std::strerror
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/State.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/State.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/State.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/State.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_asyncStore_jrnl2_State_h_
#define qpid_asyncStore_jrnl2_State_h_
-#include "Streamable.h"
+#include "qpid/asyncStore/jrnl2/Streamable.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file Streamable.cpp
*/
-#include "Streamable.h"
+#include "qpid/asyncStore/jrnl2/Streamable.h"
#include <sstream>
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp Tue Aug 28 18:30:16 2012
@@ -21,8 +21,9 @@
* \file TransactionHeader.cpp
*/
-#include "RecordTail.h"
-#include "TransactionHeader.h"
+#include "qpid/asyncStore/jrnl2/TransactionHeader.h"
+
+#include "qpid/asyncStore/jrnl2/RecordTail.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h Tue Aug 28 18:30:16 2012
@@ -54,7 +54,7 @@
#ifndef qpid_asyncStore_jrnl2_TransactionHeader_h_
#define qpid_asyncStore_jrnl2_TransactionHeader_h_
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.cpp Tue Aug 28 18:30:16 2012
@@ -21,10 +21,10 @@
* \file AsyncResultHandle.cpp
*/
-#include "AsyncResultHandle.h"
+#include "qpid/broker/AsyncResultHandle.h"
-#include "AsyncResultHandleImpl.h"
-#include "PrivateImplRef.h"
+#include "qpid/broker/AsyncResultHandleImpl.h"
+#include "qpid/broker/PrivateImplRef.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandle.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_broker_AsyncResultHandle_h_
#define qpid_broker_AsyncResultHandle_h_
-#include "Handle.h"
+#include "qpid/broker/Handle.h"
#include <boost/shared_ptr.hpp>
#include <string>
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file AsyncResultHandleImpl.cpp
*/
-#include "AsyncResultHandleImpl.h"
+#include "qpid/broker/AsyncResultHandleImpl.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultHandleImpl.h Tue Aug 28 18:30:16 2012
@@ -24,8 +24,7 @@
#ifndef qpid_broker_AsyncResultHandleImpl_h_
#define qpid_broker_AsyncResultHandleImpl_h_
-#include "AsyncStore.h"
-
+#include "qpid/broker/AsyncStore.h"
#include "qpid/RefCounted.h"
namespace qpid {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp Tue Aug 28 18:30:16 2012
@@ -21,10 +21,9 @@
* \file AsyncResultQueueImpl.cpp
*/
-#include "AsyncResultQueueImpl.h"
-
-#include "AsyncResultHandle.h"
+#include "qpid/broker/AsyncResultQueueImpl.h"
+#include "qpid/broker/AsyncResultHandle.h"
#include "qpid/log/Statement.h"
namespace qpid {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/AsyncResultQueueImpl.h Tue Aug 28 18:30:16 2012
@@ -24,8 +24,7 @@
#ifndef qpid_broker_AsyncResultQueueImpl_h_
#define qpid_broker_AsyncResultQueueImpl_h_
-#include "AsyncStore.h"
-
+#include "qpid/broker/AsyncStore.h"
#include "qpid/sys/PollableQueue.h"
namespace qpid {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.cpp Tue Aug 28 18:30:16 2012
@@ -21,10 +21,9 @@
* \file ConfigHandle.cpp
*/
-#include "ConfigHandle.h"
-
-#include "PrivateImplRef.h"
+#include "qpid/broker/ConfigHandle.h"
+#include "qpid/broker/PrivateImplRef.h"
#include "qpid/asyncStore/ConfigHandleImpl.h"
namespace qpid {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/ConfigHandle.h Tue Aug 28 18:30:16 2012
@@ -24,9 +24,8 @@
#ifndef qpid_broker_ConfigHandle_h_
#define qpid_broker_ConfigHandle_h_
-#include "Handle.h"
-
#include "qpid/asyncStore/AsyncStoreHandle.h"
+#include "qpid/broker/Handle.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.cpp Tue Aug 28 18:30:16 2012
@@ -21,11 +21,10 @@
* \file EnqueueHandle.cpp
*/
-#include "EnqueueHandle.h"
-
-#include "PrivateImplRef.h"
+#include "qpid/broker/EnqueueHandle.h"
#include "qpid/asyncStore/EnqueueHandleImpl.h"
+#include "qpid/broker/PrivateImplRef.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/EnqueueHandle.h Tue Aug 28 18:30:16 2012
@@ -24,9 +24,8 @@
#ifndef qpid_broker_EnqueueHandle_h_
#define qpid_broker_EnqueueHandle_h_
-#include "Handle.h"
-
#include "qpid/asyncStore/AsyncStoreHandle.h"
+#include "qpid/broker/Handle.h"
namespace qpid {
namespace asyncStore {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.cpp Tue Aug 28 18:30:16 2012
@@ -21,11 +21,10 @@
* \file EventHandle.cpp
*/
-#include "EventHandle.h"
-
-#include "PrivateImplRef.h"
+#include "qpid/broker/EventHandle.h"
#include "qpid/asyncStore/EventHandleImpl.h"
+#include "qpid/broker/PrivateImplRef.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/EventHandle.h Tue Aug 28 18:30:16 2012
@@ -24,9 +24,8 @@
#ifndef qpid_broker_EventHandle_h_
#define qpid_broker_EventHandle_h_
-#include "Handle.h"
-
#include "qpid/asyncStore/AsyncStoreHandle.h"
+#include "qpid/broker/Handle.h"
#include <string>
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliverable.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliverable.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliverable.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliverable.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file SimpleDeliverable.cpp
*/
-#include "SimpleDeliverable.h"
+#include "qpid/broker/SimpleDeliverable.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp Tue Aug 28 18:30:16 2012
@@ -21,12 +21,12 @@
* \file SimpleDeliveryRecord.cpp
*/
-#include "SimpleDeliveryRecord.h"
+#include "qpid/broker/SimpleDeliveryRecord.h"
-#include "SimpleConsumer.h"
-#include "SimpleMessage.h"
-#include "SimpleQueue.h"
-#include "SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleConsumer.h"
+#include "qpid/broker/SimpleMessage.h"
+#include "qpid/broker/SimpleQueue.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file SimpleMessage.cpp
*/
-#include "SimpleMessage.h"
+#include "qpid/broker/SimpleMessage.h"
#include <string.h> // memcpy()
@@ -37,74 +37,13 @@ SimpleMessage::SimpleMessage(const char*
m_persistentContext(persistentContext)
{}
-
-/*
-SimpleMessage::SimpleMessage(const char* msgData,
- const uint32_t msgSize) :
- m_persistenceId(0ULL),
- m_msg(msgData, static_cast<size_t>(msgSize)),
- m_store(0),
- m_msgHandle(MessageHandle())
-{}
-
-SimpleMessage::SimpleMessage(const char* msgData,
- const uint32_t msgSize,
- AsyncStore* store) :
- m_persistenceId(0ULL),
- m_msg(msgData, static_cast<size_t>(msgSize)),
- m_store(store),
- m_msgHandle(store ? store->createMessageHandle(this) : MessageHandle())
-{}
-*/
-
SimpleMessage::~SimpleMessage() {}
-/*
-const MessageHandle&
-SimpleMessage::getHandle() const {
- return m_persistentContext.getHandle();
-}
-
-MessageHandle&
-SimpleMessage::getHandle() {
- return m_persistentContext.getHandle();
-}
-*/
-
uint64_t
SimpleMessage::contentSize() const {
return static_cast<uint64_t>(m_msg.size());
}
-/*
-void
-SimpleMessage::setPersistenceId(uint64_t id) const {
- m_persistenceId = id;
-}
-
-uint64_t
-SimpleMessage::getPersistenceId() const {
- return m_persistenceId;
-}
-
-void
-SimpleMessage::encode(qpid::framing::Buffer& buffer) const {
- buffer.putRawData(m_msg);
-}
-
-uint32_t
-SimpleMessage::encodedSize() const {
- return static_cast<uint32_t>(m_msg.size());
-}
-
-void
-SimpleMessage::allDequeuesComplete() {}
-
-uint32_t
-SimpleMessage::encodedHeaderSize() const {
- return 0;
-}
-*/
bool
SimpleMessage::isPersistent() const {
return m_persistentContext.get() != 0;
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessage.h Tue Aug 28 18:30:16 2012
@@ -24,15 +24,13 @@
#ifndef qpid_broker_SimpleMessage_h_
#define qpid_broker_SimpleMessage_h_
-#include "AsyncStore.h" // DataSource
-//#include "MessageHandle.h"
-#include "PersistableMessage.h"
+#include "qpid/broker/AsyncStore.h" // DataSource
+#include "qpid/broker/PersistableMessage.h"
namespace qpid {
namespace broker {
-class SimpleMessage: /*public PersistableMessage,*/
- public DataSource,
+class SimpleMessage: public DataSource,
public RefCounted
{
public:
@@ -41,20 +39,8 @@ public:
const uint32_t msgSize,
boost::intrusive_ptr<PersistableMessage> persistentContext);
virtual ~SimpleMessage();
-// const MessageHandle& getHandle() const;
-// MessageHandle& getHandle();
uint64_t contentSize() const;
-// // --- Interface Persistable ---
-// virtual void setPersistenceId(uint64_t id) const;
-// virtual uint64_t getPersistenceId() const;
-// virtual void encode(qpid::framing::Buffer& buffer) const;
-// virtual uint32_t encodedSize() const;
-//
-// // --- Interface PersistableMessage ---
-// virtual void allDequeuesComplete();
-// virtual uint32_t encodedHeaderSize() const;
-
// Persistent operations
bool isPersistent() const;
boost::intrusive_ptr<PersistableMessage> getPersistentContext() const;
@@ -64,12 +50,8 @@ public:
virtual void write(char* target);
private:
-// mutable uint64_t m_persistenceId;
const std::string m_msg;
boost::intrusive_ptr<PersistableMessage> m_persistentContext;
-// AsyncStore* m_store;
-
-// MessageHandle m_msgHandle;
};
}} // namespace qpid::broker
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file SimpleMessageAsyncContext.cpp
*/
-#include "SimpleMessageAsyncContext.h"
+#include "qpid/broker/SimpleMessageAsyncContext.h"
-#include "SimpleMessage.h"
+#include "qpid/broker/SimpleMessage.h"
#include <cassert>
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageAsyncContext.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef qpid_broker_SimpleMessageAsyncContext_h_
#define qpid_broker_SimpleMessageAsyncContext_h_
-#include "AsyncStore.h" // BrokerAsyncContext
+#include "qpid/broker/AsyncStore.h" // BrokerAsyncContext
#include <boost/intrusive_ptr.hpp>
#include <boost/shared_ptr.hpp>
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file SimpleMessageDeque.cpp
*/
-#include "SimpleMessageDeque.h"
+#include "qpid/broker/SimpleMessageDeque.h"
-#include "SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleMessageDeque.h Tue Aug 28 18:30:16 2012
@@ -29,7 +29,7 @@
#ifndef qpid_broker_SimpleMessageDeque_h_
#define qpid_broker_SimpleMessageDeque_h_
-#include "SimpleMessages.h"
+#include "qpid/broker/SimpleMessages.h"
#include "qpid/sys/Mutex.h"
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueue.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueue.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueue.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueue.cpp Tue Aug 28 18:30:16 2012
@@ -21,16 +21,16 @@
* \file SimpleQueue.cpp
*/
-#include "SimpleQueue.h"
+#include "qpid/broker/SimpleQueue.h"
-#include "AsyncResultHandle.h"
-#include "QueueAsyncContext.h"
-#include "SimpleConsumer.h"
-#include "SimpleDeliveryRecord.h"
-#include "SimpleMessage.h"
-#include "SimpleMessageDeque.h"
-#include "SimpleQueuedMessage.h"
-#include "SimpleTxnBuffer.h"
+#include "qpid/broker/AsyncResultHandle.h"
+#include "qpid/broker/QueueAsyncContext.h"
+#include "qpid/broker/SimpleConsumer.h"
+#include "qpid/broker/SimpleDeliveryRecord.h"
+#include "qpid/broker/SimpleMessage.h"
+#include "qpid/broker/SimpleMessageDeque.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleTxnBuffer.h"
#include <string.h> // memcpy()
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.cpp Tue Aug 28 18:30:16 2012
@@ -21,10 +21,10 @@
* \file SimpleQueuedMessage.cpp
*/
-#include "SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
-#include "SimpleMessage.h"
-#include "SimpleQueue.h"
+#include "qpid/broker/SimpleMessage.h"
+#include "qpid/broker/SimpleQueue.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleQueuedMessage.h Tue Aug 28 18:30:16 2012
@@ -24,8 +24,8 @@
#ifndef qpid_broker_SimpleQueuedMessage_h_
#define qpid_broker_SimpleQueuedMessage_h_
-#include "AsyncStore.h"
-#include "EnqueueHandle.h"
+#include "qpid/broker/AsyncStore.h"
+#include "qpid/broker/EnqueueHandle.h"
#include <boost/enable_shared_from_this.hpp>
#include <boost/intrusive_ptr.hpp>
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.cpp Tue Aug 28 18:30:16 2012
@@ -21,10 +21,9 @@
* \file SimpleTxnAccept.cpp
*/
-#include "SimpleTxnAccept.h"
-
-#include "SimpleDeliveryRecord.h"
+#include "qpid/broker/SimpleTxnAccept.h"
+#include "qpid/broker/SimpleDeliveryRecord.h"
#include "qpid/log/Statement.h"
namespace qpid {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnAccept.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef tests_storePerftools_asyncPerf_SimpleTxnAccept_h_
#define tests_storePerftools_asyncPerf_SimpleTxnAccept_h_
-#include "SimpleTxnOp.h"
+#include "qpid/broker/SimpleTxnOp.h"
#include "boost/shared_ptr.hpp"
#include <deque>
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.cpp Tue Aug 28 18:30:16 2012
@@ -21,12 +21,11 @@
* \file SimpleTxnBuffer.cpp
*/
-#include "SimpleTxnBuffer.h"
-
-#include "AsyncResultHandle.h"
-#include "SimpleTxnOp.h"
-#include "TxnAsyncContext.h"
+#include "qpid/broker/SimpleTxnBuffer.h"
+#include "qpid/broker/AsyncResultHandle.h"
+#include "qpid/broker/SimpleTxnOp.h"
+#include "qpid/broker/TxnAsyncContext.h"
#include "qpid/log/Statement.h"
#include <uuid/uuid.h>
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnBuffer.h Tue Aug 28 18:30:16 2012
@@ -24,8 +24,7 @@
#ifndef qpid_broker_SimpleTxnBuffer_h_
#define qpid_broker_SimpleTxnBuffer_h_
-#include "TxnHandle.h"
-
+#include "qpid/broker/TxnHandle.h"
#include "qpid/sys/Mutex.h"
#include <boost/shared_ptr.hpp>
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.cpp Tue Aug 28 18:30:16 2012
@@ -21,14 +21,12 @@
* \file SimpleTxnPublish.cpp
*/
-#include "SimpleTxnPublish.h"
-
-#include "SimpleMessage.h"
-#include "SimpleQueue.h"
-#include "SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleTxnPublish.h"
+#include "qpid/broker/SimpleMessage.h"
+#include "qpid/broker/SimpleQueue.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
#include "qpid/log/Statement.h"
-#include <boost/make_shared.hpp>
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/SimpleTxnPublish.h Tue Aug 28 18:30:16 2012
@@ -24,8 +24,8 @@
#ifndef qpid_broker_SimpleTxnPublish_h_
#define qpid_broker_SimpleTxnPublish_h_
-#include "SimpleDeliverable.h"
-#include "SimpleTxnOp.h"
+#include "qpid/broker/SimpleDeliverable.h"
+#include "qpid/broker/SimpleTxnOp.h"
#include <boost/intrusive_ptr.hpp>
#include <boost/shared_ptr.hpp>
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file TransactionAsyncContext.cpp
*/
-#include "TxnAsyncContext.h"
+#include "qpid/broker/TxnAsyncContext.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/TxnAsyncContext.h Tue Aug 28 18:30:16 2012
@@ -24,9 +24,8 @@
#ifndef qpid_broker_TxnAsyncContext_h_
#define qpid_broker_TxnAsyncContext_h_
-#include "AsyncStore.h" // qpid::broker::BrokerAsyncContext
-
#include "qpid/asyncStore/AsyncOperation.h"
+#include "qpid/broker/AsyncStore.h" // qpid::broker::BrokerAsyncContext
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.cpp Tue Aug 28 18:30:16 2012
@@ -21,11 +21,10 @@
* \file TxnHandle.cpp
*/
-#include "TxnHandle.h"
-
-#include "PrivateImplRef.h"
+#include "qpid/broker/TxnHandle.h"
#include "qpid/asyncStore/TxnHandleImpl.h"
+#include "qpid/broker/PrivateImplRef.h"
namespace qpid {
namespace broker {
Modified: qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.h (original)
+++ qpid/branches/asyncstore/cpp/src/qpid/broker/TxnHandle.h Tue Aug 28 18:30:16 2012
@@ -24,9 +24,8 @@
#ifndef qpid_broker_TxnHandle_h_
#define qpid_broker_TxnHandle_h_
-#include "Handle.h"
-
#include "qpid/asyncStore/AsyncStoreHandle.h"
+#include "qpid/broker/Handle.h"
#include <string>
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp Tue Aug 28 18:30:16 2012
@@ -21,14 +21,13 @@
* \file MessageConsumer.cpp
*/
-#include "MessageConsumer.h"
-
-#include "TestOptions.h"
+#include "tests/storePerftools/asyncPerf/MessageConsumer.h"
#include "qpid/broker/SimpleDeliveryRecord.h"
#include "qpid/broker/SimpleQueue.h"
#include "qpid/broker/SimpleTxnAccept.h"
#include "qpid/broker/SimpleTxnBuffer.h"
+#include "tests/storePerftools/asyncPerf/TestOptions.h"
#include <stdint.h> // uint32_t
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp Tue Aug 28 18:30:16 2012
@@ -21,15 +21,14 @@
* \file MessageProducer.cpp
*/
-#include "MessageProducer.h"
-
-#include "TestOptions.h"
+#include "tests/storePerftools/asyncPerf/MessageProducer.h"
#include "qpid/asyncStore/PersistableMessageContext.h"
#include "qpid/broker/SimpleMessage.h"
#include "qpid/broker/SimpleQueue.h"
#include "qpid/broker/SimpleTxnBuffer.h"
#include "qpid/broker/SimpleTxnPublish.h"
+#include "tests/storePerftools/asyncPerf/TestOptions.h"
#include <stdint.h> // uint32_t
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp Tue Aug 28 18:30:16 2012
@@ -21,14 +21,12 @@
* \file PerfTest.cpp
*/
-#include "PerfTest.h"
-
-#include "MessageConsumer.h"
-#include "MessageProducer.h"
-
-#include "tests/storePerftools/version.h"
+#include "tests/storePerftools/asyncPerf/MessageConsumer.h"
+#include "tests/storePerftools/asyncPerf/MessageProducer.h"
+#include "tests/storePerftools/asyncPerf/PerfTest.h"
#include "tests/storePerftools/common/ScopedTimer.h"
#include "tests/storePerftools/common/Thread.h"
+#include "tests/storePerftools/version.h"
#include "qpid/Modules.h" // Use with loading store as module
#include "qpid/asyncStore/AsyncStoreImpl.h"
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h Tue Aug 28 18:30:16 2012
@@ -24,13 +24,11 @@
#ifndef tests_storePerftools_asyncPerf_PerfTest_h_
#define tests_storePerftools_asyncPerf_PerfTest_h_
-#include "TestResult.h"
-
-#include "tests/storePerftools/common/Streamable.h"
-
#include "qpid/broker/AsyncResultQueueImpl.h"
#include "qpid/framing/FieldTable.h"
#include "qpid/sys/Thread.h"
+#include "tests/storePerftools/asyncPerf/TestResult.h"
+#include "tests/storePerftools/common/Streamable.h"
#include <boost/shared_ptr.hpp>
#include <deque>
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file TestOptions.cpp
*/
-#include "TestOptions.h"
+#include "tests/storePerftools/asyncPerf/TestOptions.h"
namespace tests {
namespace storePerftools {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file TestResult.cpp
*/
-#include "TestResult.h"
+#include "tests/storePerftools/asyncPerf/TestResult.h"
namespace tests {
namespace storePerftools {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TestResult.h Tue Aug 28 18:30:16 2012
@@ -24,8 +24,7 @@
#ifndef tests_storePerftools_asyncPerf_TestResult_h_
#define tests_storePerftools_asyncPerf_TestResult_h_
-#include "TestOptions.h"
-
+#include "tests/storePerftools/asyncPerf/TestOptions.h"
#include "tests/storePerftools/common/TestResult.h"
namespace tests {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Parameters.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Parameters.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Parameters.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Parameters.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef tests_storePerftools_common_Parameters_h_
#define tests_storePerftools_common_Parameters_h_
-#include "Streamable.h"
+#include "tests/storePerftools/common/Streamable.h"
namespace tests {
namespace storePerftools {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file PerftoolError.cpp
*/
-#include "PerftoolError.h"
+#include "tests/storePerftools/common/PerftoolError.h"
#include <iomanip> // std::setfill(), std::setw()
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/PerftoolError.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef tests_storePerftools_common_PerftoolError_h_
#define tests_storePerftools_common_PerftoolError_h_
-#include "Streamable.h"
+#include "tests/storePerftools/common/Streamable.h"
#include <map>
#include <stdexcept> // std::runtime_error
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimable.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimable.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimable.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file ScopedTimable.cpp
*/
-#include "ScopedTimable.h"
+#include "tests/storePerftools/common/ScopedTimable.h"
namespace tests {
namespace storePerftools {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimer.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimer.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/ScopedTimer.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file ScopedTimer.cpp
*/
-#include "ScopedTimer.h"
+#include "tests/storePerftools/common/ScopedTimer.h"
-#include "ScopedTimable.h"
+#include "tests/storePerftools/common/ScopedTimable.h"
namespace tests {
namespace storePerftools {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Streamable.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Streamable.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Streamable.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Streamable.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file Streamable.cpp
*/
-#include "Streamable.h"
+#include "tests/storePerftools/common/Streamable.h"
#include <sstream>
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestOptions.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestOptions.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestOptions.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestOptions.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file TestOptions.cpp
*/
-#include "TestOptions.h"
+#include "tests/storePerftools/common/TestOptions.h"
namespace tests {
namespace storePerftools {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.cpp Tue Aug 28 18:30:16 2012
@@ -21,7 +21,7 @@
* \file TestParameters.cpp
*/
-#include "TestParameters.h"
+#include "tests/storePerftools/common/TestParameters.h"
#include <cstdlib> // std::atoi, std::atol
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestParameters.h Tue Aug 28 18:30:16 2012
@@ -24,7 +24,7 @@
#ifndef tests_storePerftools_common_TestParameters_h_
#define tests_storePerftools_common_TestParameters_h_
-#include "Parameters.h"
+#include "tests/storePerftools/common/Parameters.h"
#include <stdint.h> // uint16_t, uint32_t
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestResult.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestResult.h?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestResult.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/TestResult.h Tue Aug 28 18:30:16 2012
@@ -24,8 +24,8 @@
#ifndef tests_storePerftools_common_TestResult_h_
#define tests_storePerftools_common_TestResult_h_
-#include "ScopedTimable.h"
-#include "Streamable.h"
+#include "tests/storePerftools/common/ScopedTimable.h"
+#include "tests/storePerftools/common/Streamable.h"
namespace tests {
namespace storePerftools {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Thread.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Thread.cpp?rev=1378257&r1=1378256&r2=1378257&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Thread.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/common/Thread.cpp Tue Aug 28 18:30:16 2012
@@ -21,9 +21,9 @@
* \file Thread.cpp
*/
-#include "Thread.h"
+#include "tests/storePerftools/common/Thread.h"
-#include "PerftoolError.h"
+#include "tests/storePerftools/common/PerftoolError.h"
namespace tests {
namespace storePerftools {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org