[asterisk-scf-commits] asterisk-scf/release/media_transport_udptl.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Jan 3 14:42:26 CST 2012
branch "master" has been updated
via 3b3d792e8612d861dde1c04efbf5a00d5d51205e (commit)
from 400bd789f88a1eab4f17a2a061e4ebee1344b454 (commit)
Summary of changes:
config/test_component.config | 22 +++++++++---------
config/test_component_v6.config | 22 +++++++++---------
config/test_udptl_ice.conf | 24 +++++++++---------
test/CMakeLists.txt | 48 +++++++++++++++++++-------------------
4 files changed, 58 insertions(+), 58 deletions(-)
- Log -----------------------------------------------------------------
commit 3b3d792e8612d861dde1c04efbf5a00d5d51205e
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Jan 3 14:37:43 2012 -0600
Adjust component library names and update test config files
diff --git a/config/test_component.config b/config/test_component.config
index bba9f35..f7fc24e 100644
--- a/config/test_component.config
+++ b/config/test_component.config
@@ -5,15 +5,15 @@
#
IceBox.InheritProperties=1
-IceBox.LoadOrder=ServiceDiscovery,UdptlStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
+IceBox.LoadOrder=ServiceDiscovery,UDPTLStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
Ice.Override.Timeout=5000
# RtpStateReplicator Configuration
-IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
+IceBox.Service.UDPTLStateReplicator=UDPTLStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
+UDPTLStateReplicator.Adapter.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 4412
@@ -38,13 +38,13 @@ MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
# TestMediaTransportUDPTL Configuration
#
-IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_test:create
+IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTLTest:create
#
# Service Locator Configuration
#
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
@@ -53,12 +53,12 @@ ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
-UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
-UdptlStateReplicator.IceStorm.Trace.TopicManager=2
-UdptlStateReplicator.IceStorm.Transient=1
-UdptlStateReplicator.IceStorm.Flush.Timeout=2000
+UDPTLStateReplicator.IceStorm.InstanceName=UDPTLStateReplicator
+UDPTLStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UDPTLStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
+UDPTLStateReplicator.IceStorm.Trace.TopicManager=2
+UDPTLStateReplicator.IceStorm.Transient=1
+UDPTLStateReplicator.IceStorm.Flush.Timeout=2000
ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
diff --git a/config/test_component_v6.config b/config/test_component_v6.config
index 5b930d2..2a04fed 100644
--- a/config/test_component_v6.config
+++ b/config/test_component_v6.config
@@ -5,15 +5,15 @@
#
IceBox.InheritProperties=1
-IceBox.LoadOrder=ServiceDiscovery,UdptlStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
+IceBox.LoadOrder=ServiceDiscovery,UDPTLStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
Ice.Override.Timeout=5000
# RtpStateReplicator Configuration
-IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
+IceBox.Service.UDPTLStateReplicator=UDPTLStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
+UDPTLStateReplicator.Adapter.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 4412
@@ -38,13 +38,13 @@ MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
# TestMediaTransportUDPTL Configuration
#
-IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_test_v6:create
+IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTLTestV6:create
#
# Service Locator Configuration
#
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
@@ -53,12 +53,12 @@ ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
-UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
-UdptlStateReplicator.IceStorm.Trace.TopicManager=2
-UdptlStateReplicator.IceStorm.Transient=1
-UdptlStateReplicator.IceStorm.Flush.Timeout=2000
+UDPTLStateReplicator.IceStorm.InstanceName=UDPTLStateReplicator
+UDPTLStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UDPTLStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
+UDPTLStateReplicator.IceStorm.Trace.TopicManager=2
+UDPTLStateReplicator.IceStorm.Transient=1
+UDPTLStateReplicator.IceStorm.Flush.Timeout=2000
ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
diff --git a/config/test_udptl_ice.conf b/config/test_udptl_ice.conf
index 9299405..9e20ebd 100644
--- a/config/test_udptl_ice.conf
+++ b/config/test_udptl_ice.conf
@@ -4,18 +4,18 @@
# Icebox Configuration
#
-UdptlConfiguration.Name=UdptlStateReplicator
+UDPTLConfiguration.Name=UDPTLStateReplicator
IceBox.InheritProperties=1
-IceBox.LoadOrder=ServiceDiscovery,UdptlStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
+IceBox.LoadOrder=ServiceDiscovery,UDPTLStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
Ice.Override.Timeout=5000
# RtpStateReplicator Configuration
-IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
+IceBox.Service.UDPTLStateReplicator=UDPTLStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
+UDPTLStateReplicator.Adapter.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 4412
@@ -40,13 +40,13 @@ MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
# TestMediaTransportUDPTL Configuration
#
-IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_ice_test:create
+IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTLIceTest:create
#
# Service Locator Configuration
#
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
@@ -55,12 +55,12 @@ ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
-UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
-UdptlStateReplicator.IceStorm.Trace.TopicManager=2
-UdptlStateReplicator.IceStorm.Transient=1
-UdptlStateReplicator.IceStorm.Flush.Timeout=2000
+UDPTLStateReplicator.IceStorm.InstanceName=UDPTLStateReplicator
+UDPTLStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UDPTLStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
+UDPTLStateReplicator.IceStorm.Trace.TopicManager=2
+UDPTLStateReplicator.IceStorm.Transient=1
+UDPTLStateReplicator.IceStorm.Flush.Timeout=2000
ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e12c557..5644864 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,28 +1,28 @@
include_directories(${astscf-ice-util-cpp_dir}/include)
-astscf_component_init(MediaTransportUDPTL_test)
-astscf_component_add_files(MediaTransportUDPTL_test TestMediaTransportUDPTL.cpp)
-astscf_component_add_slices(MediaTransportUDPTL_test PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
-astscf_component_add_boost_libraries(MediaTransportUDPTL_test unit_test_framework thread date_time)
-astscf_component_add_slice_collection_libraries(MediaTransportUDPTL_test ASTSCF)
-astscf_component_build_icebox(MediaTransportUDPTL_test)
+astscf_component_init(MediaTransportUDPTLTest)
+astscf_component_add_files(MediaTransportUDPTLTest TestMediaTransportUDPTL.cpp)
+astscf_component_add_slices(MediaTransportUDPTLTest PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
+astscf_component_add_boost_libraries(MediaTransportUDPTLTest unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(MediaTransportUDPTLTest ASTSCF)
+astscf_component_build_icebox(MediaTransportUDPTLTest)
-astscf_component_init(MediaTransportUDPTL_test_v6)
-astscf_component_add_files(MediaTransportUDPTL_test_v6 TestMediaTransportUDPTL.cpp)
-astscf_component_add_slices(MediaTransportUDPTL_test_v6 PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
-astscf_component_add_boost_libraries(MediaTransportUDPTL_test_v6 unit_test_framework thread date_time)
-astscf_component_add_slice_collection_libraries(MediaTransportUDPTL_test_v6 ASTSCF)
-astscf_component_build_icebox(MediaTransportUDPTL_test_v6)
-set_property(TARGET MediaTransportUDPTL_test_v6 PROPERTY COMPILE_DEFINITIONS IPV6_TEST)
+astscf_component_init(MediaTransportUDPTLTestV6)
+astscf_component_add_files(MediaTransportUDPTLTestV6 TestMediaTransportUDPTL.cpp)
+astscf_component_add_slices(MediaTransportUDPTLTestV6 PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
+astscf_component_add_boost_libraries(MediaTransportUDPTLTestV6 unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(MediaTransportUDPTLTestV6 ASTSCF)
+astscf_component_build_icebox(MediaTransportUDPTLTestV6)
+set_property(TARGET MediaTransportUDPTLTestV6 PROPERTY COMPILE_DEFINITIONS IPV6Test)
-astscf_component_init(MediaTransportUDPTL_ice_test)
-astscf_component_add_files(MediaTransportUDPTL_ice_test TestUDPTLICE.cpp)
-astscf_component_add_slices(MediaTransportUDPTL_ice_test PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
-astscf_component_add_slices(MediaTransportUDPTL_ice_test PROJECT AsteriskSCF/Configuration/UDPTL/UdptlConfigurationIf.ice)
-astscf_component_add_boost_libraries(MediaTransportUDPTL_ice_test unit_test_framework thread date_time)
-astscf_component_add_slice_collection_libraries(MediaTransportUDPTL_ice_test ASTSCF)
-astscf_component_build_icebox(MediaTransportUDPTL_ice_test)
-pjproject_link(MediaTransportUDPTL_ice_test pjlib)
+astscf_component_init(MediaTransportUDPTLIceTest)
+astscf_component_add_files(MediaTransportUDPTLIceTest TestUDPTLICE.cpp)
+astscf_component_add_slices(MediaTransportUDPTLIceTest PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
+astscf_component_add_slices(MediaTransportUDPTLIceTest PROJECT AsteriskSCF/Configuration/UDPTL/UdptlConfigurationIf.ice)
+astscf_component_add_boost_libraries(MediaTransportUDPTLIceTest unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(MediaTransportUDPTLIceTest ASTSCF)
+astscf_component_build_icebox(MediaTransportUDPTLIceTest)
+pjproject_link(MediaTransportUDPTLIceTest pjlib)
-astscf_test_icebox(MediaTransportUDPTL_test config/test_component.config)
-astscf_test_icebox(MediaTransportUDPTL_test_v6 config/test_component_v6.config)
-astscf_test_icebox(MediaTransportUDPTL_ice_test config/test_udptl_ice.conf)
+astscf_test_icebox(MediaTransportUDPTLTest config/test_component.config)
+astscf_test_icebox(MediaTransportUDPTLTestV6 config/test_component_v6.config)
+astscf_test_icebox(MediaTransportUDPTLIceTest config/test_udptl_ice.conf)
-----------------------------------------------------------------------
--
asterisk-scf/release/media_transport_udptl.git
More information about the asterisk-scf-commits
mailing list