[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "rename" created.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Dec 29 10:59:59 CST 2011 

branch "rename" has been created
        at  c473f371a6fc8c7eac33ba8cb4ba6797a176268d (commit)

- Log -----------------------------------------------------------------
commit c473f371a6fc8c7eac33ba8cb4ba6797a176268d
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Dec 28 12:17:20 2011 -0600

    Adjust for name changes in ice-util-cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b0f87b7..1bee51e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ 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 astscf-ice-util-cpp LoggingClient)
+target_link_libraries(bridgeservice ASTSCFIceUtilCpp LoggingClient)
 astscf_component_install(bridgeservice)
 
 astscf_component_init(BridgeReplicator)

commit d1dfac32677da264740aeb362173ca46907c8dbf
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 27 16:32:18 2011 -0600

    Adjust for logging name changes.

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 3dd19e4..6c4e13c 100755
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -15,7 +15,7 @@
  */
 #include "BridgeImpl.h"
 
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/System/Component/ComponentServiceIf.h>
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
 #include <Ice/Ice.h>
diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index 4ec541d..0c11de9 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -17,10 +17,10 @@
 #include <Ice/Ice.h>
 #include <IceUtil/UUID.h>
 #include <boost/thread/locks.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include "BridgeListenerMgr.h"
 #include "BridgeManagerListenerMgr.h"
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include "BridgeImpl.h"
 #include "BridgeManagerListenerMgr.h"
 #include "BridgeReplicatorIf.h"
diff --git a/src/BridgeManagerImpl.h b/src/BridgeManagerImpl.h
index b1c4cc9..ff2f6ae 100644
--- a/src/BridgeManagerImpl.h
+++ b/src/BridgeManagerImpl.h
@@ -18,7 +18,7 @@
 #include <Ice/Ice.h>
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <string>
 #include <vector>
 
diff --git a/src/BridgePartyIdExtensionPoint.cpp b/src/BridgePartyIdExtensionPoint.cpp
index 684bb9d..6f13ce8 100644
--- a/src/BridgePartyIdExtensionPoint.cpp
+++ b/src/BridgePartyIdExtensionPoint.cpp
@@ -16,7 +16,7 @@
 
 #include <boost/thread/shared_mutex.hpp>
 
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Collections/ProxySet.h>
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.h>
 
diff --git a/src/BridgePartyIdExtensionPoint.h b/src/BridgePartyIdExtensionPoint.h
index b790f69..72783d4 100644
--- a/src/BridgePartyIdExtensionPoint.h
+++ b/src/BridgePartyIdExtensionPoint.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.h>
 
 namespace AsteriskSCF
diff --git a/src/BridgeReplicatorService.cpp b/src/BridgeReplicatorService.cpp
index 7ee758c..baf9f3f 100644
--- a/src/BridgeReplicatorService.cpp
+++ b/src/BridgeReplicatorService.cpp
@@ -18,7 +18,7 @@
 #include <IceBox/IceBox.h>
 
 #include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include "ServiceUtil.h"
 #include "BridgeReplicatorIf.h"
diff --git a/src/BridgeReplicatorStateListenerI.h b/src/BridgeReplicatorStateListenerI.h
index f8e4cf6..5aa5048 100644
--- a/src/BridgeReplicatorStateListenerI.h
+++ b/src/BridgeReplicatorStateListenerI.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include "BridgeReplicatorIf.h"
 #include "BridgeManagerImpl.h"
 #include "BridgeImpl.h"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b718a9..b0f87b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ 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 astscf-ice-util-cpp logging-client)
+target_link_libraries(bridgeservice astscf-ice-util-cpp LoggingClient)
 astscf_component_install(bridgeservice)
 
 astscf_component_init(BridgeReplicator)
@@ -51,5 +51,5 @@ astscf_component_add_ice_libraries(BridgeReplicator IceStorm)
 astscf_component_add_boost_libraries(BridgeReplicator thread date_time)
 astscf_component_add_slice_collection_libraries(BridgeReplicator ASTSCF)
 astscf_component_build_icebox(BridgeReplicator)
-target_link_libraries(BridgeReplicator logging-client)
+target_link_libraries(BridgeReplicator LoggingClient)
 astscf_component_install(BridgeReplicator)
diff --git a/src/Component.cpp b/src/Component.cpp
index 331e6af..3c1de74 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -19,7 +19,7 @@
 #include <IceStorm/IceStorm.h>
 
 #include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/System/Component/ComponentServiceIf.h>
 #include <AsteriskSCF/System/Component/ReplicaIf.h>
diff --git a/src/MediaMixer.h b/src/MediaMixer.h
index d167e25..3ee98d3 100644
--- a/src/MediaMixer.h
+++ b/src/MediaMixer.h
@@ -18,7 +18,7 @@
 #include <IceUtil/Shared.h>
 #include <IceUtil/Timer.h>
 #include <AsteriskSCF/Media/MediaIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <boost/shared_ptr.hpp>
 
 namespace AsteriskSCF
diff --git a/src/MediaSplicer.h b/src/MediaSplicer.h
index 18aa36f..29ade34 100644
--- a/src/MediaSplicer.h
+++ b/src/MediaSplicer.h
@@ -18,7 +18,7 @@
 #include <IceUtil/Shared.h>
 #include <AsteriskSCF/Media/MediaIf.h>
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <memory>
 #include "BridgeServiceConfig.h"
 #include "BridgeReplicatorIf.h"
diff --git a/src/SessionCollection.h b/src/SessionCollection.h
index d758e85..a9c0264 100644
--- a/src/SessionCollection.h
+++ b/src/SessionCollection.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <boost/thread/locks.hpp>
 #include <map>
 #include <string>
diff --git a/src/SessionOperations.h b/src/SessionOperations.h
index 042fdce..d257a90 100644
--- a/src/SessionOperations.h
+++ b/src/SessionOperations.h
@@ -17,7 +17,7 @@
 
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
 #include <AsteriskSCF/Media/MediaIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include "BridgeReplicatorIf.h"
 #include "SessionWrapper.h"
 #include <algorithm>
diff --git a/src/SessionWrapper.cpp b/src/SessionWrapper.cpp
index 11b59b8..480a7e8 100644
--- a/src/SessionWrapper.cpp
+++ b/src/SessionWrapper.cpp
@@ -16,7 +16,7 @@
 
 #include "SessionWrapper.h"
 #include <Ice/Ice.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include "ServiceUtil.h"
 #include <set>
 
diff --git a/src/SessionWrapper.h b/src/SessionWrapper.h
index a03d78b..c11a07b 100644
--- a/src/SessionWrapper.h
+++ b/src/SessionWrapper.h
@@ -17,7 +17,7 @@
 
 #include "BridgeReplicatorIf.h"
 #include "BridgeServiceConfig.h"
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <boost/thread/locks.hpp>
 #include "MediaSplicer.h"
 #include "Tasks.h"
diff --git a/src/Tasks.h b/src/Tasks.h
index 226a584..3487abb 100644
--- a/src/Tasks.h
+++ b/src/Tasks.h
@@ -19,7 +19,7 @@
 #include <IceUtil/UUID.h>
 #include <boost/thread/locks.hpp>
 #include <list>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 
 namespace AsteriskSCF
 {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 979d462..87f5b4b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -22,7 +22,7 @@ astscf_component_add_ice_libraries(bridge_component_test IceBox)
 astscf_component_add_boost_libraries(bridge_component_test unit_test_framework thread)
 astscf_component_add_slice_collection_libraries(bridge_component_test ASTSCF TEST_CHANNEL)
 astscf_component_build_icebox(bridge_component_test)
-target_link_libraries(bridge_component_test logging-client)
+target_link_libraries(bridge_component_test LoggingClient)
 astscf_test_icebox(bridge_component_test config/test_bridging.conf)
 
 astscf_component_init(bridge_unit_tests)
@@ -37,5 +37,5 @@ astscf_component_add_ice_libraries(bridge_unit_tests Ice)
 astscf_component_add_boost_libraries(bridge_unit_tests unit_test_framework thread)
 astscf_component_add_slice_collection_libraries(bridge_unit_tests ASTSCF)
 astscf_component_build_standalone(bridge_unit_tests)
-target_link_libraries(bridge_unit_tests logging-client)
+target_link_libraries(bridge_unit_tests LoggingClient)
 astscf_test_boost(bridge_unit_tests)
diff --git a/test/UnitTests.cpp b/test/UnitTests.cpp
index 7af1dd8..a5ea720 100644
--- a/test/UnitTests.cpp
+++ b/test/UnitTests.cpp
@@ -20,7 +20,7 @@
 #include <boost/test/debug.hpp>
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
 #include <AsteriskSCF/Media/MediaIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <Ice/Ice.h>
 #include <IceUtil/UUID.h>
 #include <set>

commit d3ad85b43f6f3d6fff57914a5e6c2d2eccdac6a1
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 27 12:19:13 2011 -0600

    Adjust for new slice file names.

diff --git a/src/MediaMixer.cpp b/src/MediaMixer.cpp
index 4237041..c8e47cd 100755
--- a/src/MediaMixer.cpp
+++ b/src/MediaMixer.cpp
@@ -15,7 +15,7 @@
  */
 #include "MediaMixer.h"
 
-#include <AsteriskSCF/Media/Formats/AudioFormats.h>
+#include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
 
 #include <Ice/Ice.h>
 #include <IceUtil/Shared.h>
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 27411cc..de7ff6f 100755
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -15,7 +15,7 @@
  */
 #include "MediaSplicer.h"
 #include "MediaMixer.h"
-#include <AsteriskSCF/Media/Formats/AudioFormats.h>
+#include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
 #include "BridgeServiceConfig.h"

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


-- 
asterisk-scf/integration/bridging.git

More information about the asterisk-scf-commits mailing list