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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  400bd789f88a1eab4f17a2a061e4ebee1344b454 (commit)
       via  97a2ae9d12eed722c7d55edfe937f54ba6d6d3e0 (commit)
       via  a149c41afcf76b410a428c76614642493e298a95 (commit)
      from  944a99d7b24d1d8a1ecd7b08a4adf6820582b383 (commit)

Summary of changes:
 src/CMakeLists.txt              |    4 ++--
 src/Component.cpp               |    2 +-
 src/ICETransport.cpp            |    2 +-
 src/NATConfig.cpp               |    2 +-
 src/UDPTLSource.cpp             |    2 +-
 src/UdptlStateReplicatorApp.cpp |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 400bd789f88a1eab4f17a2a061e4ebee1344b454
Merge: 97a2ae9 944a99d
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Dec 30 14:54:24 2011 -0600

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


commit 97a2ae9d12eed722c7d55edfe937f54ba6d6d3e0
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Dec 28 12:17:23 2011 -0600

    Adjust for name changes in ice-util-cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a08365d..d62083b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ astscf_component_add_slices(MediaTransportUDPTL PROJECT AsteriskSCF/Configuratio
 astscf_component_add_boost_libraries(MediaTransportUDPTL core thread)
 astscf_component_add_slice_collection_libraries(MediaTransportUDPTL ASTSCF)
 astscf_component_build_icebox(MediaTransportUDPTL)
-target_link_libraries(MediaTransportUDPTL LoggingClient astscf-ice-util-cpp)
+target_link_libraries(MediaTransportUDPTL LoggingClient ASTSCFIceUtilCpp)
 
 pjproject_link(MediaTransportUDPTL pjlib)
 pjproject_link(MediaTransportUDPTL pjlib-util)
@@ -60,5 +60,5 @@ astscf_component_add_ice_libraries(UdptlStateReplicator IceStorm)
 astscf_component_add_boost_libraries(UdptlStateReplicator thread date_time)
 astscf_component_add_slice_collection_libraries(UdptlStateReplicator ASTSCF)
 astscf_component_build_icebox(UdptlStateReplicator)
-target_link_libraries(UdptlStateReplicator LoggingClient astscf-ice-util-cpp)
+target_link_libraries(UdptlStateReplicator LoggingClient ASTSCFIceUtilCpp)
 astscf_component_install(UdptlStateReplicator)

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

    Adjust for logging changes.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f196d1..a08365d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ astscf_component_add_slices(MediaTransportUDPTL PROJECT AsteriskSCF/Configuratio
 astscf_component_add_boost_libraries(MediaTransportUDPTL core thread)
 astscf_component_add_slice_collection_libraries(MediaTransportUDPTL ASTSCF)
 astscf_component_build_icebox(MediaTransportUDPTL)
-target_link_libraries(MediaTransportUDPTL logging-client astscf-ice-util-cpp)
+target_link_libraries(MediaTransportUDPTL LoggingClient astscf-ice-util-cpp)
 
 pjproject_link(MediaTransportUDPTL pjlib)
 pjproject_link(MediaTransportUDPTL pjlib-util)
@@ -60,5 +60,5 @@ astscf_component_add_ice_libraries(UdptlStateReplicator IceStorm)
 astscf_component_add_boost_libraries(UdptlStateReplicator thread date_time)
 astscf_component_add_slice_collection_libraries(UdptlStateReplicator ASTSCF)
 astscf_component_build_icebox(UdptlStateReplicator)
-target_link_libraries(UdptlStateReplicator logging-client astscf-ice-util-cpp)
+target_link_libraries(UdptlStateReplicator LoggingClient astscf-ice-util-cpp)
 astscf_component_install(UdptlStateReplicator)
diff --git a/src/Component.cpp b/src/Component.cpp
index a88da51..60dadb9 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -28,7 +28,7 @@
 #include <AsteriskSCF/Media/UDPTL/MediaUDPTLIf.h>
 #include <AsteriskSCF/System/Component/ConfigurationIf.h>
 #include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Discovery/SmartProxy.h>
 #include <AsteriskSCF/Component/Component.h>
 
diff --git a/src/ICETransport.cpp b/src/ICETransport.cpp
index 7c083f2..db2337d 100644
--- a/src/ICETransport.cpp
+++ b/src/ICETransport.cpp
@@ -29,7 +29,7 @@
 #include <AsteriskSCF/System/NAT/NATTraversalIf.h>
 #include <Ice/Ice.h>
 #include <sstream>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <IceUtil/UUID.h>
 
 using namespace AsteriskSCF::UDPTL;
diff --git a/src/NATConfig.cpp b/src/NATConfig.cpp
index 5307156..ef894b8 100644
--- a/src/NATConfig.cpp
+++ b/src/NATConfig.cpp
@@ -19,7 +19,7 @@
 #include <Ice/Properties.h>
 #include <AsteriskSCF/System/ExceptionsIf.h>
 #include <pjnath.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 
 using namespace std;
 using namespace AsteriskSCF::Helpers;
diff --git a/src/UDPTLSource.cpp b/src/UDPTLSource.cpp
index c639d79..44ce10c 100644
--- a/src/UDPTLSource.cpp
+++ b/src/UDPTLSource.cpp
@@ -27,7 +27,7 @@
 
 #include <AsteriskSCF/Media/MediaIf.h>
 #include <AsteriskSCF/Media/UDPTL/MediaUDPTLIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/System/Component/ReplicaIf.h>
 
 #include "udptl.h"
diff --git a/src/UdptlStateReplicatorApp.cpp b/src/UdptlStateReplicatorApp.cpp
index a9b3c8a..59016bd 100644
--- a/src/UdptlStateReplicatorApp.cpp
+++ b/src/UdptlStateReplicatorApp.cpp
@@ -22,7 +22,7 @@
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/System/Component/ComponentServiceIf.h>
 #include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h>
 #include <AsteriskSCF/System/Component/ConfigurationIf.h>
 #include <AsteriskSCF/Media/UDPTL/MediaUDPTLIf.h>

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


-- 
asterisk-scf/release/media_transport_udptl.git