Moved c++ over to using the same preview file for 0-10 work as java.

Removed all channel class related code from broker as a result.
Did the same for some python tests I missed earlier.
Renamed ChannelAdapter to ChannelHandler.



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

1 files changed, 0 insertions, 103 deletions

diff --git a/cpp/src/qpid/broker/ConnectionAdapter.cpp b/cpp/src/qpid/broker/ConnectionAdapter.cpp
deleted file mode 100644
index e33aeda8c7..0000000000
--- a/cpp/src/qpid/broker/ConnectionAdapter.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-
-/*
- *
- * 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.
- *
- */
-
-#include "ConnectionAdapter.h"
-#include "Connection.h"
-#include "qpid/framing/ConnectionStartBody.h"
-
-using namespace qpid;
-using namespace qpid::broker;
-using namespace qpid::framing;
-
-void ConnectionAdapter::init(const framing::ProtocolInitiation& header) {
-    FieldTable properties;
-    string mechanisms("PLAIN");
-    string locales("en_US");
-    handler->client.start(header.getMajor(), header.getMinor(), properties, mechanisms, locales);
-}
-
-void ConnectionAdapter::close(ReplyCode code, const string& text, ClassId classId, MethodId methodId)
-{
-    handler->client.close(code, text, classId, methodId);
-}
-
-
-framing::AMQP_ServerOperations::ConnectionHandler* ConnectionAdapter::getConnectionHandler() 
-{ 
-    return handler.get(); 
-}
-
-framing::ProtocolVersion ConnectionAdapter::getVersion() const 
-{ 
-    return handler->connection.getVersion(); 
-}
-
-void ConnectionAdapter::handle(framing::AMQFrame& frame)
-{
-    AMQMethodBody* method=frame.getBody()->getMethod();
-    try{
-        method->invoke(*this);
-    }catch(ConnectionException& e){
-        handler->client.close(e.code, e.toString(), method->amqpClassId(), method->amqpMethodId());
-    }catch(std::exception& e){
-        handler->client.close(541/*internal error*/, e.what(), method->amqpClassId(), method->amqpMethodId());
-    }
-}
-
-ConnectionAdapter::ConnectionAdapter(Connection& connection)  : handler(new Handler(connection)) {}
-
-ConnectionAdapter::Handler:: Handler(Connection& c) : client(c.getOutput()), connection(c) {}
-
-void ConnectionAdapter::Handler::startOk(const FieldTable& /*clientProperties*/,
-    const string& /*mechanism*/, 
-    const string& /*response*/, const string& /*locale*/)
-{
-    client.tune(framing::CHANNEL_MAX, connection.getFrameMax(), connection.getHeartbeat());
-}
-        
-void ConnectionAdapter::Handler::secureOk(const string& /*response*/){}
-        
-void ConnectionAdapter::Handler::tuneOk(uint16_t /*channelmax*/,
-    uint32_t framemax, uint16_t heartbeat)
-{
-    connection.setFrameMax(framemax);
-    connection.setHeartbeat(heartbeat);
-}
-        
-void ConnectionAdapter::Handler::open(const string& /*virtualHost*/,
-    const string& /*capabilities*/, bool /*insist*/)
-{
-    string knownhosts;
-    client.openOk(knownhosts);
-}
-
-        
-void ConnectionAdapter::Handler::close(uint16_t /*replyCode*/, const string& /*replyText*/, 
-    uint16_t /*classId*/, uint16_t /*methodId*/)
-{
-    client.closeOk();
-    connection.getOutput().close();
-} 
-        
-void ConnectionAdapter::Handler::closeOk(){
-    connection.getOutput().close();
-}