3 files changed, 0 insertions, 137 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 3dcbda5085..cac7761588 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -295,7 +295,6 @@ nobase_include_HEADERS = \
   qpid/broker/TxAck.h \
   qpid/client/AckMode.h \
   qpid/client/BasicMessageChannel.h \
-  qpid/client/ClientAdapter.h \
   qpid/client/ClientChannel.h \
   qpid/client/ClientExchange.h \
   qpid/client/ClientMessage.h \
diff --git a/cpp/src/qpid/client/ClientAdapter.cpp b/cpp/src/qpid/client/ClientAdapter.cpp
deleted file mode 100644
index ceabe344c9..0000000000
--- a/cpp/src/qpid/client/ClientAdapter.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *
- * 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/AMQP_ClientOperations.h"
-#include "ClientAdapter.h"
-#include "Connection.h"
-#include "qpid/Exception.h"
-#include "qpid/framing/AMQMethodBody.h"
-
-namespace qpid {
-namespace client {
-
-using namespace qpid;
-using namespace qpid::framing;
-
-typedef std::vector<Queue::shared_ptr>::iterator queue_iterator;
-
-void ClientAdapter::handleMethodInContext(
-    boost::shared_ptr<qpid::framing::AMQMethodBody> method,
-    const MethodContext& context
-)
-{
-    try{
-        method->invoke(*clientOps, context);
-    }catch(ChannelException& e){
-        connection.client->getChannel().close(
-            context, e.code, e.toString(),
-            method->amqpClassId(), method->amqpMethodId());
-        connection.closeChannel(getId());
-    }catch(ConnectionException& e){
-        connection.client->getConnection().close(
-            context, e.code, e.toString(),
-            method->amqpClassId(), method->amqpMethodId());
-    }catch(std::exception& e){
-        connection.client->getConnection().close(
-            context, 541/*internal error*/, e.what(),
-            method->amqpClassId(), method->amqpMethodId());
-    }
-}
-
-void ClientAdapter::handleHeader(AMQHeaderBody::shared_ptr body) {
-    channel->handleHeader(body);
-}
-
-void ClientAdapter::handleContent(AMQContentBody::shared_ptr body) {
-    channel->handleContent(body);
-}
-
-void ClientAdapter::handleHeartbeat(AMQHeartbeatBody::shared_ptr) {
-    // TODO aconway 2007-01-17: Implement heartbeats.
-}
-
-
-
-}} // namespace qpid::client
-
diff --git a/cpp/src/qpid/client/ClientAdapter.h b/cpp/src/qpid/client/ClientAdapter.h
deleted file mode 100644
index 4a6b76077f..0000000000
--- a/cpp/src/qpid/client/ClientAdapter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _client_ClientAdapter_h
-#define _client_ClientAdapter_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/ChannelAdapter.h"
-#include "ClientChannel.h"
-
-namespace qpid {
-namespace client {
-
-class AMQMethodBody;
-class Connection;
-
-/**
- * Per-channel protocol adapter.
- *
- * Translates protocol bodies into calls on the core Channel,
- * Connection and Client objects.
- *
- * Owns a channel, has references to Connection and Client.
- */
-class ClientAdapter : public framing::ChannelAdapter
-{
-  public:
-    ClientAdapter(std::auto_ptr<Channel> ch, Connection&, Client&);
-    Channel& getChannel() { return *channel; }
-
-    void handleHeader(boost::shared_ptr<qpid::framing::AMQHeaderBody>);
-    void handleContent(boost::shared_ptr<qpid::framing::AMQContentBody>);
-    void handleHeartbeat(boost::shared_ptr<qpid::framing::AMQHeartbeatBody>);
-
-  private:
-    void handleMethodInContext(
-        boost::shared_ptr<qpid::framing::AMQMethodBody> method,
-        const framing::MethodContext& context);
-    
-    class ClientOps;
-
-    std::auto_ptr<Channel> channel;
-    Connection& connection;
-    Client& client;
-    boost::shared_ptr<ClientOps> clientOps;
-};
-
-}} // namespace qpid::client
-
-
-
-#endif  /*!_client_ClientAdapter_h*/