[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue Dec 6 14:17:07 CST 2011


branch "master" has been updated
       via  e61c48510445e079475a77e1a374225bc53cf768 (commit)
      from  a86f5428fee250c75f4d4da80d26aebb97f659eb (commit)

Summary of changes:
 config/IceUtilCppTests.conf             |    4 ++--
 test/Component/ComponentTest.cpp        |    2 +-
 test/Component/component-base-test.conf |   22 +++++++++++-----------
 3 files changed, 14 insertions(+), 14 deletions(-)


- Log -----------------------------------------------------------------
commit e61c48510445e079475a77e1a374225bc53cf768
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Dec 6 16:46:23 2011 -0330

    All proxies and object adapters use the loopback adapter for endpoints
    instead of all available interfaces.

diff --git a/config/IceUtilCppTests.conf b/config/IceUtilCppTests.conf
index 029ae1a..e2671c4 100644
--- a/config/IceUtilCppTests.conf
+++ b/config/IceUtilCppTests.conf
@@ -13,8 +13,8 @@ Ice.Default.CollocationOptimized=0
 # We use a single file for configuration.
 #
 IceBox.InheritProperties=1
-IceBox.ServiceManager.Endpoints=default -p 56000
+IceBox.ServiceManager.Endpoints=default -h 127.0.0.1 -p 56000
 IceBox.ServiceManager.ThreadPool.Size=4
-IceBoxManager.Proxy=IceBox/ServiceManager:default -p 56000
+IceBoxManager.Proxy=IceBox/ServiceManager:default -h 127.0.0.1 -p 56000
 
 IceBox.Service.ProxyHelper=astscf-ice-util-cpp-test:create
diff --git a/test/Component/ComponentTest.cpp b/test/Component/ComponentTest.cpp
index 680143c..cc56c5a 100644
--- a/test/Component/ComponentTest.cpp
+++ b/test/Component/ComponentTest.cpp
@@ -101,7 +101,7 @@ struct GlobalIceFixture
         int status = 0;
         try
         {
-            IceBoxTestEnv.adapter  = IceBoxTestEnv.communicator->createObjectAdapterWithEndpoints("ComponentTest", "default -p 10300");
+            IceBoxTestEnv.adapter  = IceBoxTestEnv.communicator->createObjectAdapterWithEndpoints("ComponentTest", "default -h 127.0.0.1 -p 10300");
             sharedTestData.mListener = new MockServiceListenerImpl();
             sharedTestData.mListenerPrx = MockServiceListenerPrx::uncheckedCast(
                 IceBoxTestEnv.adapter->addWithUUID(sharedTestData.mListener));
diff --git a/test/Component/component-base-test.conf b/test/Component/component-base-test.conf
index 17e30f3..f958bad 100644
--- a/test/Component/component-base-test.conf
+++ b/test/Component/component-base-test.conf
@@ -14,8 +14,8 @@ IceBox.Service.ComponentTest=component-base-test:create
 
 IceBox.LoadOrder=ServiceDiscovery,MockComponent,ComponentTest
 
-MockComponent.ServiceAdapter.Endpoints=tcp -p 10090
-MockComponent.BackplaneAdapter.Endpoints=tcp -p 10091
+MockComponent.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 10090
+MockComponent.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1 -p 10091
 MockComponent.ThreadPool.Size=4
 MockComponent.ThreadPool.SizeMax=10
 MockComponent.ThreadPool.SizeWarn=9
@@ -27,26 +27,26 @@ MockComponent.Standby=no
 
 # For testing
 ComponentTest.Endpoints=tcp -p 10300
-ComponentService.Proxy=ComponentService:tcp -p 10091
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
-LocatorService.Proxy=LocatorService:tcp -p 4411
+ComponentService.Proxy=ComponentService:tcp -h 127.0.0.1 -p 10091
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
 
 # Endpoints for Icestorm events
-TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:default -h 127.0.0.1 -p 4421
 
 ##########################################
 # Service Locator properties
 
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 4421
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4422:udp -p 4422
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 4422:udp -h 127.0.0.1 -p 4422
 ServiceDiscovery.IceStorm.Trace.TopicManager=2
 ServiceDiscovery.IceStorm.Transient=1
 ServiceDiscovery.IceStorm.Flush.Timeout=2000
 
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
-ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
+ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1 -p 4410
 ServiceDiscovery.Standalone=true
 
 

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


-- 
asterisk-scf/release/ice-util-cpp.git



More information about the asterisk-scf-commits mailing list