[asterisk-scf-commits] asterisk-scf/integration/file_media_service.git branch "initial_development" updated.

[Commits to the Asterisk SCF project code repositories]

branch "initial_development" has been updated
       via  617046b139730653a0aa0baf5caf427193a1b503 (commit)
      from  7c092d13dd8d5a9c7b315d2fff81ce5df1dcbec2 (commit)

Summary of changes:
 src/CMakeLists.txt                 |    4 ++--
 src/Component.cpp                  |    2 +-
 src/Configuration.cpp              |    2 +-
 src/ContainerImpl.cpp              |    2 +-
 src/ContainerRepository.cpp        |    2 +-
 src/FileMediaServiceReplicator.cpp |    2 +-
 src/ReplicationListener.cpp        |    2 +-
 test/CMakeLists.txt                |    2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 617046b139730653a0aa0baf5caf427193a1b503
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Jan 5 10:11:01 2012 -0330

    Updates for file/lib name changes.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58eb975..f020cd4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,7 +40,7 @@ astscf_component_add_boost_libraries(FileMediaService core)
 astscf_component_add_slice_collection_libraries(FileMediaService FILEMEDIASERVICE)
 astscf_component_add_slice_collection_libraries(FileMediaService ASTSCF)
 astscf_component_build_icebox(FileMediaService)
-target_link_libraries(FileMediaService logging-client astscf-ice-util-cpp matroska2 ebml2 corec)
+target_link_libraries(FileMediaService LoggingClient ASTSCFIceUtilCpp matroska2 ebml2 corec)
 astscf_component_install(FileMediaService)
 
 astscf_component_init(FileMediaServiceReplicator)
@@ -54,7 +54,7 @@ astscf_component_add_ice_libraries(FileMediaServiceReplicator IceStorm)
 astscf_component_add_boost_libraries(FileMediaServiceReplicator core)
 astscf_component_add_slice_collection_libraries(FileMediaServiceReplicator FILEMEDIASERVICE ASTSCF)
 astscf_component_build_icebox(FileMediaServiceReplicator)
-target_link_libraries(FileMediaServiceReplicator astscf-ice-util-cpp logging-client)
+target_link_libraries(FileMediaServiceReplicator ASTSCFIceUtilCpp LoggingClient)
 astscf_component_install(FileMediaServiceReplicator)
 
 
diff --git a/src/Component.cpp b/src/Component.cpp
index 5623fb1..b7239a4 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -33,7 +33,7 @@
 #include <AsteriskSCF/Media/File/FileMediaIf.h>
 
 #include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 
 using namespace std;
 using namespace AsteriskSCF::Core::Routing::V1;
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index a72834f..227958c 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -19,7 +19,7 @@
 #include "RepositoryConfigurationAdapter.h"
 
 #include <AsteriskSCF/Configuration/FileMediaService/FileMediaServiceConfigurationIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/System/Component/ConfigurationIf.h>
 
 #include <Ice/Ice.h>
diff --git a/src/ContainerImpl.cpp b/src/ContainerImpl.cpp
index 546eac0..ee0c72c 100644
--- a/src/ContainerImpl.cpp
+++ b/src/ContainerImpl.cpp
@@ -27,7 +27,7 @@
 #include <IceUtil/UUID.h>
 #include <IceUtil/Thread.h>
  
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 
 #include "MatroskaUtil.h"
 extern "C"
diff --git a/src/ContainerRepository.cpp b/src/ContainerRepository.cpp
index 7e8624d..733f462 100644
--- a/src/ContainerRepository.cpp
+++ b/src/ContainerRepository.cpp
@@ -33,7 +33,7 @@
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/filesystem.hpp>
 
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Media/File/FileMediaIf.h>
 
 #include <vector>
diff --git a/src/FileMediaServiceReplicator.cpp b/src/FileMediaServiceReplicator.cpp
index 565f318..ede9e43 100644
--- a/src/FileMediaServiceReplicator.cpp
+++ b/src/FileMediaServiceReplicator.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 <AsteriskSCF/Replication/FileMediaService/FileMediaServiceReplicationIf.h>
 #include <AsteriskSCF/Replication/StateReplicator.h>
diff --git a/src/ReplicationListener.cpp b/src/ReplicationListener.cpp
index d86f291..cf8ea9b 100644
--- a/src/ReplicationListener.cpp
+++ b/src/ReplicationListener.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "ReplicationListener.h"
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 
 using namespace AsteriskSCF::System::Logging;
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 196e876..7612e1d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -21,7 +21,7 @@ astscf_component_add_slice_collection_libraries(UnitTestContainerRepository ASTS
 astscf_component_add_slice_collection_libraries(UnitTestContainerRepository FILEMEDIASERVICE)
 astscf_component_build_standalone(UnitTestContainerRepository)
 
-target_link_libraries(UnitTestContainerRepository logging-client astscf-ice-util-cpp matroska2 ebml2 corec)
+target_link_libraries(UnitTestContainerRepository LoggingClient ASTSCFIceUtilCpp  matroska2 ebml2 corec)
 pjproject_link(UnitTestContainerRepository pjmedia)
 pjproject_link(UnitTestContainerRepository pjlib)
 pjproject_link(UnitTestContainerRepository pjlib-util)

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


-- 
asterisk-scf/integration/file_media_service.git