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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  61b99317e07703ecd0001889f4fad41e5dfdfc44 (commit)
      from  55c5019c185270ba5798a041c02201736e28c32e (commit)

Summary of changes:
 test/Component/component-base-test.conf |   66 +++++++-----------------------
 1 files changed, 16 insertions(+), 50 deletions(-)


- Log -----------------------------------------------------------------
commit 61b99317e07703ecd0001889f4fad41e5dfdfc44
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Mon Sep 19 18:09:23 2011 -0500

    Updated Component test config file for changes to component configration properties.

diff --git a/test/Component/component-base-test.conf b/test/Component/component-base-test.conf
index 40a2199..17e30f3 100644
--- a/test/Component/component-base-test.conf
+++ b/test/Component/component-base-test.conf
@@ -14,73 +14,39 @@ IceBox.Service.ComponentTest=component-base-test:create
 
 IceBox.LoadOrder=ServiceDiscovery,MockComponent,ComponentTest
 
-MockComponent.Endpoints=tcp -p 10090
-MockComponent.Backplane.Endpoints=tcp -p 10091
+MockComponent.ServiceAdapter.Endpoints=tcp -p 10090
+MockComponent.BackplaneAdapter.Endpoints=tcp -p 10091
 MockComponent.ThreadPool.Size=4
 MockComponent.ThreadPool.SizeMax=10
 MockComponent.ThreadPool.SizeWarn=9
 
 # Expose the ComponentTest interface facet. 
 MockComponent.ComponentTest=yes
-
-MockComponent.Standby=no
-
 MockComponent.Standalone=yes
-
-ComponentTest.Endpoints=tcp -p 10300
-
-#Replicator.InstanceName=Replicator
-#Replicator.Endpoints=default -p 10704
-#Replicator.ComponentService.Endpoints=default -p 10705
-#Replicator.ThreadPool.Size=4
-#Replicator.ThreadPool.SizeMax=10
-#Replicator.ThreadPool.SizeWarn=9
+MockComponent.Standby=no
 
 # For testing
+ComponentTest.Endpoints=tcp -p 10300
 ComponentService.Proxy=ComponentService:tcp -p 10091
-
-# Where to find the Service Locator manager. We need the Service Locator in order to be able to plug in to the Asterisk SCF system Discovery mechanisms.
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
-
-# Where to find the Service Locator.
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
 LocatorService.Proxy=LocatorService:tcp -p 4411
 
 # Endpoints for Icestorm events
-TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
+TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 4421
 
 ##########################################
 # Service Locator properties
 
-AsteriskSCFIceStorm.InstanceName=AsteriskSCFIceStorm
-#
-# This property defines the endpoints on which the IceStorm
-# TopicManager listens.
-AsteriskSCFIceStorm.TopicManager.Endpoints=default -p 10000
-
-# This property defines the endpoints on which the topic
-# publisher objects listen. If you want to federate
-# IceStorm instances this must run on a fixed port (or use
-# IceGrid).
-#
-AsteriskSCFIceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
-#
-# TopicManager Tracing
-#
-# 0 = no tracing
-# 1 = trace topic creation, subscription, unsubscription
-# 2 = like 1, but with more detailed subscription information
-AsteriskSCFIceStorm.Trace.TopicManager=2
-AsteriskSCFIceStorm.Transient=1
-AsteriskSCFIceStorm.Flush.Timeout=2000
-
-# Test endpoints for the service locator management adapter
-ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
+ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4422:udp -p 4422
+ServiceDiscovery.IceStorm.Trace.TopicManager=2
+ServiceDiscovery.IceStorm.Transient=1
+ServiceDiscovery.IceStorm.Flush.Timeout=2000
 
-# Test endpoints for the service locator adapter
-ServiceLocatorAdapter.Endpoints=tcp -p 4411
-ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
+ServiceDiscovery.Standalone=true
 
-# Logger configuration
-LoggerAdapter.Endpoints=default
-AsteriskSCF.Logging.logger.AsteriskSCF=Error
 

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


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