Renamed m_*Endpoint to m_Endpoint.

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index 488a5c627ce5381e56893cc0aeccd8f50c32468c..f2bb2f8ce05d2a617c1a014f9ef2b26c856132c8 100644 (file)
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -28,13 +28,13 @@ string CheckerComponent::GetName(void) const
 
 void CheckerComponent::Start(void)
 {
-       m_CheckerEndpoint = boost::make_shared<VirtualEndpoint>();
-       m_CheckerEndpoint->RegisterTopicHandler("checker::AssignService",
+       m_Endpoint = boost::make_shared<VirtualEndpoint>();
+       m_Endpoint->RegisterTopicHandler("checker::AssignService",
                boost::bind(&CheckerComponent::AssignServiceRequestHandler, this, _2, _3));
-       m_CheckerEndpoint->RegisterTopicHandler("checker::ClearServices",
+       m_Endpoint->RegisterTopicHandler("checker::ClearServices",
                boost::bind(&CheckerComponent::ClearServicesRequestHandler, this, _2, _3));
-       m_CheckerEndpoint->RegisterPublication("checker::CheckResult");
-       EndpointManager::GetInstance()->RegisterEndpoint(m_CheckerEndpoint);
+       m_Endpoint->RegisterPublication("checker::CheckResult");
+       EndpointManager::GetInstance()->RegisterEndpoint(m_Endpoint);
 
        m_CheckTimer = boost::make_shared<Timer>();
        m_CheckTimer->SetInterval(5);
@@ -54,7 +54,7 @@ void CheckerComponent::Stop(void)
        EndpointManager::Ptr mgr = EndpointManager::GetInstance();
 
        if (mgr)
-               mgr->UnregisterEndpoint(m_CheckerEndpoint);
+               mgr->UnregisterEndpoint(m_Endpoint);
 }
 
 void CheckerComponent::CheckTimerHandler(void)
@@ -155,7 +155,7 @@ void CheckerComponent::ResultTimerHandler(void)
 
                rm.SetParams(params);
 
-               EndpointManager::GetInstance()->SendMulticastMessage(m_CheckerEndpoint, rm);
+               EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint, rm);
        }
 
        if (min_latency > 5) {
@@ -200,7 +200,7 @@ void CheckerComponent::AssignServiceRequestHandler(const Endpoint::Ptr& sender,
 
                MessagePart result;
                rm.SetResult(result);
-               EndpointManager::GetInstance()->SendUnicastMessage(m_CheckerEndpoint, sender, rm);
+               EndpointManager::GetInstance()->SendUnicastMessage(m_Endpoint, sender, rm);
        }
 }
 

diff --git a/components/checker/checkercomponent.h b/components/checker/checkercomponent.h
index f3c35f6ebe03c29d6a7c0e9985a16bb94617c508..8584b3a75e60383b0ac83ebcfe5d2400845cacc9 100644 (file)
--- a/components/checker/checkercomponent.h
+++ b/components/checker/checkercomponent.h
@@ -48,7 +48,7 @@ public:
        virtual void Stop(void);
 
 private:
-       VirtualEndpoint::Ptr m_CheckerEndpoint;
+       VirtualEndpoint::Ptr m_Endpoint;
 
        ServiceQueue m_Services;
        set<ConfigObject::Ptr> m_PendingServices;

diff --git a/components/configrpc/configrpccomponent.cpp b/components/configrpc/configrpccomponent.cpp
index eab88d432c36e88a1cee7f99d9db74e890d364d0..287162c5077a5d9e47a16f0a44e9344417de2429 100644 (file)
--- a/components/configrpc/configrpccomponent.cpp
+++ b/components/configrpc/configrpccomponent.cpp
@@ -30,30 +30,30 @@ void ConfigRpcComponent::Start(void)
 {
        EndpointManager::Ptr endpointManager = EndpointManager::GetInstance();
 
-       m_ConfigRpcEndpoint = boost::make_shared<VirtualEndpoint>();
+       m_Endpoint = boost::make_shared<VirtualEndpoint>();
 
        long configSource;
        if (GetConfig()->GetProperty("configSource", &configSource) && configSource != 0) {
-               m_ConfigRpcEndpoint->RegisterTopicHandler("config::FetchObjects",
+               m_Endpoint->RegisterTopicHandler("config::FetchObjects",
                    boost::bind(&ConfigRpcComponent::FetchObjectsHandler, this, _2));
 
                ConfigObject::GetAllObjects()->OnObjectAdded.connect(boost::bind(&ConfigRpcComponent::LocalObjectCommittedHandler, this, _2));
                ConfigObject::GetAllObjects()->OnObjectCommitted.connect(boost::bind(&ConfigRpcComponent::LocalObjectCommittedHandler, this, _2));
                ConfigObject::GetAllObjects()->OnObjectRemoved.connect(boost::bind(&ConfigRpcComponent::LocalObjectRemovedHandler, this, _2));
 
-               m_ConfigRpcEndpoint->RegisterPublication("config::ObjectCommitted");
-               m_ConfigRpcEndpoint->RegisterPublication("config::ObjectRemoved");
+               m_Endpoint->RegisterPublication("config::ObjectCommitted");
+               m_Endpoint->RegisterPublication("config::ObjectRemoved");
        }
 
        endpointManager->OnNewEndpoint.connect(boost::bind(&ConfigRpcComponent::NewEndpointHandler, this, _2));
 
-       m_ConfigRpcEndpoint->RegisterPublication("config::FetchObjects");
-       m_ConfigRpcEndpoint->RegisterTopicHandler("config::ObjectCommitted",
+       m_Endpoint->RegisterPublication("config::FetchObjects");
+       m_Endpoint->RegisterTopicHandler("config::ObjectCommitted",
            boost::bind(&ConfigRpcComponent::RemoteObjectCommittedHandler, this, _3));
-       m_ConfigRpcEndpoint->RegisterTopicHandler("config::ObjectRemoved",
+       m_Endpoint->RegisterTopicHandler("config::ObjectRemoved",
            boost::bind(&ConfigRpcComponent::RemoteObjectRemovedHandler, this, _3));
 
-       endpointManager->RegisterEndpoint(m_ConfigRpcEndpoint);
+       endpointManager->RegisterEndpoint(m_Endpoint);
 }
 
 void ConfigRpcComponent::Stop(void)
@@ -61,7 +61,7 @@ void ConfigRpcComponent::Stop(void)
        EndpointManager::Ptr mgr = EndpointManager::GetInstance();
 
        if (mgr)
-               mgr->UnregisterEndpoint(m_ConfigRpcEndpoint);
+               mgr->UnregisterEndpoint(m_Endpoint);
 }
 
 void ConfigRpcComponent::NewEndpointHandler(const Endpoint::Ptr& endpoint)
@@ -78,7 +78,7 @@ void ConfigRpcComponent::SessionEstablishedHandler(const Endpoint::Ptr& endpoint
        RequestMessage request;
        request.SetMethod("config::FetchObjects");
 
-       EndpointManager::GetInstance()->SendUnicastMessage(m_ConfigRpcEndpoint, endpoint, request);
+       EndpointManager::GetInstance()->SendUnicastMessage(m_Endpoint, endpoint, request);
 }
 
 RequestMessage ConfigRpcComponent::MakeObjectMessage(const ConfigObject::Ptr& object, string method, bool includeProperties)
@@ -115,7 +115,7 @@ void ConfigRpcComponent::FetchObjectsHandler(const Endpoint::Ptr& sender)
 
                RequestMessage request = MakeObjectMessage(object, "config::ObjectCommitted", true);
 
-               EndpointManager::GetInstance()->SendUnicastMessage(m_ConfigRpcEndpoint, sender, request);
+               EndpointManager::GetInstance()->SendUnicastMessage(m_Endpoint, sender, request);
        }
 }
 
@@ -124,7 +124,7 @@ void ConfigRpcComponent::LocalObjectCommittedHandler(const ConfigObject::Ptr& ob
        if (!ShouldReplicateObject(object))
                return;
 
-       EndpointManager::GetInstance()->SendMulticastMessage(m_ConfigRpcEndpoint,
+       EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint,
            MakeObjectMessage(object, "config::ObjectCommitted", true));
 }
 
@@ -133,7 +133,7 @@ void ConfigRpcComponent::LocalObjectRemovedHandler(const ConfigObject::Ptr& obje
        if (!ShouldReplicateObject(object))
                return;
 
-       EndpointManager::GetInstance()->SendMulticastMessage(m_ConfigRpcEndpoint,
+       EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint,
            MakeObjectMessage(object, "config::ObjectRemoved", false));
 }
 

diff --git a/components/configrpc/configrpccomponent.h b/components/configrpc/configrpccomponent.h
index 001107ac51be70244ea0145eacaf1e1a66a18c9e..c3f602de5207316c58d83d8dd19b4cb7c579b0b0 100644 (file)
--- a/components/configrpc/configrpccomponent.h
+++ b/components/configrpc/configrpccomponent.h
@@ -34,7 +34,7 @@ public:
        virtual void Stop(void);
 
 private:
-       VirtualEndpoint::Ptr m_ConfigRpcEndpoint;
+       VirtualEndpoint::Ptr m_Endpoint;
 
        void NewEndpointHandler(const Endpoint::Ptr& endpoint);
        void SessionEstablishedHandler(const Endpoint::Ptr& endpoint);

diff --git a/components/delegation/delegationcomponent.cpp b/components/delegation/delegationcomponent.cpp
index efc5c9103d1295de0e907f06227ebde12c79f466..dba68c9231cc4a4c092f6e574df3c50418663d6b 100644 (file)
--- a/components/delegation/delegationcomponent.cpp
+++ b/components/delegation/delegationcomponent.cpp
@@ -39,13 +39,13 @@ void DelegationComponent::Start(void)
        m_DelegationTimer->Start();
        m_DelegationTimer->Reschedule(0);
 
-       m_DelegationEndpoint = boost::make_shared<VirtualEndpoint>();
-       m_DelegationEndpoint->RegisterPublication("checker::AssignService");
-       m_DelegationEndpoint->RegisterPublication("checker::ClearServices");
-       m_DelegationEndpoint->RegisterTopicHandler("checker::CheckResult",
+       m_Endpoint = boost::make_shared<VirtualEndpoint>();
+       m_Endpoint->RegisterPublication("checker::AssignService");
+       m_Endpoint->RegisterPublication("checker::ClearServices");
+       m_Endpoint->RegisterTopicHandler("checker::CheckResult",
            boost::bind(&DelegationComponent::CheckResultRequestHandler, this, _2, _3));
-       m_DelegationEndpoint->RegisterPublication("delegation::ServiceStatus");
-       EndpointManager::GetInstance()->RegisterEndpoint(m_DelegationEndpoint);
+       m_Endpoint->RegisterPublication("delegation::ServiceStatus");
+       EndpointManager::GetInstance()->RegisterEndpoint(m_Endpoint);
 
        EndpointManager::GetInstance()->OnNewEndpoint.connect(bind(&DelegationComponent::NewEndpointHandler, this, _2));
 }
@@ -55,7 +55,7 @@ void DelegationComponent::Stop(void)
        EndpointManager::Ptr mgr = EndpointManager::GetInstance();
 
        if (mgr)
-               mgr->UnregisterEndpoint(m_DelegationEndpoint);
+               mgr->UnregisterEndpoint(m_Endpoint);
 }
 
 void DelegationComponent::ObjectCommittedHandler(const ConfigObject::Ptr& object)
@@ -77,7 +77,7 @@ void DelegationComponent::AssignService(const Endpoint::Ptr& checker, const Serv
 
        Application::Log(LogDebug, "delegation", "Trying to delegate service '" + service.GetName() + "'");
 
-       EndpointManager::GetInstance()->SendUnicastMessage(m_DelegationEndpoint, checker, request);
+       EndpointManager::GetInstance()->SendUnicastMessage(m_Endpoint, checker, request);
 }
 
 void DelegationComponent::ClearServices(const Endpoint::Ptr& checker)
@@ -88,7 +88,7 @@ void DelegationComponent::ClearServices(const Endpoint::Ptr& checker)
        MessagePart params;
        request.SetParams(params);
 
-       EndpointManager::GetInstance()->SendUnicastMessage(m_DelegationEndpoint, checker, request);
+       EndpointManager::GetInstance()->SendUnicastMessage(m_Endpoint, checker, request);
 }
 
 bool DelegationComponent::IsEndpointChecker(const Endpoint::Ptr& endpoint)
@@ -300,7 +300,7 @@ void DelegationComponent::CheckResultRequestHandler(const Endpoint::Ptr& sender,
        RequestMessage rm;
        rm.SetMethod("delegation::ServiceStatus");
        rm.SetParams(params);
-       EndpointManager::GetInstance()->SendMulticastMessage(m_DelegationEndpoint, rm);
+       EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint, rm);
 }
 
 EXPORT_COMPONENT(delegation, DelegationComponent);

diff --git a/components/delegation/delegationcomponent.h b/components/delegation/delegationcomponent.h
index 5b998039cfe18cacdea3e39541b0a550af16160f..5ff024f2b1f6f463733960da137c976a9cc7f7e5 100644 (file)
--- a/components/delegation/delegationcomponent.h
+++ b/components/delegation/delegationcomponent.h
@@ -34,7 +34,7 @@ public:
        virtual void Stop(void);
 
 private:
-       VirtualEndpoint::Ptr m_DelegationEndpoint;
+       VirtualEndpoint::Ptr m_Endpoint;
        ConfigObject::Set::Ptr m_AllServices;
        Timer::Ptr m_DelegationTimer;
 

diff --git a/components/demo/democomponent.cpp b/components/demo/democomponent.cpp
index 19d6fa93bff68001a8efb130d1e98084c1c21ab3..5dc28580e4068842b6ff013b527d6572fc779cae 100644 (file)
--- a/components/demo/democomponent.cpp
+++ b/components/demo/democomponent.cpp
@@ -36,11 +36,11 @@ string DemoComponent::GetName(void) const
  */
 void DemoComponent::Start(void)
 {
-       m_DemoEndpoint = boost::make_shared<VirtualEndpoint>();
-       m_DemoEndpoint->RegisterTopicHandler("demo::HelloWorld",
+       m_Endpoint = boost::make_shared<VirtualEndpoint>();
+       m_Endpoint->RegisterTopicHandler("demo::HelloWorld",
            boost::bind(&DemoComponent::HelloWorldRequestHandler, this, _2, _3));
-       m_DemoEndpoint->RegisterPublication("demo::HelloWorld");
-       EndpointManager::GetInstance()->RegisterEndpoint(m_DemoEndpoint);
+       m_Endpoint->RegisterPublication("demo::HelloWorld");
+       EndpointManager::GetInstance()->RegisterEndpoint(m_Endpoint);
 
        m_DemoTimer = boost::make_shared<Timer>();
        m_DemoTimer->SetInterval(5);
@@ -56,7 +56,7 @@ void DemoComponent::Stop(void)
        EndpointManager::Ptr endpointManager = EndpointManager::GetInstance();
 
        if (endpointManager)
-               endpointManager->UnregisterEndpoint(m_DemoEndpoint);
+               endpointManager->UnregisterEndpoint(m_Endpoint);
 }
 
 /**
@@ -71,7 +71,7 @@ void DemoComponent::DemoTimerHandler(void)
        RequestMessage request;
        request.SetMethod("demo::HelloWorld");
 
-       EndpointManager::GetInstance()->SendMulticastMessage(m_DemoEndpoint, request);
+       EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint, request);
 }
 
 /**

diff --git a/components/demo/democomponent.h b/components/demo/democomponent.h
index 623c6c8b4874615a2bdf56a6043a1b1e0c3bfc2f..1b9114f9a21b1798b2ee0720549d99b66c343be7 100644 (file)
--- a/components/demo/democomponent.h
+++ b/components/demo/democomponent.h
@@ -35,7 +35,7 @@ public:
 
 private:
        Timer::Ptr m_DemoTimer;
-       VirtualEndpoint::Ptr m_DemoEndpoint;
+       VirtualEndpoint::Ptr m_Endpoint;
 
        void DemoTimerHandler(void);
        void HelloWorldRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request);

diff --git a/components/discovery/discoverycomponent.cpp b/components/discovery/discoverycomponent.cpp
index d7b71e8406f4995f3984d5a47ffba539bc7360e8..dc8de5684b993847ddab94f131cc71fb836115dc 100644 (file)
--- a/components/discovery/discoverycomponent.cpp
+++ b/components/discovery/discoverycomponent.cpp
@@ -36,23 +36,23 @@ string DiscoveryComponent::GetName(void) const
  */
 void DiscoveryComponent::Start(void)
 {
-       m_DiscoveryEndpoint = boost::make_shared<VirtualEndpoint>();
+       m_Endpoint = boost::make_shared<VirtualEndpoint>();
 
-       m_DiscoveryEndpoint->RegisterPublication("discovery::RegisterComponent");
-       m_DiscoveryEndpoint->RegisterTopicHandler("discovery::RegisterComponent",
+       m_Endpoint->RegisterPublication("discovery::RegisterComponent");
+       m_Endpoint->RegisterTopicHandler("discovery::RegisterComponent",
                boost::bind(&DiscoveryComponent::RegisterComponentMessageHandler, this, _2, _3));
 
-       m_DiscoveryEndpoint->RegisterPublication("discovery::NewComponent");
-       m_DiscoveryEndpoint->RegisterTopicHandler("discovery::NewComponent",
+       m_Endpoint->RegisterPublication("discovery::NewComponent");
+       m_Endpoint->RegisterTopicHandler("discovery::NewComponent",
                boost::bind(&DiscoveryComponent::NewComponentMessageHandler, this, _3));
 
-       m_DiscoveryEndpoint->RegisterTopicHandler("discovery::Welcome",
+       m_Endpoint->RegisterTopicHandler("discovery::Welcome",
                boost::bind(&DiscoveryComponent::WelcomeMessageHandler, this, _2, _3));
 
        EndpointManager::GetInstance()->ForEachEndpoint(boost::bind(&DiscoveryComponent::NewEndpointHandler, this, _2));
        EndpointManager::GetInstance()->OnNewEndpoint.connect(boost::bind(&DiscoveryComponent::NewEndpointHandler, this, _2));
 
-       EndpointManager::GetInstance()->RegisterEndpoint(m_DiscoveryEndpoint);
+       EndpointManager::GetInstance()->RegisterEndpoint(m_Endpoint);
 
        /* create the reconnect timer */
        m_DiscoveryTimer = boost::make_shared<Timer>();
@@ -72,7 +72,7 @@ void DiscoveryComponent::Stop(void)
        EndpointManager::Ptr mgr = EndpointManager::GetInstance();
 
        if (mgr)
-               mgr->UnregisterEndpoint(m_DiscoveryEndpoint);
+               mgr->UnregisterEndpoint(m_Endpoint);
 }
 
 /**
@@ -260,7 +260,7 @@ void DiscoveryComponent::FinishDiscoverySetup(const Endpoint::Ptr& endpoint)
        endpoint->RegisterSubscription("discovery::Welcome");
        RequestMessage request;
        request.SetMethod("discovery::Welcome");
-       EndpointManager::GetInstance()->SendUnicastMessage(m_DiscoveryEndpoint, endpoint, request);
+       EndpointManager::GetInstance()->SendUnicastMessage(m_Endpoint, endpoint, request);
 
        endpoint->SetSentWelcome(true);
 
@@ -310,9 +310,9 @@ void DiscoveryComponent::SendDiscoveryMessage(const string& method, const string
        params.SetPublications(publications);
 
        if (recipient)
-               EndpointManager::GetInstance()->SendUnicastMessage(m_DiscoveryEndpoint, recipient, request);
+               EndpointManager::GetInstance()->SendUnicastMessage(m_Endpoint, recipient, request);
        else
-               EndpointManager::GetInstance()->SendMulticastMessage(m_DiscoveryEndpoint, request);
+               EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint, request);
 }
 
 bool DiscoveryComponent::HasMessagePermission(const Dictionary::Ptr& roles, const string& messageType, const string& message)

diff --git a/components/discovery/discoverycomponent.h b/components/discovery/discoverycomponent.h
index ed57447bfeaab3ebff55a198fc887a6e9897d368..331030d5ec82165ed34be0b7ae65dd5c1c4caf50 100644 (file)
--- a/components/discovery/discoverycomponent.h
+++ b/components/discovery/discoverycomponent.h
@@ -52,7 +52,7 @@ public:
        virtual void Stop(void);
 
 private:
-       VirtualEndpoint::Ptr m_DiscoveryEndpoint;
+       VirtualEndpoint::Ptr m_Endpoint;
        map<string, ComponentDiscoveryInfo::Ptr> m_Components;
        Timer::Ptr m_DiscoveryTimer;