[asterisk-scf-commits] asterisk-scf/integration/mediatransportudptl.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  747af66347b58c9a4e1244ed1c616983a945ea58 (commit)
      from  1836b0ec0cf302d24ee005ec9d0a0a3bce82e9b9 (commit)

Summary of changes:
 src/UdptlStateReplicatorApp.cpp |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)


- Log -----------------------------------------------------------------
commit 747af66347b58c9a4e1244ed1c616983a945ea58
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Mar 5 11:45:21 2012 -0330

    More build fixes for operation context.

diff --git a/src/UdptlStateReplicatorApp.cpp b/src/UdptlStateReplicatorApp.cpp
index 53a3a30..fd3767e 100644
--- a/src/UdptlStateReplicatorApp.cpp
+++ b/src/UdptlStateReplicatorApp.cpp
@@ -92,17 +92,17 @@ public:
     ComponentServiceImpl(UdptlStateReplicatorService &service) : mService(service) {}
 
 public: // Overrides of the ComponentService interface.
-    virtual void suspend(const ::Ice::Current& = ::Ice::Current())
+    virtual void suspend(const AsteriskSCF::System::V1::OperationContextPtr&, const ::Ice::Current& = ::Ice::Current())
     {
         // TBD
     }
 
-    virtual void resume(const ::Ice::Current& = ::Ice::Current())
+    virtual void resume(const AsteriskSCF::System::V1::OperationContextPtr&, const ::Ice::Current& = ::Ice::Current())
     {
         // TBD
     }
 
-    virtual void shutdown(const ::Ice::Current& = ::Ice::Current())
+    virtual void shutdown(const AsteriskSCF::System::V1::OperationContextPtr&, const ::Ice::Current& = ::Ice::Current())
     {
         // TBD
     }
@@ -115,12 +115,15 @@ class ConfigurationReplicatorI : public ConfigurationReplicator
 {
 public:
     ConfigurationReplicatorI(const IceStorm::TopicPrx& topic) : mConfigurationReplicationTopic(topic) { };
-    void registerConfigurationService(const AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx&, const Ice::Current&);
+    void registerConfigurationService(const AsteriskSCF::System::V1::OperationContextPtr&,
+        const AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx&, const Ice::Current&);
 private:
     IceStorm::TopicPrx mConfigurationReplicationTopic;    
 };
 
-void ConfigurationReplicatorI::registerConfigurationService(const AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx& service, const Ice::Current&)
+void ConfigurationReplicatorI::registerConfigurationService(
+    const AsteriskSCF::System::V1::OperationContextPtr&,
+    const AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx& service, const Ice::Current&)
 {
     if (mConfigurationReplicationTopic)
     {
@@ -165,38 +168,38 @@ void UdptlStateReplicatorService::registerWithServiceLocator(const Ice::Communic
         // The GUID passed in to add service needs to be unique for reporting.
         string componentServiceGuid(AsteriskSCF::Replication::UDPTL::V1::StateReplicatorComponentCategory);
         mComponentServiceManagement = ServiceManagementPrx::uncheckedCast(
-            mServiceLocatorManagement->addService(componentServicePrx, componentServiceGuid));
+            mServiceLocatorManagement->addService(AsteriskSCF::Operations::createContext(), componentServicePrx, componentServiceGuid));
 
         // Add category as a parameter to enable other components look this component up.
         ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
         genericparams->category = AsteriskSCF::Replication::UDPTL::V1::StateReplicatorComponentCategory;
         genericparams->service =  ic->getProperties()->getPropertyWithDefault(mAppName + ".ServiceName", "default");
         genericparams->id = mAppName;
-        mComponentServiceManagement->addLocatorParams(AsteriskSCF::createContext(), genericparams, "");
+        mComponentServiceManagement->addLocatorParams(AsteriskSCF::Operations::createContext(), genericparams, "");
 
         Ice::ObjectPrx stateReplicatorObjectPrx = mAdapter->createDirectProxy(ic->stringToIdentity(ServiceDiscoveryId));
         UdptlStateReplicatorPrx stateReplicatorPrx = UdptlStateReplicatorPrx::checkedCast(stateReplicatorObjectPrx);
 
         string stateReplicationGuid(AsteriskSCF::Replication::UDPTL::V1::StateReplicatorDiscoveryCategory);
         mStateReplicationManagement = ServiceManagementPrx::uncheckedCast(
-            mServiceLocatorManagement->addService(stateReplicatorPrx, stateReplicationGuid));
+            mServiceLocatorManagement->addService(AsteriskSCF::Operations::createContext(), stateReplicatorPrx, stateReplicationGuid));
 
         ServiceLocatorParamsPtr discoveryParams = new ServiceLocatorParams;
         discoveryParams->category = AsteriskSCF::Replication::UDPTL::V1::StateReplicatorDiscoveryCategory;
         discoveryParams->service = ic->getProperties()->getPropertyWithDefault(mAppName + ".ServiceName", "default");
         discoveryParams->id = mAppName;
-        mStateReplicationManagement->addLocatorParams(AsteriskSCF::createContext(), discoveryParams, "");
+        mStateReplicationManagement->addLocatorParams(AsteriskSCF::Operations::createContext(), discoveryParams, "");
 
         // Publish the configuration service IceStorm topic so everybody gets configuration
         mConfigurationManagement = ServiceManagementPrx::uncheckedCast(
-        mServiceLocatorManagement->addService(mConfigurationPublisher, ""));
+        mServiceLocatorManagement->addService(AsteriskSCF::Operations::createContext(), mConfigurationPublisher, ""));
 
         // Populate the configuration parameters with details so we can be found
         ServiceLocatorParamsPtr configurationParams = new ServiceLocatorParams();
         configurationParams->category = ConfigurationDiscoveryCategory;
         configurationParams->service = ic->getProperties()->getPropertyWithDefault(mAppName + ".ServiceName", "default");
         configurationParams->id = mAppName;
-        mConfigurationManagement->addLocatorParams(AsteriskSCF::createContext(), configurationParams, "");
+        mConfigurationManagement->addLocatorParams(AsteriskSCF::Operations::createContext(), configurationParams, "");
 
         // TBD... We may have other interfaces to publish to the Service Locator.
     }
@@ -215,8 +218,8 @@ void UdptlStateReplicatorService::deregisterFromServiceLocator()
 {
     try
     {
-        mComponentServiceManagement->unregister();
-        mConfigurationManagement->unregister();
+        mComponentServiceManagement->unregister(AsteriskSCF::Operations::createContext());
+        mConfigurationManagement->unregister(AsteriskSCF::Operations::createContext());
     }
     catch(...)
     {

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/mediatransportudptl.git