Merge in trunk changes from r758432:768028cmake

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/cmake@768053 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 66 deletions

diff --git a/qpid/cpp/src/tests/BasicP2PTest.cpp b/qpid/cpp/src/tests/BasicP2PTest.cpp
deleted file mode 100644
index f4a4cce7f2..0000000000
--- a/qpid/cpp/src/tests/BasicP2PTest.cpp
+++ /dev/null
@@ -1,66 +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 "BasicP2PTest.h"
-
-using namespace qpid;
-using namespace qpid::client;
-
-class BasicP2PTest::Receiver : public Worker, public MessageListener
-{
-    const std::string queue;
-    std::string tag;
-public:
-    Receiver(ConnectionOptions& options, const std::string& _queue, const int _messages) 
-        : Worker(options, _messages), queue(_queue){}
-    void init()
-    {
-        Queue q(queue, true);
-        channel.declareQueue(q);
-        framing::FieldTable args;
-        channel.bind(Exchange::STANDARD_DIRECT_EXCHANGE, q, queue, args);
-        channel.consume(q, tag, this);
-        channel.start();
-    }
-
-    void start()
-    {
-    }
-        
-    void received(Message&)
-    {
-        count++;
-    }
-};
-
-void BasicP2PTest::assign(const std::string& role, framing::FieldTable& params, ConnectionOptions& options)
-{
-    std::string queue = params.getString("P2P_QUEUE_AND_KEY_NAME");
-    int messages = params.getInt("P2P_NUM_MESSAGES");
-    if (role == "SENDER") {
-        worker = std::auto_ptr<Worker>(new Sender(options, Exchange::STANDARD_DIRECT_EXCHANGE, queue, messages));
-    } else if(role == "RECEIVER"){
-        worker = std::auto_ptr<Worker>(new Receiver(options, queue, messages));
-    } else {
-        throw Exception("unrecognised role");
-    }
-    worker->init();
-}