* Summary:

	 - Wiring (declare/delete/bind) is replicated via AIS.
	 - TestOptions includes all logging options.
	 - Logger automatically parses env vars so logging can be enabled
	 for any program linked with libqpidcommon e.g. by setting QPID_TRACE=1.

	* src/qpid/cluster/SessionManager.cpp: Handle frames from cluster
	 - Forward to BrokerAdapter for execution.
	 - Suppress responses in proxy.

	* src/tests/TestOptions.h (Options): Logging options, --help option.

	* src/qpid/client/ClientConnection.cpp: Removed log initialization.
	Logs are initialized either in TestOptions or automatically from env vars,
	e.g. QPID_TRACE,
	
	* src/qpid/QpidError.h (class QpidError): Initialize Exception in
	constructor so messages can be logged.

	* src/qpid/framing/ChannelAdapter.h: Made send() virtual.

	* src/tests/Cluster_child.cpp: UUID corrected.

	* src/qpid/broker/Broker.cpp: Pass chains to updater by ref.

	* src/qpid/Options.cpp (parse): Fix log settings from environment.


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

1 files changed, 3 insertions, 2 deletions

diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/cpp/src/qpid/cluster/ClusterPlugin.cpp
index 10b1c44f40..b00152cbcd 100644
--- a/cpp/src/qpid/cluster/ClusterPlugin.cpp
+++ b/cpp/src/qpid/cluster/ClusterPlugin.cpp
@@ -50,9 +50,10 @@ struct ClusterPlugin : public Plugin {
         // Only provide to a Broker, and only if the --cluster config is set.
         if (broker && !options.clusterName.empty()) {
             assert(!cluster); // A process can only belong to one cluster.
-            sessions.reset(new SessionManager());
+
+            sessions.reset(new SessionManager(*broker));
             cluster.reset(new Cluster(options.clusterName, broker->getUrl(), sessions));
-            sessions->setClusterSend(cluster); // FIXME aconway 2007-07-10: 
+            sessions->setClusterSend(cluster); 
             broker->add(sessions);
         }
     }