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

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  c1b06d8915120b235bf7fa1aa121134829807d27 (commit)
      from  2206e0fba207444861dce5ee82146485487d1d3e (commit)

Summary of changes:
 src/ConnectBridgedSessionsOperation.cpp |   14 --------------
 src/RoutingServiceEventPublisher.cpp    |   15 ++-------------
 src/SessionListener.cpp                 |   15 ---------------
 3 files changed, 2 insertions(+), 42 deletions(-)


- Log -----------------------------------------------------------------
commit c1b06d8915120b235bf7fa1aa121134829807d27
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Apr 11 11:19:13 2012 -0500

    Removed local functions for utility that now exists in ice-util-cpp.

diff --git a/src/ConnectBridgedSessionsOperation.cpp b/src/ConnectBridgedSessionsOperation.cpp
index f80bbb5..725dc0a 100644
--- a/src/ConnectBridgedSessionsOperation.cpp
+++ b/src/ConnectBridgedSessionsOperation.cpp
@@ -32,20 +32,6 @@ namespace
 {
 Logger lg = getLoggerFactory().getLogger("AsteriskSCF.BasicRoutingService");
 
-
-/** 
- * Create a new OperationContext using a name calculated from the sourceContext, 
- * and having the same transactionId as the source context.
- */
-OperationContextPtr calculateOperationContext(
-    const OperationContextPtr& sourceContext, 
-    const std::string& modifier)
-{
-    std::string calculateId = sourceContext->id + ".ConnectBridgedSessions." + modifier;
-    
-    return new OperationContext(calculateId, sourceContext->transactionId);
-}
-
 } // end unnamed namespace
 
 namespace AsteriskSCF
diff --git a/src/RoutingServiceEventPublisher.cpp b/src/RoutingServiceEventPublisher.cpp
index 91f3a36..ad64464 100644
--- a/src/RoutingServiceEventPublisher.cpp
+++ b/src/RoutingServiceEventPublisher.cpp
@@ -20,6 +20,7 @@
 
 #include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Operations/OperationContext.h>
+#include <AsteriskSCF/Operations/OperationMonitor.h>
 
 #include <boost/thread/mutex.hpp>
 #include "RoutingServiceEventPublisher.h"
@@ -29,23 +30,11 @@ using namespace ::AsteriskSCF::Core::Routing::V1;
 using namespace ::AsteriskSCF::System::Logging;
 using namespace ::AsteriskSCF::BasicRoutingService;
 using namespace ::AsteriskSCF::System::V1;
+using namespace ::AsteriskSCF::Operations;
 
 namespace
 {
 Logger lg = getLoggerFactory().getLogger("AsteriskSCF.BasicRoutingService");
-
-/** 
- * Create a new OperationContext using the id of a source context and a modifer. 
- * It will have the same transactionId as the source context.
- */
-OperationContextPtr calculateOperationContext(
-    const OperationContextPtr& sourceContext, 
-    const std::string& modifier)
-{
-    std::string calculateId = sourceContext->id + ".Event." + modifier;
-    
-    return new OperationContext(calculateId, sourceContext->transactionId);
-}
 }
 
 namespace AsteriskSCF
diff --git a/src/SessionListener.cpp b/src/SessionListener.cpp
index 2aab727..7487d31 100644
--- a/src/SessionListener.cpp
+++ b/src/SessionListener.cpp
@@ -32,21 +32,6 @@ using namespace AsteriskSCF::Operations;
 namespace
 {
 Logger lg = getLoggerFactory().getLogger("AsteriskSCF.BasicRoutingService");
-
-
-/** 
- * Create a new OperationContext using a name calculated from the sourceContext, 
- * and having the same transactionId as the source context.
- */
-OperationContextPtr calculateOperationContext(
-    const OperationContextPtr& sourceContext, 
-    const std::string& modifier)
-{
-    std::string calculateId = sourceContext->id + "." + modifier;
-    
-    return new OperationContext(calculateId, sourceContext->transactionId);
-}
-
 }
 
 namespace AsteriskSCF

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


-- 
asterisk-scf/integration/routing.git