[asterisk-scf-commits] asterisk-scf/integration/servicediscovery.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  fbf8a2c4ebcf7622cede76d899e47933a5c3e876 (commit)
      from  85da38bbc7a2e0c5a876f77a2c031d49bc14e3d5 (commit)

Summary of changes:
 config/test_component.config.in    |   11 +++++++++--
 config/test_service_locator.config |    3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit fbf8a2c4ebcf7622cede76d899e47933a5c3e876
Author: David M. Lee <dlee at digium.com>
Date:   Fri Oct 8 09:29:16 2010 -0500

    Used IceBox.InheritProperties

diff --git a/config/test_component.config.in b/config/test_component.config.in
index 7da16da..b5c3c25 100644
--- a/config/test_component.config.in
+++ b/config/test_component.config.in
@@ -1,5 +1,12 @@
 # This is a configuration file used in conjunction with the service discovery test driver
+
+#
+# icebox configuration
+#
+IceBox.InheritProperties=1
+
 HydraIceStorm.InstanceName=HydraIceStorm
+
 #
 # This property defines the endpoints on which the IceStorm
 # TopicManager listens.
@@ -29,7 +36,7 @@ HydraIceStorm.Flush.Timeout=2000
 #
 # ServiceDiscovery configuration
 #
-IceBox.Service.ServiceDiscovery=../src at service_locator:create --Ice.Config=config/test_component.config
+IceBox.Service.ServiceDiscovery=../src at service_locator:create
 
 # Test endpoints for the service locator management adapter
 ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
@@ -48,7 +55,7 @@ LoggerAdapter.Endpoints=default
 #
 # test configuration
 #
-IceBox.Service.ServiceDiscoveryTest=. at service_locator_test:create --Ice.Config=config/test_component.config --report_sink=${CMAKE_BINARY_DIR}/service_locator_test-result.xml --report_format=XML --report_level=detailed
+IceBox.Service.ServiceDiscoveryTest=. at service_locator_test:create --report_sink=${CMAKE_BINARY_DIR}/service_locator_test-result.xml --report_format=XML --report_level=detailed
 
 LocatorService.Proxy=LocatorService:tcp -p 4411
 ServiceLocatorManagement.proxy=ServiceLocatorManagement:tcp -p 4422
diff --git a/config/test_service_locator.config b/config/test_service_locator.config
index 671583b..3b46008 100644
--- a/config/test_service_locator.config
+++ b/config/test_service_locator.config
@@ -1,6 +1,7 @@
 # This is a configuration file used in conjunction with the service discovery test driver
 
-IceBox.Service.ServiceDiscovery=service_locator:create --Ice.Config=config/test_service_locator.config
+IceBox.InheritProperties=1
+IceBox.Service.ServiceDiscovery=service_locator:create
 
 HydraIceStorm.InstanceName=HydraIceStorm
 #

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


-- 
asterisk-scf/integration/servicediscovery.git