[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "ice-util-restructure" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Apr 28 10:34:27 CDT 2011
branch "ice-util-restructure" has been created
at c5b269358b5e7a9bd90e4fc6b80a2651200d0b4a (commit)
- Log -----------------------------------------------------------------
commit c5b269358b5e7a9bd90e4fc6b80a2651200d0b4a
Author: Brent Eagles <beagles at digium.com>
Date: Thu Apr 28 12:49:23 2011 -0230
Apply changes for ice-util-cpp restructuring
diff --git a/src/BridgeReplicatorService.cpp b/src/BridgeReplicatorService.cpp
index eefdd13..6bda816 100644
--- a/src/BridgeReplicatorService.cpp
+++ b/src/BridgeReplicatorService.cpp
@@ -22,7 +22,7 @@
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include "ServiceUtil.h"
#include "BridgeReplicatorIf.h"
-#include <AsteriskSCF/StateReplicator.h>
+#include <AsteriskSCF/Replication/StateReplicator.h>
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SessionCommunications::V1;
@@ -31,7 +31,7 @@ using namespace AsteriskSCF::Bridge::V1;
using namespace AsteriskSCF;
using namespace std;
-typedef AsteriskSCF::StateReplication::StateReplicator<
+typedef AsteriskSCF::Replication::StateReplicator<
AsteriskSCF::Bridge::V1::Replicator,
AsteriskSCF::Bridge::V1::ReplicatedStateItemPtr,
string,
diff --git a/src/BridgeReplicatorStateListenerI.cpp b/src/BridgeReplicatorStateListenerI.cpp
index 5186463..9b82c50 100644
--- a/src/BridgeReplicatorStateListenerI.cpp
+++ b/src/BridgeReplicatorStateListenerI.cpp
@@ -16,7 +16,7 @@
#include "BridgeReplicatorStateListenerI.h"
#include "BridgeReplicatorIf.h"
-#include <AsteriskSCF/StateReplicator.h>
+#include <AsteriskSCF/Replication/StateReplicator.h>
#include "BridgeServiceConfig.h"
#include "DebugUtil.h"
diff --git a/src/BridgeServiceConfig.h b/src/BridgeServiceConfig.h
index 442e5f9..6f61e68 100644
--- a/src/BridgeServiceConfig.h
+++ b/src/BridgeServiceConfig.h
@@ -18,7 +18,7 @@
#include <boost/current_function.hpp>
#include <Ice/Ice.h>
#include <string>
-#include <AsteriskSCF/SmartProxy.h>
+#include <AsteriskSCF/Discovery/SmartProxy.h>
#include "BridgeReplicatorIf.h"
//
@@ -67,7 +67,7 @@ inline std::string objectIdFromCurrent(const Ice::Current& current)
return current.adapter->getCommunicator()->identityToString(current.id);
}
-typedef AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::Bridge::V1::ReplicatorPrx> ReplicatorSmartPrx;
+typedef AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Bridge::V1::ReplicatorPrx> ReplicatorSmartPrx;
} // End of namespace BridgeService
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index edd252a..f12a0f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ if(NOT logger_dir)
endif()
include_directories(${logger_dir}/include)
include_directories(${API_INCLUDE_DIR})
-include_directories(${utils_dir}/SmartProxy/include)
+include_directories(${utils_dir}/include)
asterisk_scf_slice_include_directories(${API_SLICE_DIR})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ba3482d..b577e6e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,7 @@ if(NOT integrated_build STREQUAL "true")
add_subdirectory(channel_driver/local_slice)
endif()
include_directories("../src")
-include_directories(${utils_dir}/SmartProxy/include)
+include_directories(${utils_dir}/include)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
endif()
commit 82f2598d09ccf1f05bb7ec3da66324694434bde0
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Apr 27 11:10:48 2011 -0500
CMakeLists.txt cleanup across the entire tree.
* Consistent formatting.
* Removed old non-integrated build stuff.
* Organized include_directories() calls since they affect every component in
the directory they are executed in.
* Keep all scripts lines for each component together.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5483175..6d12705 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,29 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# Bridging build system
-
-if(NOT integrated_build STREQUAL "true")
-
- # Minimum we require is 2.8, any lower and stuff would fail horribly
- cmake_minimum_required(VERSION 2.8)
-
- # Include common AsteriskSCF build infrastructure
- include(cmake/AsteriskSCF.cmake)
-
- # Take care of slice definitions
- add_subdirectory(slice)
-
- # logger is integrated into our build
- set(integrated_build true)
- add_subdirectory(logger)
-endif()
-
asterisk_scf_project(BridgingService 3.4)
add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8275f0f..edd252a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,13 @@
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(bridgeservice CXX)
+if(NOT logger_dir)
+ message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
+endif()
+include_directories(${logger_dir}/include)
+include_directories(${API_INCLUDE_DIR})
include_directories(${utils_dir}/SmartProxy/include)
+
+asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+
+asterisk_scf_component_init(bridgeservice)
asterisk_scf_component_add_file(bridgeservice Service.cpp)
asterisk_scf_component_add_file(bridgeservice BridgeImpl.h)
asterisk_scf_component_add_file(bridgeservice BridgeImpl.cpp)
@@ -29,33 +36,20 @@ asterisk_scf_component_add_file(bridgeservice InternalExceptions.h)
asterisk_scf_component_add_file(bridgeservice BridgeServiceConfig.h)
asterisk_scf_component_add_file(bridgeservice ListenerManager.h)
asterisk_scf_component_add_slice(bridgeservice ./BridgeReplicatorIf.ice)
-
asterisk_scf_component_add_ice_libraries(bridgeservice IceStorm)
asterisk_scf_component_add_ice_libraries(bridgeservice IceBox)
asterisk_scf_component_add_boost_libraries(bridgeservice thread date_time)
-
-
-if(NOT logger_dir)
- message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-include_directories(${logger_dir}/include)
-include_directories(${API_INCLUDE_DIR})
-
asterisk_scf_component_build_icebox(bridgeservice)
target_link_libraries(bridgeservice logging-client)
-
asterisk_scf_component_install(bridgeservice)
-asterisk_scf_component_init(BridgeReplicator CXX)
+asterisk_scf_component_init(BridgeReplicator)
include_directories(${utils_dir}/StateReplicator/include)
asterisk_scf_component_add_file(BridgeReplicator BridgeReplicatorService.cpp)
asterisk_scf_component_add_slice(BridgeReplicator ./BridgeReplicatorIf.ice)
asterisk_scf_component_add_ice_libraries(BridgeReplicator IceStorm)
asterisk_scf_component_add_boost_libraries(BridgeReplicator thread date_time)
asterisk_scf_component_build_icebox(BridgeReplicator)
-
target_link_libraries(BridgeReplicator logging-client)
target_link_libraries(BridgeReplicator asterisk-scf-api)
-
asterisk_scf_component_install(BridgeReplicator)
-
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b74c1e9..ba3482d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,9 +2,18 @@ asterisk_scf_slice_include_directories(${API_SLICE_DIR})
if(NOT integrated_build STREQUAL "true")
add_subdirectory(channel_driver/local_slice)
endif()
-asterisk_scf_component_init(bridge_component_test CXX)
include_directories("../src")
include_directories(${utils_dir}/SmartProxy/include)
+if(NOT logger_dir)
+ message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
+endif()
+include_directories(${logger_dir}/include)
+include_directories(${API_INCLUDE_DIR})
+if(integrated_build STREQUAL "true")
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../test_channel/local_slice/generated)
+endif()
+
+asterisk_scf_component_init(bridge_component_test)
asterisk_scf_component_add_slice(bridge_component_test CommandsIf)
asterisk_scf_component_add_file(bridge_component_test TestBridging.cpp)
asterisk_scf_component_add_file(bridge_component_test BridgeListenerI.h)
@@ -14,19 +23,9 @@ asterisk_scf_component_add_file(bridge_component_test BridgeManagerListenerI.cpp
asterisk_scf_component_add_file(bridge_component_test TestCommandDriver.cpp)
asterisk_scf_component_add_file(bridge_component_test TestCommandDriver.h)
asterisk_scf_component_add_slice(bridge_component_test ../src/BridgeReplicatorIf.ice)
-
asterisk_scf_component_add_ice_libraries(bridge_component_test IceStorm)
asterisk_scf_component_add_ice_libraries(bridge_component_test IceBox)
asterisk_scf_component_add_boost_libraries(bridge_component_test unit_test_framework thread)
-
-if(NOT logger_dir)
- message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-include_directories(${logger_dir}/include)
-include_directories(${API_INCLUDE_DIR})
-if(integrated_build STREQUAL "true")
- include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../test_channel/local_slice/generated)
-endif()
asterisk_scf_component_build_icebox(bridge_component_test)
target_link_libraries(bridge_component_test logging-client)
target_link_libraries(bridge_component_test asterisk-scf-api)
@@ -37,7 +36,7 @@ if(integrated_build STREQUAL "true")
asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
endif()
-asterisk_scf_component_init(bridge_unit_tests CXX)
+asterisk_scf_component_init(bridge_unit_tests)
asterisk_scf_component_add_slice(bridge_unit_tests ../src/BridgeReplicatorIf.ice)
asterisk_scf_component_add_file(bridge_unit_tests ../src/SessionCollection.cpp)
asterisk_scf_component_add_file(bridge_unit_tests ../src/SessionOperations.cpp)
@@ -47,8 +46,5 @@ asterisk_scf_component_add_file(bridge_unit_tests UnitTests.cpp)
asterisk_scf_component_add_ice_libraries(bridge_component_test Ice)
asterisk_scf_component_add_boost_libraries(bridge_unit_tests unit_test_framework thread)
asterisk_scf_component_build_standalone(bridge_unit_tests)
-
target_link_libraries(bridge_unit_tests logging-client)
target_link_libraries(bridge_unit_tests asterisk-scf-api)
-
-
commit 41af13b549464e2ab353e7d1a22edd8dc7f2afe2
Merge: 065951a 74e9291
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 13:36:24 2011 -0500
Merge branch 'master' of git://git.asterisk.org/asterisk-scf/release/bridging
commit 74e92918e69c9851192aeb4139d762b23972cb9a
Author: Brent Eagles <beagles at digium.com>
Date: Tue Apr 26 16:04:14 2011 -0230
Fix a problem with the test suite were bridge manager listeners would
not get registered because the were already subscribed. While the test suite
is fixed, the code inside the service maybe should be tweaked to replace the
existing subscription.
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 41ee52c..5407259 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -21,6 +21,7 @@
#include <boost/test/debug.hpp>
#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
#include <AsteriskSCF/Media/MediaIf.h>
+#include <IceUtil/UUID.h>
#include "BridgeManagerListenerI.h"
#include "BridgeListenerI.h"
@@ -322,7 +323,7 @@ public:
testAdapter->activate();
BridgeManagerListenerIPtr servant = new BridgeManagerListenerI;
AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx listenerPrx;
- addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent("testBridgeManagerListener"));
+ addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent(IceUtil::generateUUID()));
AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mgrPrx = env()->primaryBridgeManager();
BOOST_CHECK(mgrPrx);
@@ -364,7 +365,7 @@ public:
testAdapter->activate();
BridgeManagerListenerIPtr servant = new BridgeManagerListenerI;
AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx listenerPrx;
- addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent("testBridgeManagerListener"));
+ addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent(IceUtil::generateUUID()));
AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mgrPrx = env()->primaryBridgeManager();
BOOST_CHECK(mgrPrx);
@@ -416,6 +417,7 @@ public:
bridge->shutdown();
BOOST_CHECK(servant->createCalls() == 1);
+
channel.commands()->getlog(idA, log);
bool findStop = find(log, "stop");
if (!findStop)
@@ -460,7 +462,7 @@ public:
testAdapter->activate();
BridgeManagerListenerIPtr servant = new BridgeManagerListenerI;
AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx listenerPrx;
- addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent("testBridgeManagerListener"));
+ addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent(IceUtil::generateUUID()));
AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mgrPrx = env()->primaryBridgeManager();
BOOST_CHECK(mgrPrx);
@@ -471,11 +473,12 @@ public:
AsteriskSCF::BridgingTest::BridgeListenerPtr bridgeListener = new BridgeListenerI;
AsteriskSCF::SessionCommunications::V1::BridgeListenerPrx bridgeListenerPrx;
- addServant(bridgeListenerPrx, testAdapter, bridgeListener, testEnv.strToIdent("testBridgeListener"));
+ addServant(bridgeListenerPrx, testAdapter, bridgeListener, testEnv.strToIdent(IceUtil::generateUUID()));
mgrPrx->addDefaultBridgeListener(bridgeListenerPrx);
AsteriskSCF::SessionCommunications::V1::SessionSeq sessions;
AsteriskSCF::SessionCommunications::V1::BridgePrx bridge(mgrPrx->createBridge(sessions, 0));
+
TestChannelWrapper channel(env()->properties());
AsteriskSCF::SessionCommunications::V1::SessionPrx a = channel.getSession("311");
@@ -517,7 +520,7 @@ public:
channel.commands()->answer(idB);
BridgeSeq bridges = mgrPrx->listBridges();
BOOST_CHECK(bridges.size() == 1);
- BOOST_CHECK(bridgeListener->addedCount() == 2);
+ BOOST_CHECK(bridgeListener->addedCount() == 2);
bridge->shutdown();
BOOST_CHECK(servant->createCalls() == 1);
@@ -567,7 +570,7 @@ public:
testAdapter->activate();
BridgeManagerListenerIPtr servant = new BridgeManagerListenerI;
AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx listenerPrx;
- addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent("testBridgeManagerListener"));
+ addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent(IceUtil::generateUUID()));
AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mgrPrx = env()->primaryBridgeManager();
BOOST_CHECK(mgrPrx);
@@ -700,7 +703,7 @@ public:
testAdapter->activate();
BridgeManagerListenerIPtr servant = new BridgeManagerListenerI;
AsteriskSCF::SessionCommunications::V1::BridgeManagerListenerPrx listenerPrx;
- addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent("testBridgeManagerListener"));
+ addServant(listenerPrx, testAdapter, servant, testEnv.strToIdent(IceUtil::generateUUID()));
AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx mgrPrx = env()->primaryBridgeManager();
BOOST_CHECK(mgrPrx);
commit 065951a7616e80059a68828f72a475dd509e8531
Merge: ba42f30 d922b0a
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 12:25:25 2011 -0500
Merge branch 'single-build-dir' of git://git.asterisk.org/asterisk-scf/integration/bridging into single-build-dir
commit d922b0a5315b0abe2e9cb10d774870d4e7bd2f11
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 11:42:58 2011 -0500
Remove configuration of file that does not need it now.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8432c0..5483175 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,5 +27,4 @@ endif()
asterisk_scf_project(BridgingService 3.4)
add_subdirectory(src)
-add_subdirectory(config)
add_subdirectory(test)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
deleted file mode 100644
index df5843f..0000000
--- a/config/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-configure_file(test_bridging.conf.in test_bridging.conf)
commit 9cd5f73e81340ea9589d8736f61ba4ef4b1c2dc7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 11:36:42 2011 -0500
Rename a config file that was missed in the previous round of changes.
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf
similarity index 100%
rename from config/test_bridging.conf.in
rename to config/test_bridging.conf
commit 13d1259e05de64a80bbafb66f94f4938595bc517
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Apr 25 17:49:26 2011 -0500
Changes to work with new single-build-directory CMake script.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9979a32..e8432c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ if(NOT integrated_build STREQUAL "true")
# Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
- # This project is C++ based and requires a minimum of 3.4
- asterisk_scf_project(BridgingService 3.4 CXX)
-
# Take care of slice definitions
add_subdirectory(slice)
@@ -27,6 +24,8 @@ if(NOT integrated_build STREQUAL "true")
add_subdirectory(logger)
endif()
+asterisk_scf_project(BridgingService 3.4)
+
add_subdirectory(src)
add_subdirectory(config)
add_subdirectory(test)
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf.in
index 3e5f3ab..e88f751 100644
--- a/config/test_bridging.conf.in
+++ b/config/test_bridging.conf.in
@@ -109,13 +109,13 @@ ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422
#
# The IceBox entries for loading the services.
#
-IceBox.Service.Logger=${logger_bindir}/server/src at logging-service:createLoggingService
-IceBox.Service.Replicator=../src at BridgeReplicator:create
-IceBox.Service.TestBridge=../src at bridgeservice:create
-IceBox.Service.TestBridge2=../src/@bridgeservice:create
-IceBox.Service.TestServiceLocator=${service_locator_bindir}/src at service_locator:create
-IceBox.Service.TestChannel=${test_channel_bindir}/src at test_channel:create
-IceBox.Service.TestDriver=../test at bridge_component_test:create
+IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.Replicator=BridgeReplicator:create
+IceBox.Service.TestBridge=bridgeservice:create
+IceBox.Service.TestBridge2=bridgeservice:create
+IceBox.Service.TestServiceLocator=service_locator:create
+IceBox.Service.TestChannel=test_channel:create
+IceBox.Service.TestDriver=bridge_component_test:create
#
# The bridging service uses the test channel`s Endpoint
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2dfcc0e..b74c1e9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(bridge_component_test test-channel-api)
# component tests only work for integrated builds
if(integrated_build STREQUAL "true")
- icebox_add_test(bridge_component_test ../config/test_bridging.conf)
+ asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
endif()
asterisk_scf_component_init(bridge_unit_tests CXX)
commit 57b2e61bdf648e629cb2964e34f74621c399a94b
Author: Brent Eagles <beagles at digium.com>
Date: Tue Apr 26 14:32:57 2011 -0230
Add missing service locator configuration.
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf.in
index 37d7b8c..3e5f3ab 100644
--- a/config/test_bridging.conf.in
+++ b/config/test_bridging.conf.in
@@ -98,6 +98,7 @@ ServiceLocatorAdapter.Endpoints=tcp -p 4411
ServiceLocatorAdapter.ThreadPool.Size=4
ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
ServiceLocatorManagementAdapter.ThreadPool.Size=4
+ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
#
# The proxies that clients use to access the Service Locator facilities.
commit ba42f30351e094f5fe76b24a496d7e1baa3a11a6
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Apr 25 17:49:26 2011 -0500
Changes to work with new single-build-directory CMake script.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9979a32..e8432c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ if(NOT integrated_build STREQUAL "true")
# Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
- # This project is C++ based and requires a minimum of 3.4
- asterisk_scf_project(BridgingService 3.4 CXX)
-
# Take care of slice definitions
add_subdirectory(slice)
@@ -27,6 +24,8 @@ if(NOT integrated_build STREQUAL "true")
add_subdirectory(logger)
endif()
+asterisk_scf_project(BridgingService 3.4)
+
add_subdirectory(src)
add_subdirectory(config)
add_subdirectory(test)
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf.in
index 37d7b8c..8aa0cf7 100644
--- a/config/test_bridging.conf.in
+++ b/config/test_bridging.conf.in
@@ -108,13 +108,13 @@ ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422
#
# The IceBox entries for loading the services.
#
-IceBox.Service.Logger=${logger_bindir}/server/src at logging-service:createLoggingService
-IceBox.Service.Replicator=../src at BridgeReplicator:create
-IceBox.Service.TestBridge=../src at bridgeservice:create
-IceBox.Service.TestBridge2=../src/@bridgeservice:create
-IceBox.Service.TestServiceLocator=${service_locator_bindir}/src at service_locator:create
-IceBox.Service.TestChannel=${test_channel_bindir}/src at test_channel:create
-IceBox.Service.TestDriver=../test at bridge_component_test:create
+IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.Replicator=BridgeReplicator:create
+IceBox.Service.TestBridge=bridgeservice:create
+IceBox.Service.TestBridge2=bridgeservice:create
+IceBox.Service.TestServiceLocator=service_locator:create
+IceBox.Service.TestChannel=test_channel:create
+IceBox.Service.TestDriver=bridge_component_test:create
#
# The bridging service uses the test channel`s Endpoint
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2dfcc0e..b74c1e9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(bridge_component_test test-channel-api)
# component tests only work for integrated builds
if(integrated_build STREQUAL "true")
- icebox_add_test(bridge_component_test ../config/test_bridging.conf)
+ asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
endif()
asterisk_scf_component_init(bridge_unit_tests CXX)
-----------------------------------------------------------------------
--
asterisk-scf/integration/bridging.git
More information about the asterisk-scf-commits
mailing list