You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2011/03/09 17:05:37 UTC
svn commit: r1079864 [1/2] - in /qpid/branches/0.10/qpid: ./ cpp/examples/
cpp/examples/old_api/tradedemo/ cpp/include/qmf/engine/ cpp/src/
cpp/src/qmf/engine/ cpp/src/qpid/broker/ cpp/src/qpid/cluster/
cpp/src/qpid/management/ cpp/src/tests/ dotnet/ j...
Author: kgiusti
Date: Wed Mar 9 16:05:35 2011
New Revision: 1079864
URL: http://svn.apache.org/viewvc?rev=1079864&view=rev
Log:
QPID-3073: merge to 0.10 branch.
Modified:
qpid/branches/0.10/qpid/ (props changed)
qpid/branches/0.10/qpid/cpp/examples/ (props changed)
qpid/branches/0.10/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj (props changed)
qpid/branches/0.10/qpid/cpp/include/qmf/engine/Agent.h (props changed)
qpid/branches/0.10/qpid/cpp/include/qmf/engine/Console.h (props changed)
qpid/branches/0.10/qpid/cpp/src/CMakeLists.txt (props changed)
qpid/branches/0.10/qpid/cpp/src/qmf/engine/Agent.cpp (props changed)
qpid/branches/0.10/qpid/cpp/src/qpid/broker/AsyncCompletion.h
qpid/branches/0.10/qpid/cpp/src/qpid/broker/PersistableMessage.h
qpid/branches/0.10/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.cpp
qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.h
qpid/branches/0.10/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (props changed)
qpid/branches/0.10/qpid/cpp/src/qpid/cluster/UpdateClient.h (props changed)
qpid/branches/0.10/qpid/cpp/src/qpid/management/ManagementAgent.cpp (props changed)
qpid/branches/0.10/qpid/cpp/src/qpid/management/ManagementAgent.h (props changed)
qpid/branches/0.10/qpid/cpp/src/tests/MessageUtils.h
qpid/branches/0.10/qpid/cpp/src/tests/QueueTest.cpp
qpid/branches/0.10/qpid/cpp/src/tests/cluster_tests.py (props changed)
qpid/branches/0.10/qpid/dotnet/build-msbuild.bat (props changed)
qpid/branches/0.10/qpid/dotnet/build-nant-release (props changed)
qpid/branches/0.10/qpid/dotnet/build-nant.bat (props changed)
qpid/branches/0.10/qpid/java/ (props changed)
qpid/branches/0.10/qpid/java/broker/ (props changed)
qpid/branches/0.10/qpid/java/broker/bin/ (props changed)
qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/0.10/qpid/java/management/client/src/main/java/org/apache/qpid/management/ (props changed)
qpid/branches/0.10/qpid/java/management/client/src/test/java/org/apache/qpid/management/ (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/ (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/ (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed)
qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
qpid/branches/0.10/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java (props changed)
qpid/branches/0.10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed)
qpid/branches/0.10/qpid/java/test-profiles/ (props changed)
qpid/branches/0.10/qpid/java/test-profiles/08StandaloneExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/JavaStandaloneExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/clean-dir (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/default.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/java-derby.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/java.testprofile (props changed)
qpid/branches/0.10/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/0.10/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/0.10/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/0.10/qpid/packaging/windows/ (props changed)
qpid/branches/0.10/qpid/python/ (props changed)
qpid/branches/0.10/qpid/python/examples/api/spout (props changed)
qpid/branches/0.10/qpid/python/qpid/concurrency.py (props changed)
qpid/branches/0.10/qpid/ruby/ext/sasl/extconf.rb (props changed)
qpid/branches/0.10/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py (props changed)
Propchange: qpid/branches/0.10/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/0.6-release-windows-installer/qpid:926803,927233
/qpid/branches/java-network-refactor/qpid:805429-825319
/qpid/branches/qpid-2935/qpid:1061302-1072333
-/qpid/trunk/qpid:1078075,1078733,1078743
+/qpid/trunk/qpid:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/cpp/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples:926803,927233
/qpid/branches/java-network-refactor/qpid/cpp/examples:805429-825319
/qpid/branches/qpid-2935/qpid/cpp/examples:1061302-1072333
-/qpid/trunk/qpid/cpp/examples:1078099
+/qpid/trunk/qpid/cpp/examples:1078099,1079385,1079590
Propchange: qpid/branches/0.10/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803,927218,927233
/qpid/branches/java-network-refactor/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:805429-825319
/qpid/branches/qpid-2935/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:1061302-1072333
-/qpid/trunk/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Agent.h:1061302-1072333
-/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Console.h:1061302-1072333
-/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/CMakeLists.txt:926803,927233,932132
/qpid/branches/java-network-refactor/qpid/cpp/src/CMakeLists.txt:805429-825319
/qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt:1061302-1072333
-/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qmf/engine/Agent.cpp:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:1078075,1078733,1078743,1079385,1079590
Modified: qpid/branches/0.10/qpid/cpp/src/qpid/broker/AsyncCompletion.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/src/qpid/broker/AsyncCompletion.h?rev=1079864&r1=1079863&r2=1079864&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/cpp/src/qpid/broker/AsyncCompletion.h (original)
+++ qpid/branches/0.10/qpid/cpp/src/qpid/broker/AsyncCompletion.h Wed Mar 9 16:05:35 2011
@@ -22,6 +22,8 @@
*
*/
+#include <boost/intrusive_ptr.hpp>
+
#include "qpid/broker/BrokerImportExport.h"
#include "qpid/sys/AtomicValue.h"
#include "qpid/sys/Mutex.h"
@@ -77,6 +79,22 @@ namespace broker {
class AsyncCompletion
{
+ public:
+
+ /** Supplied by the Initiator to the end() method, allows for a callback
+ * when all outstanding completers are done. If the callback cannot be
+ * made during the end() call, the clone() method must supply a copy of
+ * this callback object that persists after end() returns. The cloned
+ * callback object will be used by the last completer thread, and
+ * released when the callback returns.
+ */
+ class Callback : public RefCounted
+ {
+ public:
+ virtual void completed(bool) = 0;
+ virtual boost::intrusive_ptr<Callback> clone() = 0;
+ };
+
private:
mutable qpid::sys::AtomicValue<uint32_t> completionsNeeded;
mutable qpid::sys::Monitor callbackLock;
@@ -85,14 +103,17 @@ class AsyncCompletion
void invokeCallback(bool sync) {
qpid::sys::Mutex::ScopedLock l(callbackLock);
if (active) {
- inCallback = true;
- {
- qpid::sys::Mutex::ScopedUnlock ul(callbackLock);
- completed(sync);
+ if (callback.get()) {
+ inCallback = true;
+ {
+ qpid::sys::Mutex::ScopedUnlock ul(callbackLock);
+ callback->completed(sync);
+ }
+ inCallback = false;
+ callback = boost::intrusive_ptr<Callback>();
+ callbackLock.notifyAll();
}
- inCallback = false;
active = false;
- callbackLock.notifyAll();
}
}
@@ -100,17 +121,17 @@ class AsyncCompletion
/** Invoked when all completers have signalled that they have completed
* (via calls to finishCompleter()). bool == true if called via end()
*/
- virtual void completed(bool) = 0;
+ boost::intrusive_ptr<Callback> callback;
public:
AsyncCompletion() : completionsNeeded(0), inCallback(false), active(true) {};
virtual ~AsyncCompletion() { cancel(); }
+
/** True when all outstanding operations have compeleted
*/
bool isDone()
{
- qpid::sys::Mutex::ScopedLock l(callbackLock);
return !active;
}
@@ -135,17 +156,32 @@ class AsyncCompletion
*/
void begin()
{
- qpid::sys::Mutex::ScopedLock l(callbackLock);
++completionsNeeded;
}
/** called by initiator after all potential completers have called
* startCompleter().
*/
- void end()
+ void end(Callback& cb)
{
assert(completionsNeeded.get() > 0); // ensure begin() has been called!
+ // the following only "decrements" the count if it is 1. This means
+ // there are no more outstanding completers and we are done.
+ if (completionsNeeded.boolCompareAndSwap(1, 0)) {
+ // done! Complete immediately
+ cb.completed(true);
+ return;
+ }
+
+ // the compare-and-swap did not succeed. This means there are
+ // outstanding completers pending (count > 1). Get a persistent
+ // Callback object to use when the last completer is done.
+ // Decrement after setting up the callback ensures that pending
+ // completers cannot touch the callback until it is ready.
+ callback = cb.clone();
if (--completionsNeeded == 0) {
+ // note that a completer may have completed during the
+ // callback setup or decrement:
invokeCallback(true);
}
}
@@ -156,14 +192,9 @@ class AsyncCompletion
virtual void cancel() {
qpid::sys::Mutex::ScopedLock l(callbackLock);
while (inCallback) callbackLock.wait();
+ callback = boost::intrusive_ptr<Callback>();
active = false;
}
-
- /** may be called by Initiator after all completers have been added but
- * prior to calling end(). Allows initiator to determine if it _really_
- * needs to wait for pending Completers (e.g. count > 1).
- */
- //uint32_t getPendingCompleters() { return completionsNeeded.get(); }
};
}} // qpid::broker::
Modified: qpid/branches/0.10/qpid/cpp/src/qpid/broker/PersistableMessage.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/src/qpid/broker/PersistableMessage.h?rev=1079864&r1=1079863&r2=1079864&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/cpp/src/qpid/broker/PersistableMessage.h (original)
+++ qpid/branches/0.10/qpid/cpp/src/qpid/broker/PersistableMessage.h Wed Mar 9 16:05:35 2011
@@ -56,7 +56,7 @@ class PersistableMessage : public Persis
* operations have completed, the transfer of this message from the client
* may be considered complete.
*/
- boost::shared_ptr<AsyncCompletion> ingressCompletion;
+ AsyncCompletion ingressCompletion;
/**
* Tracks the number of outstanding asynchronous dequeue
@@ -115,12 +115,11 @@ class PersistableMessage : public Persis
virtual QPID_BROKER_EXTERN bool isPersistent() const = 0;
/** track the progress of a message received by the broker - see ingressCompletion above */
- QPID_BROKER_EXTERN bool isIngressComplete() { return !ingressCompletion || ingressCompletion->isDone(); }
- QPID_BROKER_EXTERN boost::shared_ptr<AsyncCompletion>& getIngressCompletion() { return ingressCompletion; }
- QPID_BROKER_EXTERN void setIngressCompletion(boost::shared_ptr<AsyncCompletion>& ic) { ingressCompletion = ic; }
+ QPID_BROKER_EXTERN bool isIngressComplete() { return ingressCompletion.isDone(); }
+ QPID_BROKER_EXTERN AsyncCompletion& getIngressCompletion() { return ingressCompletion; }
- QPID_BROKER_EXTERN void enqueueStart() { if (ingressCompletion) ingressCompletion->startCompleter(); }
- QPID_BROKER_EXTERN void enqueueComplete() { if (ingressCompletion) ingressCompletion->finishCompleter(); }
+ QPID_BROKER_EXTERN void enqueueStart() { ingressCompletion.startCompleter(); }
+ QPID_BROKER_EXTERN void enqueueComplete() { ingressCompletion.finishCompleter(); }
QPID_BROKER_EXTERN void enqueueAsync(PersistableQueue::shared_ptr queue,
MessageStore* _store);
Modified: qpid/branches/0.10/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp?rev=1079864&r1=1079863&r2=1079864&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp (original)
+++ qpid/branches/0.10/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp Wed Mar 9 16:05:35 2011
@@ -144,11 +144,6 @@ void QueueFlowLimit::enqueued(const Queu
}
}
- /** @todo KAG: - REMOVE ONCE STABLE */
- if (index.find(msg.payload) != index.end()) {
- QPID_LOG(error, "Queue \"" << queueName << "\": has enqueued a msg twice: " << msg.position);
- }
-
if (flowStopped || !index.empty()) {
// ignore flow control if we are populating the queue due to cluster replication:
if (broker && broker->isClusterUpdatee()) {
@@ -156,7 +151,7 @@ void QueueFlowLimit::enqueued(const Queu
return;
}
QPID_LOG(trace, "Queue \"" << queueName << "\": setting flow control for msg pos=" << msg.position);
- msg.payload->getIngressCompletion()->startCompleter(); // don't complete until flow resumes
+ msg.payload->getIngressCompletion().startCompleter(); // don't complete until flow resumes
index.insert(msg.payload);
}
}
@@ -196,14 +191,14 @@ void QueueFlowLimit::dequeued(const Queu
// flow enabled - release all pending msgs
while (!index.empty()) {
std::set< boost::intrusive_ptr<Message> >::iterator itr = index.begin();
- (*itr)->getIngressCompletion()->finishCompleter();
+ (*itr)->getIngressCompletion().finishCompleter();
index.erase(itr);
}
} else {
// even if flow controlled, we must release this msg as it is being dequeued
std::set< boost::intrusive_ptr<Message> >::iterator itr = index.find(msg.payload);
if (itr != index.end()) { // this msg is flow controlled, release it:
- (*itr)->getIngressCompletion()->finishCompleter();
+ (*itr)->getIngressCompletion().finishCompleter();
index.erase(itr);
}
}
Modified: qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=1079864&r1=1079863&r2=1079864&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.cpp Wed Mar 9 16:05:35 2011
@@ -62,7 +62,7 @@ SessionState::SessionState(
msgBuilder(&broker.getStore()),
mgmtObject(0),
rateFlowcontrol(0),
- scheduledCompleterContext(new ScheduledCompleterContext(this))
+ asyncCommandCompleter(new AsyncCommandCompleter(this))
{
uint32_t maxRate = broker.getOptions().maxSessionRate;
if (maxRate) {
@@ -102,25 +102,7 @@ SessionState::~SessionState() {
if (flowControlTimer)
flowControlTimer->cancel();
- // clean up any outstanding incomplete commands
- {
- qpid::sys::ScopedLock<Mutex> l(incompleteCmdsLock);
- std::map<SequenceNumber, boost::shared_ptr<IncompleteCommandContext> > copy(incompleteCmds);
- incompleteCmds.clear();
- while (!copy.empty()) {
- boost::shared_ptr<IncompleteCommandContext> ref(copy.begin()->second);
- copy.erase(copy.begin());
- {
- // note: need to drop lock, as callback may attempt to take it.
- qpid::sys::ScopedUnlock<Mutex> ul(incompleteCmdsLock);
- ref->cancel();
- }
- }
- }
-
- // At this point, we are guaranteed no further completion callbacks will be
- // made. Cancel any outstanding scheduledCompleter calls...
- scheduledCompleterContext->cancel();
+ asyncCommandCompleter->cancel();
}
AMQP_ClientProxy& SessionState::getProxy() {
@@ -276,13 +258,11 @@ void SessionState::handleContent(AMQFram
msg->getFrames().append(header);
}
msg->setPublisher(&getConnection());
-
- boost::shared_ptr<AsyncCompletion> ac(boost::dynamic_pointer_cast<AsyncCompletion>(createIngressMsgXferContext(msg)));
- msg->setIngressCompletion( ac );
- ac->begin();
+ msg->getIngressCompletion().begin();
semanticState.handle(msg);
msgBuilder.end();
- ac->end(); // allows msg to complete xfer
+ IncompleteIngressMsgXfer xfer(this, msg);
+ msg->getIngressCompletion().end(xfer); // allows msg to complete xfer
}
// Handle producer session flow control
@@ -451,110 +431,94 @@ void SessionState::addPendingExecutionSy
}
-/** factory for creating IncompleteIngressMsgXfer objects which
- * can be references from Messages as ingress AsyncCompletion objects.
+/** factory for creating a reference-counted IncompleteIngressMsgXfer object
+ * which will be attached to a message that will be completed asynchronously.
*/
-boost::shared_ptr<SessionState::IncompleteIngressMsgXfer>
-SessionState::createIngressMsgXferContext(boost::intrusive_ptr<Message> msg)
+boost::intrusive_ptr<AsyncCompletion::Callback>
+SessionState::IncompleteIngressMsgXfer::clone()
{
- SequenceNumber id = msg->getCommandId();
- boost::shared_ptr<SessionState::IncompleteIngressMsgXfer> cmd(new SessionState::IncompleteIngressMsgXfer(this, id, msg));
- qpid::sys::ScopedLock<Mutex> l(incompleteCmdsLock);
- incompleteCmds[id] = cmd;
- return cmd;
+ boost::intrusive_ptr<SessionState::IncompleteIngressMsgXfer> cb(new SessionState::IncompleteIngressMsgXfer(session, msg));
+ return cb;
}
-/** Invoked by the asynchronous completer associated with
- * a received msg that is pending Completion. May be invoked
- * by the SessionState directly (sync == true), or some external
- * entity (!sync).
+/** Invoked by the asynchronous completer associated with a received
+ * msg that is pending Completion. May be invoked by the IO thread
+ * (sync == true), or some external thread (!sync).
*/
void SessionState::IncompleteIngressMsgXfer::completed(bool sync)
{
if (!sync) {
/** note well: this path may execute in any thread. It is safe to access
- * the session, as the SessionState destructor will cancel all outstanding
- * callbacks before getting destroyed (so we'll never get here).
+ * the scheduledCompleterContext, since *this has a shared pointer to it.
+ * but not session or msg!
*/
+ session = 0; msg = 0;
QPID_LOG(debug, ": async completion callback scheduled for msg seq=" << id);
- if (session->scheduledCompleterContext->scheduleCompletion(id))
- session->getConnection().requestIOProcessing(boost::bind(&scheduledCompleter,
- session->scheduledCompleterContext));
- } else { // command is being completed in IO thread.
- // this path runs only on the IO thread.
- qpid::sys::ScopedLock<Mutex> l(session->incompleteCmdsLock);
- std::map<SequenceNumber, boost::shared_ptr<IncompleteCommandContext> >::iterator cmd;
- cmd = session->incompleteCmds.find(id);
- if (cmd != session->incompleteCmds.end()) {
- boost::shared_ptr<IncompleteCommandContext> tmp(cmd->second);
- session->incompleteCmds.erase(cmd);
-
- if (session->isAttached()) {
- QPID_LOG(debug, ": receive completed for msg seq=" << id);
- qpid::sys::ScopedUnlock<Mutex> ul(session->incompleteCmdsLock);
- session->completeRcvMsg(id, requiresAccept, requiresSync);
- return;
- }
+ completerContext->scheduleMsgCompletion(id, requiresAccept, requiresSync);
+ } else {
+ // this path runs directly from the ac->end() call in handleContent() above,
+ // so *session and *msg are definately valid.
+ if (session->isAttached()) {
+ QPID_LOG(debug, ": receive completed for msg seq=" << id);
+ session->completeRcvMsg(id, requiresAccept, requiresSync);
}
}
+ completerContext = boost::intrusive_ptr<AsyncCommandCompleter>();
}
-/** Scheduled from incomplete command's completed callback, safely completes all
- * completed commands in the IO Thread. Guaranteed not to be running at the same
- * time as the message receive code.
+/** Scheduled from an asynchronous command's completed callback to run on
+ * the IO thread.
*/
-void SessionState::scheduledCompleter(boost::shared_ptr<SessionState::ScheduledCompleterContext> ctxt)
+void SessionState::AsyncCommandCompleter::schedule(boost::intrusive_ptr<AsyncCommandCompleter> ctxt)
{
ctxt->completeCommands();
}
-/** mark a command (sequence) as completed, return True if caller should
- * schedule a call to completeCommands()
+/** mark an ingress Message.Transfer command as completed.
+ * This method must be thread safe - it may run on any thread.
*/
-bool SessionState::ScheduledCompleterContext::scheduleCompletion(SequenceNumber cmd)
-{
- qpid::sys::ScopedLock<qpid::sys::Mutex> l(completedCmdsLock);
-
- completedCmds.push_back(cmd);
- return (completedCmds.size() == 1);
+void SessionState::AsyncCommandCompleter::scheduleMsgCompletion(SequenceNumber cmd,
+ bool requiresAccept,
+ bool requiresSync)
+{
+ qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
+
+ if (session) {
+ MessageInfo msg(cmd, requiresAccept, requiresSync);
+ completedMsgs.push_back(msg);
+ if (completedMsgs.size() == 1) {
+ session->getConnection().requestIOProcessing(boost::bind(&schedule,
+ session->asyncCommandCompleter));
+ }
+ }
}
-/** Cause the session to complete all completed commands */
-void SessionState::ScheduledCompleterContext::completeCommands()
+/** Cause the session to complete all completed commands.
+ * Executes on the IO thread.
+ */
+void SessionState::AsyncCommandCompleter::completeCommands()
{
- qpid::sys::ScopedLock<qpid::sys::Mutex> l(completedCmdsLock);
+ qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
// when session is destroyed, it clears the session pointer via cancel().
- if (!session) return;
-
- while (!completedCmds.empty()) {
- SequenceNumber id = completedCmds.front();
- completedCmds.pop_front();
- std::map<SequenceNumber, boost::shared_ptr<IncompleteCommandContext> >::iterator cmd;
- {
- qpid::sys::ScopedLock<qpid::sys::Mutex> l(session->incompleteCmdsLock);
-
- cmd = session->incompleteCmds.find(id);
- if (cmd !=session->incompleteCmds.end()) {
- boost::shared_ptr<IncompleteCommandContext> tmp(cmd->second);
- {
- qpid::sys::ScopedUnlock<qpid::sys::Mutex> ul(session->incompleteCmdsLock);
- tmp->do_completion(); // retakes incompleteCmdslock
- }
- }
+ if (session && session->isAttached()) {
+ for (std::vector<MessageInfo>::iterator msg = completedMsgs.begin();
+ msg != completedMsgs.end(); ++msg) {
+ session->completeRcvMsg(msg->cmd, msg->requiresAccept, msg->requiresSync);
}
}
+ completedMsgs.clear();
}
/** cancel any pending calls to scheduleComplete */
-void SessionState::ScheduledCompleterContext::cancel()
+void SessionState::AsyncCommandCompleter::cancel()
{
- qpid::sys::ScopedLock<qpid::sys::Mutex> l(completedCmdsLock);
+ qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
session = 0;
}
Modified: qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.h?rev=1079864&r1=1079863&r2=1079864&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.h (original)
+++ qpid/branches/0.10/qpid/cpp/src/qpid/broker/SessionState.h Wed Mar 9 16:05:35 2011
@@ -38,6 +38,7 @@
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
+#include <boost/intrusive_ptr.hpp>
#include <set>
#include <vector>
@@ -176,79 +177,84 @@ class SessionState : public qpid::Sessio
std::queue<SequenceNumber> pendingExecutionSyncs;
bool currentCommandComplete;
- /** Abstract class that represents a command that is pending
- * completion.
+ /** This class provides a context for completing asynchronous commands in a thread
+ * safe manner. Asynchronous commands save their completion state in this class.
+ * This class then schedules the completeCommands() method in the IO thread.
+ * While running in the IO thread, completeCommands() may safely complete all
+ * saved commands without the risk of colliding with other operations on this
+ * SessionState.
*/
- class IncompleteCommandContext : public AsyncCompletion
+ class AsyncCommandCompleter : public RefCounted {
+ private:
+ SessionState *session;
+ qpid::sys::Mutex completerLock;
+
+ // special-case message.transfer commands for optimization
+ struct MessageInfo {
+ SequenceNumber cmd; // message.transfer command id
+ bool requiresAccept;
+ bool requiresSync;
+ MessageInfo(SequenceNumber c, bool a, bool s)
+ : cmd(c), requiresAccept(a), requiresSync(s) {}
+ };
+ std::vector<MessageInfo> completedMsgs;
+
+ /** complete all pending commands, runs in IO thread */
+ void completeCommands();
+
+ /** for scheduling a run of "completeCommands()" on the IO thread */
+ static void schedule(boost::intrusive_ptr<AsyncCommandCompleter>);
+
+ public:
+ AsyncCommandCompleter(SessionState *s) : session(s) {};
+ ~AsyncCommandCompleter() {};
+
+ /** schedule the completion of an ingress message.transfer command */
+ void scheduleMsgCompletion(SequenceNumber cmd,
+ bool requiresAccept,
+ bool requiresSync);
+ void cancel(); // called by SessionState destructor.
+ };
+ boost::intrusive_ptr<AsyncCommandCompleter> asyncCommandCompleter;
+
+ /** Abstract class that represents a single asynchronous command that is
+ * pending completion.
+ */
+ class AsyncCommandContext : public AsyncCompletion::Callback
{
public:
- IncompleteCommandContext( SessionState *ss, SequenceNumber _id )
- : id(_id), session(ss) {}
- virtual ~IncompleteCommandContext() {}
-
- /* allows manual invokation of completion, used by IO thread to
- * complete a command that was originally finished on a different
- * thread.
- */
- void do_completion() { completed(true); }
+ AsyncCommandContext( SessionState *ss, SequenceNumber _id )
+ : id(_id), completerContext(ss->asyncCommandCompleter) {}
+ virtual ~AsyncCommandContext() {}
protected:
SequenceNumber id;
- SessionState *session;
+ boost::intrusive_ptr<AsyncCommandCompleter> completerContext;
};
/** incomplete Message.transfer commands - inbound to broker from client
*/
- class IncompleteIngressMsgXfer : public SessionState::IncompleteCommandContext
+ class IncompleteIngressMsgXfer : public SessionState::AsyncCommandContext
{
public:
IncompleteIngressMsgXfer( SessionState *ss,
- SequenceNumber _id,
- boost::intrusive_ptr<Message> msg )
- : IncompleteCommandContext(ss, _id),
- requiresAccept(msg->requiresAccept()),
- requiresSync(msg->getFrames().getMethod()->isSync()) {};
+ boost::intrusive_ptr<Message> m )
+ : AsyncCommandContext(ss, m->getCommandId()),
+ session(ss),
+ msg(m.get()),
+ requiresAccept(msg->requiresAccept()),
+ requiresSync(msg->getFrames().getMethod()->isSync()) {};
virtual ~IncompleteIngressMsgXfer() {};
- protected:
virtual void completed(bool);
+ virtual boost::intrusive_ptr<AsyncCompletion::Callback> clone();
private:
- /** meta-info required to complete the message */
+ SessionState *session; // only valid if sync == true
+ Message *msg; // only valid if sync == true
bool requiresAccept;
- bool requiresSync; // method's isSync() flag
+ bool requiresSync;
};
- /** creates a command context suitable for use as an AsyncCompletion in a message */
- boost::shared_ptr<SessionState::IncompleteIngressMsgXfer> createIngressMsgXferContext( boost::intrusive_ptr<Message> msg);
-
- /* A list of commands that are pending completion. These commands are
- * awaiting some set of asynchronous operations to finish (eg: store,
- * flow-control, etc). before the command can be completed to the client
- */
- std::map<SequenceNumber, boost::shared_ptr<IncompleteCommandContext> > incompleteCmds;
- qpid::sys::Mutex incompleteCmdsLock; // locks above container
-
- /** This context is shared between the SessionState and scheduledCompleter,
- * holds the sequence numbers of all commands that have completed asynchronously.
- */
- class ScheduledCompleterContext {
- private:
- std::list<SequenceNumber> completedCmds;
- // ordering: take this lock first, then incompleteCmdsLock
- qpid::sys::Mutex completedCmdsLock;
- SessionState *session;
- public:
- ScheduledCompleterContext(SessionState *s) : session(s) {};
- bool scheduleCompletion(SequenceNumber cmd);
- void completeCommands();
- void cancel();
- };
- boost::shared_ptr<ScheduledCompleterContext> scheduledCompleterContext;
-
- /** The following method runs the in IO thread and completes commands that
- * where finished asynchronously.
- */
- static void scheduledCompleter(boost::shared_ptr<ScheduledCompleterContext>);
friend class SessionManager;
};
Propchange: qpid/branches/0.10/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/cpp/src/qpid/cluster/UpdateClient.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.h:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/cpp/src/qpid/management/ManagementAgent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.cpp:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/cpp/src/qpid/management/ManagementAgent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/qpid/management/ManagementAgent.h:1061302-1072333
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:1078075,1078733,1078743,1079385,1079590
Modified: qpid/branches/0.10/qpid/cpp/src/tests/MessageUtils.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/src/tests/MessageUtils.h?rev=1079864&r1=1079863&r2=1079864&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/cpp/src/tests/MessageUtils.h (original)
+++ qpid/branches/0.10/qpid/cpp/src/tests/MessageUtils.h Wed Mar 9 16:05:35 2011
@@ -20,7 +20,6 @@
*/
#include "qpid/broker/Message.h"
-#include "qpid/broker/AsyncCompletion.h"
#include "qpid/framing/AMQFrame.h"
#include "qpid/framing/MessageTransferBody.h"
#include "qpid/framing/Uuid.h"
@@ -29,17 +28,6 @@ using namespace qpid;
using namespace broker;
using namespace framing;
-namespace {
- class DummyCompletion : public AsyncCompletion
- {
- public:
- DummyCompletion() {}
- virtual ~DummyCompletion() {}
- protected:
- void completed(bool) {}
- };
-}
-
namespace qpid {
namespace tests {
@@ -62,8 +50,6 @@ struct MessageUtils
msg->getFrames().getHeaders()->get<DeliveryProperties>(true)->setRoutingKey(routingKey);
if (durable)
msg->getFrames().getHeaders()->get<DeliveryProperties>(true)->setDeliveryMode(2);
- boost::shared_ptr<AsyncCompletion>dc(new DummyCompletion());
- msg->setIngressCompletion(dc);
return msg;
}
Modified: qpid/branches/0.10/qpid/cpp/src/tests/QueueTest.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/src/tests/QueueTest.cpp?rev=1079864&r1=1079863&r2=1079864&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/cpp/src/tests/QueueTest.cpp (original)
+++ qpid/branches/0.10/qpid/cpp/src/tests/QueueTest.cpp Wed Mar 9 16:05:35 2011
@@ -88,8 +88,6 @@ intrusive_ptr<Message> create_message(st
msg->getFrames().append(method);
msg->getFrames().append(header);
msg->getFrames().getHeaders()->get<DeliveryProperties>(true)->setRoutingKey(routingKey);
- boost::shared_ptr<AsyncCompletion>dc(new DummyCompletion());
- msg->setIngressCompletion(dc);
return msg;
}
Propchange: qpid/branches/0.10/qpid/cpp/src/tests/cluster_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/cpp/src/tests/cluster_tests.py:1061302-1072333
-/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:1078075,1078733,1078743
+/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/dotnet/build-msbuild.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/dotnet/build-msbuild.bat:1061302-1072333
-/qpid/trunk/qpid/dotnet/build-msbuild.bat:1078075,1078733,1078743
+/qpid/trunk/qpid/dotnet/build-msbuild.bat:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/dotnet/build-nant-release
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/dotnet/build-nant-release:1061302-1072333
-/qpid/trunk/qpid/dotnet/build-nant-release:1078075,1078733,1078743
+/qpid/trunk/qpid/dotnet/build-nant-release:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/dotnet/build-nant.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,2 +1,2 @@
/qpid/branches/qpid-2935/qpid/dotnet/build-nant.bat:1061302-1072333
-/qpid/trunk/qpid/dotnet/build-nant.bat:1078075,1078733,1078743
+/qpid/trunk/qpid/dotnet/build-nant.bat:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -4,4 +4,4 @@
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
/qpid/trunk/qpid:796646-796653
-/qpid/trunk/qpid/java:1078075,1078733,1078743
+/qpid/trunk/qpid/java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
/qpid/branches/qpid-2935/qpid/java/broker:1061302-1072333
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker/bin:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker/bin:805429-821809
/qpid/branches/qpid-2935/qpid/java/broker/bin:1061302-1072333
-/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743
+/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -4,4 +4,4 @@
/qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/management:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker/src/main/java/org/apache/qpid/server/management:787599
/qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/management:1061302-1072333
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -4,4 +4,4 @@
/qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:787599
/qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:1061302-1072333
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,3 +1,3 @@
/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:930288
/qpid/branches/qpid-2935/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1061302-1072333
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1078075,1078733,1078743
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/client/src/main/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/client/src/main/java/org/apache/qpid/management:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/client/src/main/java/org/apache/qpid/management:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/client/src/main/java/org/apache/qpid/management:1061302-1072333
-/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/client/src/test/java/org/apache/qpid/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/client/src/test/java/org/apache/qpid/management:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/client/src/test/java/org/apache/qpid/management:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/client/src/test/java/org/apache/qpid/management:1061302-1072333
-/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagement.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747869,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/UserManagement.java:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:1061302-1072333
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790
-/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,5 +3,5 @@
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin:1077869,1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/eclipse-plugin:1077869,1078075,1078733,1078743,1079385,1079590
/qpid/trunk/qpid/management/eclipse-plugin:796646-796653
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/management/eclipse-plugin/src:788755
/qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src:1077869,1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/eclipse-plugin/src:1077869,1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:795950-829653
/qpid/branches/java-network-refactor/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:805429-821809
/qpid/branches/qpid-2935/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:1061302-1072333
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:1078075,1078733,1078743
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:1061302-1072333
-/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,5 +3,5 @@
/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:795950-829653
/qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1061302-1072333
-/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1078075,1078733,1078743
+/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1078075,1078733,1078743,1079385,1079590
/qpid/trunk/qpid/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:796646-796653
Propchange: qpid/branches/0.10/qpid/java/test-profiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,3 +1,3 @@
/qpid/branches/0.5.x-dev/qpid/java/test-profiles:931179
/qpid/branches/qpid-2935/qpid/java/test-profiles:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/08StandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/08StandaloneExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/010Excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/010Excludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/CPPExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/CPPExcludes:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/CPPExcludes:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/Excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/Excludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/Excludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/Excludes:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/Excludes:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08Excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08Excludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/JavaExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/JavaExcludes:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/JavaExcludes:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/JavaStandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/JavaStandaloneExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08TransientExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08TransientExcludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/JavaTransientExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/XAExcludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/XAExcludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/XAExcludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/XAExcludes:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/XAExcludes:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/clean-dir
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/clean-dir:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/clean-dir:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/clean-dir:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/clean-dir:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/clean-dir:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.async.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.async.testprofile:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.async.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.cluster.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.cluster.testprofile:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.cluster.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.noprefetch.testprofile:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.noprefetch.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.excludes:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.excludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.excludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.testprofile:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.testprofile:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/default.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/default.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/default.testprofile:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/default.testprofile:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/java-derby.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/java-derby.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/java.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java.testprofile:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/java.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java.testprofile:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/java.testprofile:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/log4j-test.xml:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/log4j-test.xml:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/log4j-test.xml:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/test-provider.properties:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test-provider.properties:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/test-provider.properties:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/test_resources:795950-829653
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test_resources:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/test_resources:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/test_resources:1078075,1078733,1078743
+/qpid/trunk/qpid/java/test-profiles/test_resources:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/packaging/windows/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -3,4 +3,4 @@
/qpid/branches/0.6-release-windows-installer/qpid/packaging/windows:926865,927233
/qpid/branches/java-network-refactor/qpid/packaging/windows:805429-825319
/qpid/branches/qpid-2935/qpid/packaging/windows:1061302-1072333
-/qpid/trunk/qpid/packaging/windows:1078075,1078733,1078743
+/qpid/trunk/qpid/packaging/windows:1078075,1078733,1078743,1079385,1079590
Propchange: qpid/branches/0.10/qpid/python/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -2,4 +2,4 @@
/qpid/branches/java-network-refactor/qpid/python:805429-825319
/qpid/branches/qmfv2/qpid/python:902858,902894
/qpid/branches/qpid-2935/qpid/python:1061302-1072333
-/qpid/trunk/qpid/python:1078075,1078733,1078743,1079434
+/qpid/trunk/qpid/python:1078075,1078733,1078743,1079385,1079434,1079590
Propchange: qpid/branches/0.10/qpid/python/examples/api/spout
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 16:05:35 2011
@@ -1,4 +1,4 @@
/qpid/branches/qmfv2/qpid/python/examples/api/spout:902858,902894
/qpid/branches/qpid-2935/qpid/python/examples/api/spout:1061302-1072333
/qpid/branches/qpid.rnr/python/examples/api/spout:894071-896158
-/qpid/trunk/qpid/python/examples/api/spout:1078075,1078733,1078743,1079434
+/qpid/trunk/qpid/python/examples/api/spout:1078075,1078733,1078743,1079385,1079434,1079590
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org