2007-06-30 <aconway@redhat.com>

	* src/qpid/cluster/Cluster.cpp: Refactor - expose 4 handler points
	for all traffic to/from cluster. Removed HandlerUpdater functionality,
	separate class. Cluster only deals with membership and connecting
	the 4 handler points to CPG multicast.

	* src/tests/cluster.mk: Dropped newgrp ais wrapper scripts, its
	much simpler if the user just does "newgrp ais" before building.

	* src/tests/ais_check: Test script to check if users gid is ais
	and give clear notice if not.

	* src/tests/Cluster.cpp: Updated for changes to Cluster. 

	* src/qpid/cluster/Cpg.cpp: Better messages for common errors.

	* Handler.h: Remove nextHandler() minor convenience is outweighted
	by risk of undetected errors if handlers that expect next() to be
	set are called when it's not set.

	* src/qpid/cluster/Cpg.cpp: Added logging. Replaced boost::function
	with traditional virtual interface (nasty stack traces.)


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

1 files changed, 0 insertions, 66 deletions

diff --git a/cpp/src/qpid/cluster/ChannelManager.h b/cpp/src/qpid/cluster/ChannelManager.h
deleted file mode 100644
index 59fce77957..0000000000
--- a/cpp/src/qpid/cluster/ChannelManager.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef QPID_CLUSTER_CHANNELMANAGER_H
-#define QPID_CLUSTER_CHANNELMANAGER_H
-
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "qpid/framing/HandlerUpdater.h"
-#include <map>
-
-namespace qpid {
-namespace cluster {
-
-/**
- * Manage channels and handler chains on channels for the cluster.
- *
- * As HandlerUpdater plugin, updates channel handler chains with
- * cluster handlers.
- *
- * As a FrameHandler handles frames coming from the cluster and
- * dispatches them to the appropriate channel handler.
- * 
- */
-class ChannelManager : public framing::HandlerUpdater,
-                       public framing::FrameHandler
-{
-  public:
-    /** Takes a handler to send frames to the cluster. */
-    ChannelManager(framing::FrameHandler::Chain mcastOut);
-    
-    /** As FrameHandler handle frames from the cluster */
-    void handle(framing::AMQFrame& frame);
-
-    /** As ChannelUpdater update the handler chains. */
-    void update(framing::ChannelId id, framing::FrameHandler::Chains& chains);
-    
-  private:
-    void updateFailoverState(framing::AMQFrame&);
-    
-    typedef std::map<framing::ChannelId,
-                    framing::FrameHandler::Chains> ChannelMap;
-
-    framing::FrameHandler::Chain mcastOut;
-    ChannelMap channels;
-};
-
-
-}} // namespace qpid::cluster
-
-
-
-#endif  /*!QPID_CLUSTER_CHANNELMANAGER_H*/