[asterisk-scf-commits] asterisk-scf/integration/file_session_gateway.git branch "first_crack_for_review" updated.

[Commits to the Asterisk SCF project code repositories]

branch "first_crack_for_review" has been updated
       via  6cb018ac22293cd48c76bc5f49e681e5b876bd80 (commit)
      from  3efd700fe5d9130828969c147c76567981d31172 (commit)

Summary of changes:
 src/CMakeLists.txt                   |    4 ++--
 src/Component.cpp                    |    4 ++--
 src/Configuration.cpp                |    2 +-
 src/Endpoint.cpp                     |    2 +-
 src/EndpointLocator.cpp              |    2 +-
 src/FileSessionGatewayReplicator.cpp |    2 +-
 src/RemoteServices.cpp               |    2 +-
 src/Session.cpp                      |    2 +-
 test/CMakeLists.txt                  |    6 +++---
 9 files changed, 13 insertions(+), 13 deletions(-)


- Log -----------------------------------------------------------------
commit 6cb018ac22293cd48c76bc5f49e681e5b876bd80
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Jan 5 10:10:17 2012 -0330

    Fixes for recent namechanges to libraries and header files.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a4eabd..4bff0b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,7 @@ astscf_component_add_ice_libraries(FileSessionGateway IceStorm)
 astscf_component_add_boost_libraries(FileSessionGateway core)
 astscf_component_add_slice_collection_libraries(FileSessionGateway FILESESSIONGATEWAY ASTSCF)
 astscf_component_build_icebox(FileSessionGateway)
-target_link_libraries(FileSessionGateway astscf-ice-util-cpp logging-client)
+target_link_libraries(FileSessionGateway ASTSCFIceUtilCpp LoggingClient)
 astscf_component_install(FileSessionGateway)
 
 astscf_component_init(FileSessionReplicator)
@@ -49,7 +49,7 @@ astscf_component_add_ice_libraries(FileSessionReplicator IceStorm)
 astscf_component_add_boost_libraries(FileSessionReplicator core)
 astscf_component_add_slice_collection_libraries(FileSessionReplicator FILESESSIONGATEWAY ASTSCF)
 astscf_component_build_icebox(FileSessionReplicator)
-target_link_libraries(FileSessionReplicator astscf-ice-util-cpp logging-client)
+target_link_libraries(FileSessionReplicator ASTSCFIceUtilCpp LoggingClient)
 astscf_component_install(FileSessionReplicator)
 
 
diff --git a/src/Component.cpp b/src/Component.cpp
index 62c7cd8..6717f5c 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -37,7 +37,7 @@
 #include <AsteriskSCF/FileSessionGateway/FileSessionGatewayIf.h>
 
 #include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 
 using namespace AsteriskSCF::System::Component::V1;
 using namespace AsteriskSCF::System::Logging;
@@ -270,7 +270,7 @@ public:
             mEndpointLocatorFeature->activate(getServiceAdapter()));
     }
 
-    void registerWithRemoteRemoteServices()
+    void registerWithRemoteServices()
     {
         if (mEndpointLocatorFeature)
         {
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index f4fe56c..bceb74f 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -20,7 +20,7 @@
 #include "EndpointLocator.h"
 
 #include <AsteriskSCF/Configuration/FileSessionGateway/FileSessionGatewayConfigurationIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/System/Component/ConfigurationIf.h>
 
 #include <Ice/Ice.h>
diff --git a/src/Endpoint.cpp b/src/Endpoint.cpp
index d99623b..0bc615b 100644
--- a/src/Endpoint.cpp
+++ b/src/Endpoint.cpp
@@ -20,7 +20,7 @@
 
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.h>
 
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 
 #include <IceUtil/UUID.h>
 #include <Ice/Ice.h>
diff --git a/src/EndpointLocator.cpp b/src/EndpointLocator.cpp
index 135d197..2b7ebbd 100644
--- a/src/EndpointLocator.cpp
+++ b/src/EndpointLocator.cpp
@@ -18,7 +18,7 @@
 #include "Endpoint.h"
 #include "Config.h"
 
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/Core/Routing/RoutingIf.h>
 #include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
diff --git a/src/FileSessionGatewayReplicator.cpp b/src/FileSessionGatewayReplicator.cpp
index 85dae23..7c1151c 100644
--- a/src/FileSessionGatewayReplicator.cpp
+++ b/src/FileSessionGatewayReplicator.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/FileSessionGateway/FileSessionReplicationIf.h>
 #include <AsteriskSCF/Replication/StateReplicator.h>
diff --git a/src/RemoteServices.cpp b/src/RemoteServices.cpp
index 5cb7708..519d230 100644
--- a/src/RemoteServices.cpp
+++ b/src/RemoteServices.cpp
@@ -17,7 +17,7 @@
 #include "RemoteServices.h"
 #include "ComponentDefs.h"
 #include <AsteriskSCF/Discovery/SmartProxy.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/locks.hpp>
diff --git a/src/Session.cpp b/src/Session.cpp
index 6ff4bf0..cc29766 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -18,7 +18,7 @@
 #include "ComponentDefs.h"
 #include "CookieManager.h"
 
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 
 #include <AsteriskSCF/Media/MediaIf.h>
 #include <AsteriskSCF/SessionCommunications/PartyIdentificationIf.h>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6416a63..b166f2c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,7 +24,7 @@ astscf_component_add_slice_collection_libraries(FileSessionGatewaySessionTest
     FILESESSIONGATEWAY ASTSCF)
 astscf_component_add_boost_libraries(FileSessionGatewaySessionTest unit_test_framework thread)
 astscf_component_build_standalone(FileSessionGatewaySessionTest)
-target_link_libraries(FileSessionGatewaySessionTest logging-client astscf-ice-util-cpp)
+target_link_libraries(FileSessionGatewaySessionTest LoggingClient ASTSCFIceUtilCpp)
 astscf_test_boost(FileSessionGatewaySessionTest)
 
 astscf_component_init(FileSessionGatewayEndpointLocatorTest)
@@ -48,7 +48,7 @@ astscf_component_add_slice_collection_libraries(FileSessionGatewayEndpointLocato
     FILESESSIONGATEWAY ASTSCF)
 astscf_component_add_boost_libraries(FileSessionGatewayEndpointLocatorTest unit_test_framework thread)
 astscf_component_build_standalone(FileSessionGatewayEndpointLocatorTest)
-target_link_libraries(FileSessionGatewayEndpointLocatorTest logging-client astscf-ice-util-cpp)
+target_link_libraries(FileSessionGatewayEndpointLocatorTest LoggingClient ASTSCFIceUtilCpp)
 astscf_test_boost(FileSessionGatewayEndpointLocatorTest)
 
 astscf_component_init(FileSessionGatewayTest)
@@ -57,5 +57,5 @@ astscf_component_add_files(FileSessionGatewayTest ComponentTest.cpp)
 astscf_component_add_slice_collection_libraries(FileSessionGatewayTest FILESESSIONGATEWAY ASTSCF)
 astscf_component_add_boost_libraries(FileSessionGatewayTest unit_test_framework thread)
 astscf_component_build_icebox(FileSessionGatewayTest)
-target_link_libraries(FileSessionGatewayTest logging-client astscf-ice-util-cpp)
+target_link_libraries(FileSessionGatewayTest LoggingClient ASTSCFIceUtilCpp)
 astscf_test_icebox(FileSessionGatewayTest config/test_file_session_gateway.icebox)

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


-- 
asterisk-scf/integration/file_session_gateway.git