[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "operation-context-propagation" created.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Mon Feb 6 13:30:25 CST 2012 

branch "operation-context-propagation" has been created
        at  ad27c6de20b28f7c8d7035ad55e43ffb1153874e (commit)

- Log -----------------------------------------------------------------
commit ad27c6de20b28f7c8d7035ad55e43ffb1153874e
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Feb 6 15:34:54 2012 -0330

    In progress changes for operation context, replicator not touched.

diff --git a/src/Component.cpp b/src/Component.cpp
index 43d1166..7182c0b 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -22,6 +22,7 @@
 #include <IceUtil/UUID.h>
 
 #include <boost/shared_ptr.hpp>
+#include <AsteriskSCF/Helpers/OperationContext.h>
 
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/Media/MediaIf.h>
@@ -73,10 +74,11 @@ public:
       const ConfigurationServiceImplPtr&);
 
     RTPSessionPrx allocate(
-            const RTPServiceLocatorParamsPtr&,
-            const RTPOptionsPtr&,
-            RTPAllocationOutputsPtr&,
-            const Ice::Current&);
+        const AsteriskSCF::System::V1::OperationContextPtr&,
+        const RTPServiceLocatorParamsPtr&,
+        const RTPOptionsPtr&,
+        RTPAllocationOutputsPtr&,
+        const Ice::Current&);
 
     pj_pool_factory *getPoolFactory() { return mEnvironment->poolFactory(); };
 
@@ -261,10 +263,11 @@ RTPMediaServiceImpl::RTPMediaServiceImpl(const Ice::ObjectAdapterPtr& adapter,
  * Implementation of the allocate method as defined in MediaRTPIf.ice
  */
 RTPSessionPrx RTPMediaServiceImpl::allocate(
-        const RTPServiceLocatorParamsPtr& params,
-        const RTPOptionsPtr& options,
-        RTPAllocationOutputsPtr& outputs,
-        const Ice::Current&)
+    const AsteriskSCF::System::V1::OperationContextPtr&,
+    const RTPServiceLocatorParamsPtr& params,
+    const RTPOptionsPtr& options,
+    RTPAllocationOutputsPtr& outputs,
+    const Ice::Current&)
 {
     return AsteriskSCF::PJMEDIARTP::RTPSession::create(
             mAdapter,
@@ -532,7 +535,8 @@ void Component::onRegisterPrimaryServices()
     }
 
     mGeneralState->serviceManagement = mRTPMediaServiceRegistration->getServiceManagement();
-    mGeneralState->serviceManagement->addLocatorParams(mRTPOverIceLocatorParams, getName() + ".RTP.Comparator");
+    mGeneralState->serviceManagement->addLocatorParams(AsteriskSCF::createContext(),
+        mRTPOverIceLocatorParams, getName() + ".RTP.Comparator");
 }
 
 void Component::onStart()
diff --git a/src/RTPConfiguration.cpp b/src/RTPConfiguration.cpp
index 3c5650a..69d3fc8 100644
--- a/src/RTPConfiguration.cpp
+++ b/src/RTPConfiguration.cpp
@@ -47,11 +47,11 @@ public:
     AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq
     getConfigurationGroups(const Ice::Current&);
 
-    void setConfiguration(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
+    void setConfiguration(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
 
-    void removeConfigurationItems(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
+    void removeConfigurationItems(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
             const Ice::Current&);
-    void removeConfigurationGroups(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
+    void removeConfigurationGroups(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
             const Ice::Current&);
 
     /**
@@ -313,7 +313,7 @@ ConfigurationGroupSeq ConfigurationServiceServant::getConfigurationGroups(const
     return groups;
 }
 
-void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq& groups,
+void ConfigurationServiceServant::setConfiguration(const AsteriskSCF::System::V1::OperationContextPtr&, const ConfigurationGroupSeq& groups,
     const Ice::Current&)
 {
     class GroupVisitor : public RTPConfigurationGroupVisitor
@@ -506,6 +506,7 @@ void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq&
 }
 
 void ConfigurationServiceServant::removeConfigurationItems(
+    const AsteriskSCF::System::V1::OperationContextPtr&,
     const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
 {
     class GroupVisitor : public RTPConfigurationGroupVisitor
@@ -666,7 +667,9 @@ void ConfigurationServiceServant::removeConfigurationItems(
     }
 }
 
-void ConfigurationServiceServant::removeConfigurationGroups(const ConfigurationGroupSeq& groups, const Ice::Current&)
+void ConfigurationServiceServant::removeConfigurationGroups(
+        const AsteriskSCF::System::V1::OperationContextPtr&,
+        const ConfigurationGroupSeq& groups, const Ice::Current&)
 {
     class GroupVisitor : public RTPConfigurationGroupVisitor
     {
diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
index 4cccbb1..190658e 100644
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@ -178,13 +178,13 @@ public:
 
     void useRTCP(bool, const Ice::Current&);
     void release(const Ice::Current&);
-    void associatePayloads(const AsteriskSCF::Media::RTP::V1::PayloadMap&, const Ice::Current&);
+    void associatePayloads(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::Media::RTP::V1::PayloadMap&, const Ice::Current&);
 
     /**
      * AsteriskSCF::Media::V1::SRTPSession implementation.
      */
-    void setOptions(const string& suiteName, const string& keyInfo, bool enableAuthentication, bool enableEncryption, const Ice::Current&);
-    void start(const string& suiteName, const string& keyInfo, bool enableAuthentication, bool enableEncryption, const Ice::Current&);
+    void setOptions(const AsteriskSCF::System::V1::OperationContextPtr&, const string& suiteName, const string& keyInfo, bool enableAuthentication, bool enableEncryption, const Ice::Current&);
+    void start(const AsteriskSCF::System::V1::OperationContextPtr&, const string& suiteName, const string& keyInfo, bool enableAuthentication, bool enableEncryption, const Ice::Current&);
 
     /**
      * Internal methods. 
@@ -364,7 +364,7 @@ public:
         return pj_sockaddr_get_port(&transportInfo.sock_info.rtcp_addr_name);
     }
 
-    void setRemoteDetails(const std::string& address, Ice::Int port, const Ice::Current&)
+    void setRemoteDetails(const AsteriskSCF::System::V1::OperationContextPtr&, const std::string& address, Ice::Int port, const Ice::Current&)
     {
         mSession->setRemoteRtcpDetails(address, port);
     }
@@ -709,7 +709,7 @@ void RTPSessionImpl::release(const Ice::Current&)
 /**
  * Implementation of the associatePayloads method as defined in MediaRTPIf.ice
  */
-void RTPSessionImpl::associatePayloads(const AsteriskSCF::Media::RTP::V1::PayloadMap& mappings, const Ice::Current&)
+void RTPSessionImpl::associatePayloads(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::Media::RTP::V1::PayloadMap& mappings, const Ice::Current&)
 {
     mSessionStateItem->payloadstoFormats = mappings;
     associatePayloadsImpl(mappings);
@@ -719,7 +719,7 @@ void RTPSessionImpl::associatePayloads(const AsteriskSCF::Media::RTP::V1::Payloa
 }
 
 
-void RTPSessionImpl::setOptions(const string& suiteName, const string& key, bool enableAuthentication, bool enableEncryption, const Ice::Current&)
+void RTPSessionImpl::setOptions(const AsteriskSCF::System::V1::OperationContextPtr&, const string& suiteName, const string& key, bool enableAuthentication, bool enableEncryption, const Ice::Current&)
 {
     SRTPTransportPtr srtpTransport(boost::dynamic_pointer_cast<SRTPTransport>(mTransport));
     if (!srtpTransport)
@@ -729,7 +729,7 @@ void RTPSessionImpl::setOptions(const string& suiteName, const string& key, bool
     srtpTransport->setOptions(suiteName, key, enableAuthentication, enableEncryption);
 }
 
-void RTPSessionImpl::start(const string& suiteName, const string& key, bool enableAuthentication, bool enableEncryption, const Ice::Current&)
+void RTPSessionImpl::start(const AsteriskSCF::System::V1::OperationContextPtr&, const string& suiteName, const string& key, bool enableAuthentication, bool enableEncryption, const Ice::Current&)
 {
     SRTPTransportPtr srtpTransport(boost::dynamic_pointer_cast<SRTPTransport>(mTransport));
     if (!srtpTransport)
diff --git a/src/RTPSource.cpp b/src/RTPSource.cpp
index 3957880..26ece57 100644
--- a/src/RTPSource.cpp
+++ b/src/RTPSource.cpp
@@ -42,6 +42,7 @@
 #include <AsteriskSCF/Media/Formats/OtherFormatsIf.h>
 #include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/System/Component/ReplicaIf.h>
+#include <AsteriskSCF/Helpers/OperationContext.h>
 
 using namespace std;
 using namespace AsteriskSCF::Core::Discovery::V1;
@@ -123,7 +124,7 @@ public:
              listener != listeners.end();
              ++listener)
         {
-            (*listener)->sinkStatisticsUpdated(mSink, statistics);
+            (*listener)->sinkStatisticsUpdated(AsteriskSCF::createContext(), mSink, statistics);
         }
     }
 
@@ -339,7 +340,9 @@ std::string StreamSourceRTPImpl::getId(const Ice::Current&)
 /**
  * Implementation of the requestMethod method as defined in MediaIf.ice
  */
-void StreamSourceRTPImpl::requestFormat(const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&)
+void StreamSourceRTPImpl::requestFormat(
+    const AsteriskSCF::System::V1::OperationContextPtr&,
+    const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&)
 {
     // We do not currently support switching formats. 
     throw MediaFormatSwitchException();
@@ -420,7 +423,7 @@ static void receiveRTP(void *userdata, void *packet, pj_ssize_t size)
              listener != listeners.end();
              ++listener)
         {
-            (*listener)->sourceSsrcChanged(source->mImpl->mSource, source->mImpl->mIncomingSession.peer_ssrc);
+            (*listener)->sourceSsrcChanged(AsteriskSCF::createContext(), source->mImpl->mSource, source->mImpl->mIncomingSession.peer_ssrc);
         }
     }
 
@@ -531,7 +534,7 @@ static void receiveRTCP(void *userdata, void *packet, pj_ssize_t size)
          listener != listeners.end();
          ++listener)
     {
-        (*listener)->sourceStatisticsUpdated(source->mImpl->mSource, statistics);
+        (*listener)->sourceStatisticsUpdated(AsteriskSCF::createContext(), source->mImpl->mSource, statistics);
     }
 }
 
diff --git a/src/RTPSource.h b/src/RTPSource.h
index b28f9fc..d69c4d7 100644
--- a/src/RTPSource.h
+++ b/src/RTPSource.h
@@ -36,7 +36,8 @@ public:
     AsteriskSCF::Media::V1::StreamSinkSeq getSinks(const Ice::Current&);
     AsteriskSCF::Media::V1::FormatSeq getFormats(const Ice::Current&);
     std::string getId(const Ice::Current&);
-    void requestFormat(const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&);
+    void requestFormat(const AsteriskSCF::System::V1::OperationContextPtr&,
+        const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&);
     std::string getLocalAddress(const Ice::Current&);
     Ice::Int getLocalPort(const Ice::Current&);
 
diff --git a/src/RTPTelephonyEventSink.cpp b/src/RTPTelephonyEventSink.cpp
index 0e6ed60..4acb442 100644
--- a/src/RTPTelephonyEventSink.cpp
+++ b/src/RTPTelephonyEventSink.cpp
@@ -56,6 +56,7 @@ RTPTelephonyEventSink::RTPTelephonyEventSink(
 
 void RTPTelephonyEventSink::write_async(
         const AMD_TelephonyEventSink_writePtr& cb,
+        const AsteriskSCF::System::V1::OperationContextPtr&,
         const TelephonyEventPtr& event,
         const Ice::Current&)
 {
diff --git a/src/RTPTelephonyEventSink.h b/src/RTPTelephonyEventSink.h
index 2c70c09..e11a23f 100644
--- a/src/RTPTelephonyEventSink.h
+++ b/src/RTPTelephonyEventSink.h
@@ -42,6 +42,7 @@ public:
      */
     void write_async(
             const AsteriskSCF::SessionCommunications::V1::AMD_TelephonyEventSink_writePtr&,
+            const AsteriskSCF::System::V1::OperationContextPtr&,
             const AsteriskSCF::SessionCommunications::V1::TelephonyEventPtr&,
             const Ice::Current&);
 
diff --git a/src/RTPTelephonyEventSource.cpp b/src/RTPTelephonyEventSource.cpp
index 66b263f..a097ce1 100644
--- a/src/RTPTelephonyEventSource.cpp
+++ b/src/RTPTelephonyEventSource.cpp
@@ -19,6 +19,7 @@
 #include <AsteriskSCF/Logger.h>
 #include <pjmedia.h>
 #include <IceUtil/UUID.h>
+#include <AsteriskSCF/Helpers/OperationContext.h>
 
 using namespace AsteriskSCF::SessionCommunications::V1;
 using namespace AsteriskSCF::System::Logging;
@@ -47,6 +48,7 @@ RTPTelephonyEventSource::~RTPTelephonyEventSource()
 
 void RTPTelephonyEventSource::addSinks_async(
         const AMD_TelephonyEventSource_addSinksPtr& cb,
+        const AsteriskSCF::System::V1::OperationContextPtr&,
         const TelephonyEventSinkSeq& sinks,
         const Ice::Current&)
 {
@@ -73,6 +75,7 @@ void RTPTelephonyEventSource::getSinks_async(
 
 void RTPTelephonyEventSource::removeSinks_async(
         const AMD_TelephonyEventSource_removeSinksPtr& cb,
+        const AsteriskSCF::System::V1::OperationContextPtr&,
         const TelephonyEventSinkSeq& sinks,
         const Ice::Current&)
 {
@@ -217,7 +220,7 @@ void RTPTelephonyEventSource::distributeToSinks(const TelephonyEventPtr& event)
     {
         try
         {
-            (*iter)->write(event);
+            (*iter)->write(AsteriskSCF::createContext(), event);
         }
         catch (const Ice::Exception&)
         {
diff --git a/src/RTPTelephonyEventSource.h b/src/RTPTelephonyEventSource.h
index edd249f..4e60c55 100644
--- a/src/RTPTelephonyEventSource.h
+++ b/src/RTPTelephonyEventSource.h
@@ -40,6 +40,7 @@ public:
      */
     void addSinks_async(
             const AsteriskSCF::SessionCommunications::V1::AMD_TelephonyEventSource_addSinksPtr& cb,
+            const AsteriskSCF::System::V1::OperationContextPtr&,
             const AsteriskSCF::SessionCommunications::V1::TelephonyEventSinkSeq& sinks,
             const Ice::Current&);
 
@@ -49,6 +50,7 @@ public:
 
     void removeSinks_async(
             const AsteriskSCF::SessionCommunications::V1::AMD_TelephonyEventSource_removeSinksPtr& cb,
+            const AsteriskSCF::System::V1::OperationContextPtr&,
             const AsteriskSCF::SessionCommunications::V1::TelephonyEventSinkSeq& sinks,
             const Ice::Current&);
 

commit 08da42c8d62e313744e028ebf951d4ebc092430e
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Jan 3 14:37:41 2012 -0600

    Adjust component library names and update test config files

diff --git a/config/test_component.conf b/config/test_component.conf
index 838db61..8b7b63b 100644
--- a/config/test_component.conf
+++ b/config/test_component.conf
@@ -5,7 +5,7 @@
 #
 
 IceBox.InheritProperties=1
-IceBox.LoadOrder=ServiceDiscovery,RtpStateReplicator,MediaServiceRTP,MediaRTPpjmediaTest
+IceBox.LoadOrder=ServiceDiscovery,RTPStateReplicator,MediaServiceRTP,MediaRTPpjmediaTest
 
 Ice.Override.Timeout=5000
 
@@ -13,7 +13,7 @@ Ice.Override.Timeout=5000
 # Service Locator Configuration
 #
 
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
 
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
 
@@ -29,26 +29,26 @@ ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
 ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
 
 #
-# RtpStateReplicator Configuration
+# RTPStateReplicator Configuration
 #
-IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
+IceBox.Service.RTPStateReplicator=RTPStateReplicator:create
 
 # Adapter parameters for this component
-RtpStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
+RTPStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
 
 # IceStorm parameters for the RTP state replicator
-RtpStateReplicator.IceStorm.InstanceName=RtpStateReplicator
-RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10007
-RtpStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10008
-RtpStateReplicator.IceStorm.Trace.TopicManager=2
-RtpStateReplicator.IceStorm.Transient=1
-RtpStateReplicator.IceStorm.Flush.Timeout=2000
+RTPStateReplicator.IceStorm.InstanceName=RTPStateReplicator
+RTPStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10007
+RTPStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10008
+RTPStateReplicator.IceStorm.Trace.TopicManager=2
+RTPStateReplicator.IceStorm.Transient=1
+RTPStateReplicator.IceStorm.Flush.Timeout=2000
 
 #
 # media_rtp_pjmedia Configuration
 #
 
-IceBox.Service.MediaServiceRTP=media_rtp_pjmedia:create
+IceBox.Service.MediaServiceRTP=MediaRTPPJMEDIA:create
 
 # Name of this service
 MediaServiceRTP.ServiceName=test
@@ -67,4 +67,4 @@ LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 # media_rtp_pjmedia_test Configuration
 #
 
-IceBox.Service.MediaRTPpjmediaTest=media_rtp_pjmedia_test:create
+IceBox.Service.MediaRTPpjmediaTest=MediaRTPPJMEDIATest:create
diff --git a/config/test_component_v6.conf b/config/test_component_v6.conf
index fb51bf3..6c991c6 100644
--- a/config/test_component_v6.conf
+++ b/config/test_component_v6.conf
@@ -5,7 +5,7 @@
 #
 
 IceBox.InheritProperties=1
-IceBox.LoadOrder=ServiceDiscovery,RtpStateReplicator,MediaServiceRTP,MediaRTPpjmediaTest
+IceBox.LoadOrder=ServiceDiscovery,RTPStateReplicator,MediaServiceRTP,MediaRTPpjmediaTest
 
 Ice.Override.Timeout=5000
 
@@ -13,7 +13,7 @@ Ice.Override.Timeout=5000
 # Service Locator Configuration
 #
 
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
 
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
 
@@ -29,26 +29,26 @@ ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
 ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
 
 #
-# RtpStateReplicator Configuration
+# RTPStateReplicator Configuration
 #
-IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
+IceBox.Service.RTPStateReplicator=RTPStateReplicator:create
 
 # Adapter parameters for this component
-RtpStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
+RTPStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
 
 # IceStorm parameters for the RTP state replicator
-RtpStateReplicator.IceStorm.InstanceName=RtpStateReplicator
-RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10007
-RtpStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10008
-RtpStateReplicator.IceStorm.Trace.TopicManager=2
-RtpStateReplicator.IceStorm.Transient=1
-RtpStateReplicator.IceStorm.Flush.Timeout=2000
+RTPStateReplicator.IceStorm.InstanceName=RTPStateReplicator
+RTPStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10007
+RTPStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10008
+RTPStateReplicator.IceStorm.Trace.TopicManager=2
+RTPStateReplicator.IceStorm.Transient=1
+RTPStateReplicator.IceStorm.Flush.Timeout=2000
 
 #
 # media_rtp_pjmedia Configuration
 #
 
-IceBox.Service.MediaServiceRTP=media_rtp_pjmedia:create
+IceBox.Service.MediaServiceRTP=MediaRTPPJMEDIA:create
 
 # Name of this service
 MediaServiceRTP.ServiceName=test
@@ -67,4 +67,4 @@ LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 # media_rtp_pjmedia_test Configuration
 #
 
-IceBox.Service.MediaRTPpjmediaTest=media_rtp_pjmedia_test_v6:create
+IceBox.Service.MediaRTPpjmediaTest=MediaRTPPJMEDIATestV6:create
diff --git a/config/test_rtp_ice.conf b/config/test_rtp_ice.conf
index 6bed933..4edbeca 100644
--- a/config/test_rtp_ice.conf
+++ b/config/test_rtp_ice.conf
@@ -3,14 +3,14 @@
 #
 # Icebox Configuration
 #
-RtpConfiguration.Name=rtpoice
+RTPConfiguration.Name=rtpoice
 IceBox.InheritProperties=1
 IceBox.LoadOrder=ServiceDiscovery,MediaRTPpjmedia,MediaRTPpjmediaTest
 
-# RtpStateReplicator Configuration
+# RTPStateReplicator Configuration
 
 # Adapter parameters for this component
-RtpStateReplicator.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
+RTPStateReplicator.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
 
 # A proxy to the service locator management service
 LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4422
@@ -22,7 +22,7 @@ LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 # media_rtp_pjmedia Configuration
 #
 
-IceBox.Service.MediaRTPpjmedia=media_rtp_pjmedia:create
+IceBox.Service.MediaRTPpjmedia=MediaRTPPJMEDIA:create
 
 # Adapter parameters for this component
 MediaRTPpjmediaAdapter.Endpoints=default -h 127.0.0.1
@@ -39,13 +39,13 @@ ServiceLocatorProxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 # media_rtp_pjmedia_test Configuration
 #
 
-IceBox.Service.MediaRTPpjmediaTest=media_rtp_pjmedia_ice_test:create
+IceBox.Service.MediaRTPpjmediaTest=MediaRTPPJMEDIAIceTest:create
 
 #
 # Service Locator Configuration
 #
 
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
 
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d14e800..8d1cf96 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,61 +1,61 @@
 include_directories(${astscf-ice-util-cpp_dir}/include)
 include_directories(${logger_dir}/include)
 
-astscf_component_init(media_rtp_pjmedia)
-astscf_component_add_files(media_rtp_pjmedia Component.cpp)
-astscf_component_add_files(media_rtp_pjmedia RTPSession.cpp)
-astscf_component_add_files(media_rtp_pjmedia RTPSource.cpp)
-astscf_component_add_files(media_rtp_pjmedia RTPTelephonyEventSource.cpp)
-astscf_component_add_files(media_rtp_pjmedia RTPSink.cpp)
-astscf_component_add_files(media_rtp_pjmedia RTPTelephonyEventSink.cpp)
-astscf_component_add_files(media_rtp_pjmedia RTPSession.h)
-astscf_component_add_files(media_rtp_pjmedia RTPSource.h)
-astscf_component_add_files(media_rtp_pjmedia RTPTelephonyEventSource.h)
-astscf_component_add_files(media_rtp_pjmedia RTPSink.h)
-astscf_component_add_files(media_rtp_pjmedia RTPReplicationContext.h)
-astscf_component_add_files(media_rtp_pjmedia RTPTelephonyEventSink.h)
-astscf_component_add_files(media_rtp_pjmedia RTPStateReplicatorListener.cpp)
-astscf_component_add_files(media_rtp_pjmedia RTPStateReplicator.h)
-astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.cpp)
-astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.h)
-astscf_component_add_files(media_rtp_pjmedia PJLIBConfiguration.cpp)
-astscf_component_add_files(media_rtp_pjmedia PJLIBConfiguration.h)
-astscf_component_add_files(media_rtp_pjmedia PJMEDIAEnvironment.cpp)
-astscf_component_add_files(media_rtp_pjmedia PJMEDIAEnvironment.h)
-astscf_component_add_files(media_rtp_pjmedia PJMEDIATransport.cpp)
-astscf_component_add_files(media_rtp_pjmedia PJMEDIATransport.h)
-astscf_component_add_files(media_rtp_pjmedia PJMEDIAEndpoint.cpp)
-astscf_component_add_files(media_rtp_pjmedia PJMEDIAEndpoint.h)
-astscf_component_add_files(media_rtp_pjmedia UDPTransport.cpp)
-astscf_component_add_files(media_rtp_pjmedia UDPTransport.h)
-astscf_component_add_files(media_rtp_pjmedia PJUtil.h)
-astscf_component_add_files(media_rtp_pjmedia ReplicationAdapter.h)
-astscf_component_add_files(media_rtp_pjmedia SessionAdapter.h)
-astscf_component_add_files(media_rtp_pjmedia Configuration.h)
-astscf_component_add_files(media_rtp_pjmedia NATConfig.cpp)
-astscf_component_add_files(media_rtp_pjmedia NATConfig.h)
-astscf_component_add_files(media_rtp_pjmedia NATModule.cpp)
-astscf_component_add_files(media_rtp_pjmedia NATModule.h)
-astscf_component_add_files(media_rtp_pjmedia ICEConfiguration.cpp)
-astscf_component_add_files(media_rtp_pjmedia ICEConfiguration.h)
-astscf_component_add_files(media_rtp_pjmedia ICETransport.cpp)
-astscf_component_add_files(media_rtp_pjmedia ICETransport.h)
-astscf_component_add_files(media_rtp_pjmedia SRTPConfiguration.cpp)
-astscf_component_add_files(media_rtp_pjmedia SRTPConfiguration.h)
-astscf_component_add_files(media_rtp_pjmedia SRTPTransport.cpp)
-astscf_component_add_files(media_rtp_pjmedia SRTPTransport.h)
-astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
-astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice)
-astscf_component_add_boost_libraries(media_rtp_pjmedia core thread)
-astscf_component_add_slice_collection_libraries(media_rtp_pjmedia ASTSCF)
-astscf_component_build_icebox(media_rtp_pjmedia)
-target_link_libraries(media_rtp_pjmedia LoggingClient ASTSCFIceUtilCpp ASTSCFIceUtilCppPJLIB)
+astscf_component_init(MediaRTPPJMEDIA)
+astscf_component_add_files(MediaRTPPJMEDIA Component.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA RTPSession.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA RTPSource.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA RTPTelephonyEventSource.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA RTPSink.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA RTPTelephonyEventSink.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA RTPSession.h)
+astscf_component_add_files(MediaRTPPJMEDIA RTPSource.h)
+astscf_component_add_files(MediaRTPPJMEDIA RTPTelephonyEventSource.h)
+astscf_component_add_files(MediaRTPPJMEDIA RTPSink.h)
+astscf_component_add_files(MediaRTPPJMEDIA RTPReplicationContext.h)
+astscf_component_add_files(MediaRTPPJMEDIA RTPTelephonyEventSink.h)
+astscf_component_add_files(MediaRTPPJMEDIA RTPStateReplicatorListener.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA RTPStateReplicator.h)
+astscf_component_add_files(MediaRTPPJMEDIA RTPConfiguration.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA RTPConfiguration.h)
+astscf_component_add_files(MediaRTPPJMEDIA PJLIBConfiguration.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA PJLIBConfiguration.h)
+astscf_component_add_files(MediaRTPPJMEDIA PJMEDIAEnvironment.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA PJMEDIAEnvironment.h)
+astscf_component_add_files(MediaRTPPJMEDIA PJMEDIATransport.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA PJMEDIATransport.h)
+astscf_component_add_files(MediaRTPPJMEDIA PJMEDIAEndpoint.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA PJMEDIAEndpoint.h)
+astscf_component_add_files(MediaRTPPJMEDIA UDPTransport.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA UDPTransport.h)
+astscf_component_add_files(MediaRTPPJMEDIA PJUtil.h)
+astscf_component_add_files(MediaRTPPJMEDIA ReplicationAdapter.h)
+astscf_component_add_files(MediaRTPPJMEDIA SessionAdapter.h)
+astscf_component_add_files(MediaRTPPJMEDIA Configuration.h)
+astscf_component_add_files(MediaRTPPJMEDIA NATConfig.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA NATConfig.h)
+astscf_component_add_files(MediaRTPPJMEDIA NATModule.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA NATModule.h)
+astscf_component_add_files(MediaRTPPJMEDIA ICEConfiguration.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA ICEConfiguration.h)
+astscf_component_add_files(MediaRTPPJMEDIA ICETransport.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA ICETransport.h)
+astscf_component_add_files(MediaRTPPJMEDIA SRTPConfiguration.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA SRTPConfiguration.h)
+astscf_component_add_files(MediaRTPPJMEDIA SRTPTransport.cpp)
+astscf_component_add_files(MediaRTPPJMEDIA SRTPTransport.h)
+astscf_component_add_slices(MediaRTPPJMEDIA PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
+astscf_component_add_slices(MediaRTPPJMEDIA PROJECT AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice)
+astscf_component_add_boost_libraries(MediaRTPPJMEDIA core thread)
+astscf_component_add_slice_collection_libraries(MediaRTPPJMEDIA ASTSCF)
+astscf_component_build_icebox(MediaRTPPJMEDIA)
+target_link_libraries(MediaRTPPJMEDIA LoggingClient ASTSCFIceUtilCpp ASTSCFIceUtilCppPJLIB)
 
-pjproject_link(media_rtp_pjmedia pjlib)
-pjproject_link(media_rtp_pjmedia pjlib-util)
-pjproject_link(media_rtp_pjmedia pjmedia)
-pjproject_link(media_rtp_pjmedia pjnath)
-astscf_component_install(media_rtp_pjmedia)
+pjproject_link(MediaRTPPJMEDIA pjlib)
+pjproject_link(MediaRTPPJMEDIA pjlib-util)
+pjproject_link(MediaRTPPJMEDIA pjmedia)
+pjproject_link(MediaRTPPJMEDIA pjnath)
+astscf_component_install(MediaRTPPJMEDIA)
 
 astscf_component_init(RTPStateReplicator)
 astscf_component_add_files(RTPStateReplicator RTPStateReplicatorApp.cpp)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index aff9fbb..3a940b7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,33 +1,33 @@
 include_directories(${astscf-ice-util-cpp_dir}/include)
-astscf_component_init(media_rtp_pjmedia_test)
+astscf_component_init(MediaRTPPJMEDIATest)
 astscf_slice_collection(LOCAL PATH  "${CMAKE_CURRENT_SOURCE_DIR}") 
-astscf_component_add_files(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
-astscf_component_add_slices(media_rtp_pjmedia_test PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
-astscf_component_add_slices(media_rtp_pjmedia_test LOCAL TestRTPpjmediaIf.ice)
-astscf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread date_time)
-astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_test ASTSCF)
-astscf_component_build_icebox(media_rtp_pjmedia_test)
+astscf_component_add_files(MediaRTPPJMEDIATest TestRTPpjmedia.cpp)
+astscf_component_add_slices(MediaRTPPJMEDIATest PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
+astscf_component_add_slices(MediaRTPPJMEDIATest LOCAL TestRTPpjmediaIf.ice)
+astscf_component_add_boost_libraries(MediaRTPPJMEDIATest unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(MediaRTPPJMEDIATest ASTSCF)
+astscf_component_build_icebox(MediaRTPPJMEDIATest)
 
-astscf_component_init(media_rtp_pjmedia_test_v6)
+astscf_component_init(MediaRTPPJMEDIATestV6)
 astscf_slice_collection(LOCAL PATH  "${CMAKE_CURRENT_SOURCE_DIR}") 
-astscf_component_add_files(media_rtp_pjmedia_test_v6 TestRTPpjmedia.cpp)
-astscf_component_add_slices(media_rtp_pjmedia_test_v6 PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
-astscf_component_add_slices(media_rtp_pjmedia_test_v6 LOCAL TestRTPpjmediaIf.ice)
-astscf_component_add_boost_libraries(media_rtp_pjmedia_test_v6 unit_test_framework thread date_time)
-astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_test_v6 ASTSCF)
-astscf_component_build_icebox(media_rtp_pjmedia_test_v6)
-pjproject_link(media_rtp_pjmedia_test_v6 pjlib)
-set_property(TARGET media_rtp_pjmedia_test_v6 PROPERTY COMPILE_DEFINITIONS IPV6_TEST)
+astscf_component_add_files(MediaRTPPJMEDIATestV6 TestRTPpjmedia.cpp)
+astscf_component_add_slices(MediaRTPPJMEDIATestV6 PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
+astscf_component_add_slices(MediaRTPPJMEDIATestV6 LOCAL TestRTPpjmediaIf.ice)
+astscf_component_add_boost_libraries(MediaRTPPJMEDIATestV6 unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(MediaRTPPJMEDIATestV6 ASTSCF)
+astscf_component_build_icebox(MediaRTPPJMEDIATestV6)
+pjproject_link(MediaRTPPJMEDIATestV6 pjlib)
+set_property(TARGET MediaRTPPJMEDIATestV6 PROPERTY COMPILE_DEFINITIONS IPV6_TEST)
 
-astscf_component_init(media_rtp_pjmedia_ice_test)
-astscf_component_add_files(media_rtp_pjmedia_ice_test TestRTPICE.cpp)
-astscf_component_add_slices(media_rtp_pjmedia_ice_test PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
-astscf_component_add_slices(media_rtp_pjmedia_ice_test PROJECT AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice)
-astscf_component_add_boost_libraries(media_rtp_pjmedia_ice_test unit_test_framework thread date_time)
-astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_ice_test ASTSCF)
-astscf_component_build_icebox(media_rtp_pjmedia_ice_test)
-pjproject_link(media_rtp_pjmedia_ice_test pjlib)
+astscf_component_init(MediaRTPPJMEDIAIceTest)
+astscf_component_add_files(MediaRTPPJMEDIAIceTest TestRTPICE.cpp)
+astscf_component_add_slices(MediaRTPPJMEDIAIceTest PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
+astscf_component_add_slices(MediaRTPPJMEDIAIceTest PROJECT AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice)
+astscf_component_add_boost_libraries(MediaRTPPJMEDIAIceTest unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(MediaRTPPJMEDIAIceTest ASTSCF)
+astscf_component_build_icebox(MediaRTPPJMEDIAIceTest)
+pjproject_link(MediaRTPPJMEDIAIceTest pjlib)
 
-astscf_test_icebox(media_rtp_pjmedia_test config/test_component.conf)
-astscf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.conf)
-astscf_test_icebox(media_rtp_pjmedia_ice_test config/test_rtp_ice.conf)
+astscf_test_icebox(MediaRTPPJMEDIATest config/test_component.conf)
+astscf_test_icebox(MediaRTPPJMEDIATestV6 config/test_component_v6.conf)
+astscf_test_icebox(MediaRTPPJMEDIAIceTest config/test_rtp_ice.conf)

commit 7213d89c4a8e1e1f81423ef1b4aee0b8c90e8763
Merge: 03e3f18 2c0296f
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Dec 30 12:44:38 2011 -0600

    Merge branch 'rename'
    
    Conflicts:
    	slice/AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice
    	src/Component.cpp

diff --cc slice/AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice
index bd0185e,952efd1..1bdd788
--- a/slice/AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice
@@@ -49,30 -49,34 +49,30 @@@ module V
  	string sessionId;
      };
  
-     sequence<RtpStateItem> RtpStateItemSeq;
+     sequence<RTPStateItem> RTPStateItemSeq;
  
-     interface RtpStateReplicatorListener
+     interface RTPStateReplicatorListener
      {
  	void stateRemoved(Ice::StringSeq itemKeys);
- 	void stateSet(RtpStateItemSeq items);
+ 	void stateSet(RTPStateItemSeq items);
      };
  
-     interface RtpStateReplicator
+     interface RTPStateReplicator
      {
- 	void addListener(RtpStateReplicatorListener *listener);
- 	void removeListener(RtpStateReplicatorListener *listener);
- 	void setState (RtpStateItemSeq items);
+ 	void addListener(RTPStateReplicatorListener *listener);
+ 	void removeListener(RTPStateReplicatorListener *listener);
+ 	void setState (RTPStateItemSeq items);
  	void removeState(Ice::StringSeq items);
- 	idempotent RtpStateItemSeq getState(Ice::StringSeq itemKeys);
- 	idempotent RtpStateItemSeq getAllState();
+ 	idempotent RTPStateItemSeq getState(Ice::StringSeq itemKeys);
+ 	idempotent RTPStateItemSeq getAllState();
      };
  
-     class RtpGeneralStateItem extends RtpStateItem
+     class RTPGeneralStateItem extends RTPStateItem
      {
  	AsteriskSCF::Core::Discovery::V1::ServiceManagement *serviceManagement;
 -	string comparatorId;
      };
  
-     class RtpSessionStateItem extends RtpStateItem
 -    /**
 -     * TODO: Data members in Slice defined classes should not have `m' prefixes.
 -     */
+     class RTPSessionStateItem extends RTPStateItem
      {
  	Ice::Identity sessionIdentity;
  	int port;
diff --cc src/Component.cpp
index 8e27eaa,b470522..43d1166
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@@ -356,7 -356,8 +356,7 @@@ void Component::createPrimaryServices(
  
          if (rtpReplicationContext->isActive() == true)
          {
-             getServiceLocatorManagement()->addCompare(getName() + ".RTP.Comparator", mRtpMediaComparatorServicePrx);
 -            mGeneralState->comparatorId = IceUtil::generateUUID();
 -            getServiceLocatorManagement()->addCompare(mGeneralState->comparatorId, mRTPMediaComparatorServicePrx);
++            getServiceLocatorManagement()->addCompare(getName() + ".RTP.Comparator", mRTPMediaComparatorServicePrx);
          }
  
      }
@@@ -531,20 -532,24 +531,20 @@@ void Component::onRegisterPrimaryServic
          return;
      }
  
-     mGeneralState->serviceManagement = mRtpMediaServiceRegistration->getServiceManagement();
-     mGeneralState->serviceManagement->addLocatorParams(mRtpOverIceLocatorParams, getName() + ".RTP.Comparator");
+     mGeneralState->serviceManagement = mRTPMediaServiceRegistration->getServiceManagement();
 -    mGeneralState->serviceManagement->addLocatorParams(mRTPOverIceLocatorParams, mGeneralState->comparatorId);
++    mGeneralState->serviceManagement->addLocatorParams(mRTPOverIceLocatorParams, getName() + ".RTP.Comparator");
  }
  
  void Component::onStart()
  {
 -    // Note: I don't think this is necessary. If we make the
 -    // comparator computed from a "service" identifier (which could default
 -    // to "default"), there's nothing replicated here that the standby component
 -    // couldn't already determine itself.
      if (getReplicationContext()->isReplicating() == true)
      {
-         RtpReplicationContextPtr rtpReplicationContext =
-             boost::static_pointer_cast<RtpReplicationContext>(getReplicationContext());
+         RTPReplicationContextPtr rtpReplicationContext =
+             boost::static_pointer_cast<RTPReplicationContext>(getReplicationContext());
  
-         RtpStateItemSeq items;
+         RTPStateItemSeq items;
          items.push_back(mGeneralState);
-         RtpStateReplicatorPrx oneway = RtpStateReplicatorPrx::uncheckedCast(rtpReplicationContext->getReplicator()->ice_oneway());
+         RTPStateReplicatorPrx oneway = RTPStateReplicatorPrx::uncheckedCast(rtpReplicationContext->getReplicator()->ice_oneway());
          oneway->setState(items);
      }
  }
diff --cc src/RTPStateReplicatorListener.cpp
index ddf385d,57a0aee..cb76040
--- a/src/RTPStateReplicatorListener.cpp
+++ b/src/RTPStateReplicatorListener.cpp
@@@ -93,17 -93,18 +93,17 @@@ public
              }
  
          private:
-             RtpStateReplicatorListenerImpl *mImpl;
+             RTPStateReplicatorListenerImpl *mImpl;
  
-             void visitRtpGeneralStateItem(const RtpGeneralStateItemPtr &item)
+             void visitRTPGeneralStateItem(const RTPGeneralStateItemPtr &item)
              {
                  mImpl->mGeneralState->serviceManagement = item->serviceManagement;
 -                mImpl->mGeneralState->comparatorId = item->comparatorId;
              }
                  
-             void visitRtpSessionStateItem(const RtpSessionStateItemPtr &item)
+             void visitRTPSessionStateItem(const RTPSessionStateItemPtr &item)
              {
-                 map<string, boost::shared_ptr<RtpStateReplicatorItem> >::iterator i = mImpl->mStateItems.find(item->sessionId);
-                 boost::shared_ptr<RtpStateReplicatorItem> localitem;
+                 map<string, boost::shared_ptr<RTPStateReplicatorItem> >::iterator i = mImpl->mStateItems.find(item->sessionId);
+                 boost::shared_ptr<RTPStateReplicatorItem> localitem;
  
                  if (i == mImpl->mStateItems.end())
                  {

commit 03e3f186e97546590f9dab77f637f68edcc10b48
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Dec 6 17:04:46 2011 -0330

    Modify all unit tests to use the loopback adapter.

diff --git a/config/test_component.conf b/config/test_component.conf
index 8489207..838db61 100644
--- a/config/test_component.conf
+++ b/config/test_component.conf
@@ -17,16 +17,16 @@ IceBox.Service.ServiceDiscovery=service_locator:create
 
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
 
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -h 127.0.0.1 -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 4423
 ServiceDiscovery.IceStorm.Trace.TopicManager=2
 ServiceDiscovery.IceStorm.Transient=1
 ServiceDiscovery.IceStorm.Flush.Timeout=2000
 
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -h 127.0.0.1 -p 4421
 
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
 
 #
 # RtpStateReplicator Configuration
@@ -34,12 +34,12 @@ ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
 IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
 
 # Adapter parameters for this component
-RtpStateReplicator.Adapter.Endpoints=tcp:udp
+RtpStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
 
 # IceStorm parameters for the RTP state replicator
 RtpStateReplicator.IceStorm.InstanceName=RtpStateReplicator
-RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10007
-RtpStateReplicator.IceStorm.Publish.Endpoints=default -p 10008
+RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10007
+RtpStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10008
 RtpStateReplicator.IceStorm.Trace.TopicManager=2
 RtpStateReplicator.IceStorm.Transient=1
 RtpStateReplicator.IceStorm.Flush.Timeout=2000
@@ -54,14 +54,14 @@ IceBox.Service.MediaServiceRTP=media_rtp_pjmedia:create
 MediaServiceRTP.ServiceName=test
 
 # Adapter parameters for this component
-MediaServiceRTP.ServiceAdapter.Endpoints=tcp -p 4471
-MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -p 4472
+MediaServiceRTP.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4471
+MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1 -p 4472
 
 # A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
 
 # A proxy to the service locator service
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 
 #
 # media_rtp_pjmedia_test Configuration
diff --git a/config/test_component_v6.conf b/config/test_component_v6.conf
index c64742f..fb51bf3 100644
--- a/config/test_component_v6.conf
+++ b/config/test_component_v6.conf
@@ -17,16 +17,16 @@ IceBox.Service.ServiceDiscovery=service_locator:create
 
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
 
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -h 127.0.0.1 -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 4423
 ServiceDiscovery.IceStorm.Trace.TopicManager=2
 ServiceDiscovery.IceStorm.Transient=1
 ServiceDiscovery.IceStorm.Flush.Timeout=2000
 
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -h 127.0.0.1 -p 4421
 
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
 
 #
 # RtpStateReplicator Configuration
@@ -34,12 +34,12 @@ ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
 IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
 
 # Adapter parameters for this component
-RtpStateReplicator.Adapter.Endpoints=tcp:udp
+RtpStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
 
 # IceStorm parameters for the RTP state replicator
 RtpStateReplicator.IceStorm.InstanceName=RtpStateReplicator
-RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10007
-RtpStateReplicator.IceStorm.Publish.Endpoints=default -p 10008
+RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10007
+RtpStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10008
 RtpStateReplicator.IceStorm.Trace.TopicManager=2
 RtpStateReplicator.IceStorm.Transient=1
 RtpStateReplicator.IceStorm.Flush.Timeout=2000
@@ -54,14 +54,14 @@ IceBox.Service.MediaServiceRTP=media_rtp_pjmedia:create
 MediaServiceRTP.ServiceName=test
 
 # Adapter parameters for this component
-MediaServiceRTP.ServiceAdapter.Endpoints=tcp -p 4471
-MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -p 4472
+MediaServiceRTP.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4471
+MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1 -p 4472
 
 # A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
 
 # A proxy to the service locator service
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 
 #
 # media_rtp_pjmedia_test Configuration
diff --git a/config/test_rtp_ice.conf b/config/test_rtp_ice.conf
index a2ce988..6bed933 100644
--- a/config/test_rtp_ice.conf
+++ b/config/test_rtp_ice.conf
@@ -10,13 +10,13 @@ IceBox.LoadOrder=ServiceDiscovery,MediaRTPpjmedia,MediaRTPpjmediaTest
 # RtpStateReplicator Configuration
 
 # Adapter parameters for this component
-RtpStateReplicator.Endpoints=tcp:udp
+RtpStateReplicator.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
 
 # A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4422
 
 # A proxy to the service locator service
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 
 #
 # media_rtp_pjmedia Configuration
@@ -25,15 +25,15 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
 IceBox.Service.MediaRTPpjmedia=media_rtp_pjmedia:create
 
 # Adapter parameters for this component
-MediaRTPpjmediaAdapter.Endpoints=default
-MediaRTPpjmediaAdapterLocal.Endpoints=default
-MediaRTPpjmediaAdapterLogger.Endpoints=default
+MediaRTPpjmediaAdapter.Endpoints=default -h 127.0.0.1
+MediaRTPpjmediaAdapterLocal.Endpoints=default -h 127.0.0.1
+MediaRTPpjmediaAdapterLogger.Endpoints=default -h 127.0.0.1
 
 # A proxy to the service locator management service
-ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422
+ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4422
 
 # A proxy to the service locator service
-ServiceLocatorProxy=LocatorService:tcp -p 4411
+ServiceLocatorProxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 
 #
 # media_rtp_pjmedia_test Configuration
@@ -49,19 +49,19 @@ IceBox.Service.ServiceDiscovery=service_locator:create
 
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
 
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -h 127.0.0.1 -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 4423
 ServiceDiscovery.IceStorm.Trace.TopicManager=2
 ServiceDiscovery.IceStorm.Transient=1
 ServiceDiscovery.IceStorm.Flush.Timeout=2000
 
-TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:default -h 127.0.0.1 -p 4421
 
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
 
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 
 Ice.ThreadPool.Client.Size=6
 Ice.ThreadPool.Server.Size=6
diff --git a/test/TestRTPICE.cpp b/test/TestRTPICE.cpp
index e5d23c8..03f6745 100644
--- a/test/TestRTPICE.cpp
+++ b/test/TestRTPICE.cpp
@@ -75,7 +75,7 @@ public:
         Ice::InitializationData data;
         data.properties = IceBoxTestEnv.communicator->getProperties();
         mCommunicator = Ice::initialize(IceBoxTestEnv.argc, IceBoxTestEnv.argv, data);
-        mAdapter = mCommunicator->createObjectAdapterWithEndpoints("TestAdapter", "default");
+        mAdapter = mCommunicator->createObjectAdapterWithEndpoints("TestAdapter", "default -h 127.0.0.1");
         
         //
         // We will be making calls on proxies instantiated on this adapter, so we should activated here.
diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index ab4a68f..5228a42 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -307,7 +307,7 @@ struct GlobalIceFixture
         {
             Testbed.communicator = Ice::initialize(mCachedArgs.argc, mCachedArgs.argv);
 
-            Testbed.adapter = Testbed.communicator->createObjectAdapterWithEndpoints("Adapter", "default");
+            Testbed.adapter = Testbed.communicator->createObjectAdapterWithEndpoints("Adapter", "default -h 127.0.0.1");
 
             StreamSinkPtr sink = new TestStreamSink();
 
@@ -324,7 +324,7 @@ struct GlobalIceFixture
 
             Testbed.adapter->activate();
 
-            Testbed.locator = ServiceLocatorPrx::checkedCast(Testbed.communicator->stringToProxy("LocatorService:tcp -p 4411"));
+            Testbed.locator = ServiceLocatorPrx::checkedCast(Testbed.communicator->stringToProxy("LocatorService:tcp -h 127.0.0.1 -p 4411"));
 
             if (!Testbed.locator) {
                 throw "Invalid service locator proxy";

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


-- 
asterisk-scf/integration/media_rtp_pjmedia.git

More information about the asterisk-scf-commits mailing list