Subscription system improvements.

Subscription.h

@@ -1,33 +1,36 @@
 #ifndef __Subscription_h__
 #define __Subscription_h__
 
-#include "TCPSession.h"
-#include "Command.h"
 #include "ZString.h"
 #include <vector>
 #include <string>
 
 namespace core {
 
-   class Subscription : public Command {
+   class TCPSession;
 
-    public:
+   class Subscription {
+
+   public:
+      Subscription(std::string id);
       Subscription(std::string id, TCPSession &session);
-      ~Subscription();
+      virtual ~Subscription();
 
       int subscribe(TCPSession &session);
       int unsubscribe(TCPSession &session);
+
       virtual int process(coreutils::ZString &request, std::stringstream &out);
+      virtual int onSubscribe(TCPSession &session);
 
       int event(std::stringstream &out);
 
-      int processCommand(coreutils::ZString &request, TCPSession &session) override;
+      //      int processCommand(coreutils::ZString &request, TCPSession &session) override;
 
       std::string id;
-      TCPSession &owner;
+      TCPSession *owner;
 
       std::vector<TCPSession *> subscribers;
-
+		
    };
 }