[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "master" updated.

Tue Jan 3 14:40:44 CST 2012

branch "master" has been updated
       via  141dd3fdd338e19af21791c8306d952cf4a8d8b2 (commit)
       via  79f6e79fddbadb510ea1ebfd7bc875ab2d1b5990 (commit)
      from  12a3f463f48eb9d269b32c2b8dc1b669ca04b859 (commit)

Summary of changes:
 config/test_bridging.conf |   12 +++---
 src/CMakeLists.txt        |   84 ++++++++++++++++++++++----------------------
 2 files changed, 48 insertions(+), 48 deletions(-)


- Log -----------------------------------------------------------------
commit 141dd3fdd338e19af21791c8306d952cf4a8d8b2
Merge: 79f6e79 12a3f46
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Jan 3 14:42:17 2012 -0600

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/bridging


commit 79f6e79fddbadb510ea1ebfd7bc875ab2d1b5990
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Jan 3 14:37:38 2012 -0600

    Adjust component library names and update test config files

diff --git a/config/test_bridging.conf b/config/test_bridging.conf
index 5ec14f2..3b9e504 100644
--- a/config/test_bridging.conf
+++ b/config/test_bridging.conf
@@ -51,13 +51,13 @@ AsteriskSCF.LoggingClient.ThreadPool.Size=4
 #
 # The IceBox entries for loading the services.
 #
-IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.Logger=LoggingService:createLoggingService
 IceBox.Service.Replicator=BridgeReplicator:create
-IceBox.Service.TestBridge=bridgeservice:create
-IceBox.Service.TestBridge2=bridgeservice:create
-IceBox.Service.ServiceDiscovery=service_locator:create
-IceBox.Service.TestChannel=test_channel:create
-IceBox.Service.TestDriver=bridge_component_test:create
+IceBox.Service.TestBridge=BridgeService:create
+IceBox.Service.TestBridge2=BridgeService:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
+IceBox.Service.TestChannel=TestChannel:create
+IceBox.Service.TestDriver=BridgeComponentTest:create
 
 #
 # The bridging service uses the test channel`s Endpoint
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1bee51e..09eb772 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,48 +1,48 @@
 include_directories(${logger_dir}/include)
 include_directories(${astscf-ice-util-cpp_dir}/include)
 
-astscf_component_init(bridgeservice)
-astscf_component_add_files(bridgeservice Component.cpp)
-astscf_component_add_files(bridgeservice BridgeImpl.h)
-astscf_component_add_files(bridgeservice BridgeImpl.cpp)
-astscf_component_add_files(bridgeservice BridgeListenerMgr.h)
-astscf_component_add_files(bridgeservice BridgeListenerMgr.cpp)
-astscf_component_add_files(bridgeservice BridgeManagerListenerMgr.h)
-astscf_component_add_files(bridgeservice BridgeManagerListenerMgr.cpp)
-astscf_component_add_files(bridgeservice BridgeReplicationContext.h)
-astscf_component_add_files(bridgeservice BridgeReplicatorStateListenerI.h)
-astscf_component_add_files(bridgeservice BridgeReplicatorStateListenerI.cpp)
-astscf_component_add_files(bridgeservice BridgeManagerImpl.h)
-astscf_component_add_files(bridgeservice BridgeManagerImpl.cpp)
-astscf_component_add_files(bridgeservice SessionListener.cpp)
-astscf_component_add_files(bridgeservice SessionListener.h)
-astscf_component_add_files(bridgeservice SessionWrapper.cpp)
-astscf_component_add_files(bridgeservice SessionWrapper.h)
-astscf_component_add_files(bridgeservice SessionCollection.cpp)
-astscf_component_add_files(bridgeservice SessionCollection.h)
-astscf_component_add_files(bridgeservice SessionOperations.cpp)
-astscf_component_add_files(bridgeservice SessionOperations.h)
-astscf_component_add_files(bridgeservice BridgeCreationExtensionPointImpl.cpp) 
-astscf_component_add_files(bridgeservice BridgeCreationExtensionPointImpl.h) 
-astscf_component_add_files(bridgeservice BridgePartyIdExtensionPoint.cpp)
-astscf_component_add_files(bridgeservice BridgePartyIdExtensionPoint.h)
-astscf_component_add_files(bridgeservice ServiceUtil.h)
-astscf_component_add_files(bridgeservice DebugUtil.h)
-astscf_component_add_files(bridgeservice MediaSplicer.h)
-astscf_component_add_files(bridgeservice MediaSplicer.cpp)
-astscf_component_add_files(bridgeservice MediaMixer.h)
-astscf_component_add_files(bridgeservice MediaMixer.cpp)
-astscf_component_add_files(bridgeservice Tasks.h)
-astscf_component_add_files(bridgeservice InternalExceptions.h)
-astscf_component_add_files(bridgeservice BridgeServiceConfig.h)
-astscf_component_add_files(bridgeservice ListenerManager.h)
-astscf_component_add_slices(bridgeservice PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
-astscf_component_add_ice_libraries(bridgeservice IceStorm)
-astscf_component_add_boost_libraries(bridgeservice thread date_time)
-astscf_component_add_slice_collection_libraries(bridgeservice ASTSCF)
-astscf_component_build_icebox(bridgeservice)
-target_link_libraries(bridgeservice ASTSCFIceUtilCpp LoggingClient)
-astscf_component_install(bridgeservice)
+astscf_component_init(BridgeService)
+astscf_component_add_files(BridgeService Component.cpp)
+astscf_component_add_files(BridgeService BridgeImpl.h)
+astscf_component_add_files(BridgeService BridgeImpl.cpp)
+astscf_component_add_files(BridgeService BridgeListenerMgr.h)
+astscf_component_add_files(BridgeService BridgeListenerMgr.cpp)
+astscf_component_add_files(BridgeService BridgeManagerListenerMgr.h)
+astscf_component_add_files(BridgeService BridgeManagerListenerMgr.cpp)
+astscf_component_add_files(BridgeService BridgeReplicationContext.h)
+astscf_component_add_files(BridgeService BridgeReplicatorStateListenerI.h)
+astscf_component_add_files(BridgeService BridgeReplicatorStateListenerI.cpp)
+astscf_component_add_files(BridgeService BridgeManagerImpl.h)
+astscf_component_add_files(BridgeService BridgeManagerImpl.cpp)
+astscf_component_add_files(BridgeService SessionListener.cpp)
+astscf_component_add_files(BridgeService SessionListener.h)
+astscf_component_add_files(BridgeService SessionWrapper.cpp)
+astscf_component_add_files(BridgeService SessionWrapper.h)
+astscf_component_add_files(BridgeService SessionCollection.cpp)
+astscf_component_add_files(BridgeService SessionCollection.h)
+astscf_component_add_files(BridgeService SessionOperations.cpp)
+astscf_component_add_files(BridgeService SessionOperations.h)
+astscf_component_add_files(BridgeService BridgeCreationExtensionPointImpl.cpp) 
+astscf_component_add_files(BridgeService BridgeCreationExtensionPointImpl.h) 
+astscf_component_add_files(BridgeService BridgePartyIdExtensionPoint.cpp)
+astscf_component_add_files(BridgeService BridgePartyIdExtensionPoint.h)
+astscf_component_add_files(BridgeService ServiceUtil.h)
+astscf_component_add_files(BridgeService DebugUtil.h)
+astscf_component_add_files(BridgeService MediaSplicer.h)
+astscf_component_add_files(BridgeService MediaSplicer.cpp)
+astscf_component_add_files(BridgeService MediaMixer.h)
+astscf_component_add_files(BridgeService MediaMixer.cpp)
+astscf_component_add_files(BridgeService Tasks.h)
+astscf_component_add_files(BridgeService InternalExceptions.h)
+astscf_component_add_files(BridgeService BridgeServiceConfig.h)
+astscf_component_add_files(BridgeService ListenerManager.h)
+astscf_component_add_slices(BridgeService PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
+astscf_component_add_ice_libraries(BridgeService IceStorm)
+astscf_component_add_boost_libraries(BridgeService thread date_time)
+astscf_component_add_slice_collection_libraries(BridgeService ASTSCF)
+astscf_component_build_icebox(BridgeService)
+target_link_libraries(BridgeService ASTSCFIceUtilCpp LoggingClient)
+astscf_component_install(BridgeService)
 
 astscf_component_init(BridgeReplicator)
 astscf_component_add_files(BridgeReplicator BridgeReplicatorService.cpp)

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


-- 
asterisk-scf/release/bridging.git

