Revert "QPID-1879 Don't use a thread for every new client Connection"

This reverts commit b54680d4b3341fa280a237a6d80952b9830ae3c5.


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

1 files changed, 17 insertions, 16 deletions

diff --git a/cpp/src/qpid/client/Connector.h b/cpp/src/qpid/client/Connector.h
index 880c81affe..78ddaa33cd 100644
--- a/cpp/src/qpid/client/Connector.h
+++ b/cpp/src/qpid/client/Connector.h
@@ -22,24 +22,27 @@
 #define _Connector_
 
 
+#include "qpid/framing/InputHandler.h"
 #include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
 #include "qpid/framing/ProtocolVersion.h"
-
+#include "qpid/sys/ShutdownHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Mutex.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/Time.h"
+
+#include <queue>
+#include <boost/weak_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <string>
-
 namespace qpid {
 
 namespace sys {
-class ShutdownHandler;
 class SecurityLayer;
-class Poller;
-}
-
-namespace framing {
-class InputHandler;
-class AMQFrame;
 }
 
 namespace client {
@@ -49,14 +52,11 @@ class ConnectionImpl;
 
 ///@internal
 class Connector : public framing::OutputHandler
-{
+{    
   public:
     // Protocol connector factory related stuff (it might be better to separate this code from the TCP Connector in the future)
-    typedef Connector* Factory(boost::shared_ptr<qpid::sys::Poller>,
-                               framing::ProtocolVersion, const ConnectionSettings&, ConnectionImpl*);
-    static Connector* create(const std::string& proto,
-                             boost::shared_ptr<qpid::sys::Poller>,
-                             framing::ProtocolVersion, const ConnectionSettings&, ConnectionImpl*);
+    typedef Connector* Factory(framing::ProtocolVersion, const ConnectionSettings&, ConnectionImpl*);
+    static Connector* create(const std::string& proto, framing::ProtocolVersion, const ConnectionSettings&, ConnectionImpl*);
     static void registerFactory(const std::string& proto, Factory* connectorFactory);
 
     virtual ~Connector() {};
@@ -73,6 +73,7 @@ class Connector : public framing::OutputHandler
     virtual const std::string& getIdentifier() const = 0;
 
     virtual void activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>);
+
 };
 
 }}