[asterisk-scf-commits] asterisk-scf/release/routing.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Dec 30 14:50:29 CST 2011
branch "master" has been updated
via 3bd2b89ecf840a074fbf8c558015d22213ec5bf2 (commit)
via 7d834ea98a7bc7b3dd6f76bd19167c8779fcaf2b (commit)
via bcb4d997e7ccf7fe06e8b23e2a191ee6b2a20dd5 (commit)
via 33840f0b349ba235a0638e163db4ae803b61e552 (commit)
from f0c19132f4e6a9329c0a926c30ff1a4452d37ffd (commit)
Summary of changes:
src/BasicRoutingStateReplicatorApp.cpp | 2 +-
src/CMakeLists.txt | 4 ++--
src/Component.cpp | 2 +-
src/ConnectBridgedSessionsOperation.cpp | 2 +-
...nectBridgedSessionsWithDestinationOperation.cpp | 2 +-
src/EndpointRegistry.cpp | 2 +-
src/LuaScriptProcessor.cpp | 2 +-
src/RouteSessionOperation.cpp | 2 +-
src/RoutingServiceEventPublisher.cpp | 2 +-
src/RoutingStateReplicatorListener.cpp | 2 +-
src/SessionListener.cpp | 2 +-
src/SessionRouter.cpp | 4 ++--
src/SessionRouterOperation.cpp | 2 +-
src/SessionRouterOperation.h | 2 +-
test/CMakeLists.txt | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
- Log -----------------------------------------------------------------
commit 3bd2b89ecf840a074fbf8c558015d22213ec5bf2
Author: Mark Michelson <mmichelson at digium.com>
Date: Wed Dec 28 12:17:19 2011 -0600
Adjust for name changes in ice-util-cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index abf2412..64fbf5f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,7 +38,7 @@ astscf_component_add_ice_libraries(BasicRoutingService IceStorm)
astscf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
astscf_component_add_slice_collection_libraries(BasicRoutingService ASTSCF)
astscf_component_build_icebox(BasicRoutingService)
-target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} LoggingClient astscf-util-cpp astscf-ice-util-cpp)
+target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} LoggingClient astscf-util-cpp ASTSCFIceUtilCpp)
if(UNIX)
target_link_libraries(BasicRoutingService dl)
endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a3c697d..4acc107 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,4 +19,4 @@ astscf_component_add_boost_libraries(RoutingTest unit_test_framework)
astscf_component_add_slice_collection_libraries(RoutingTest ASTSCF)
astscf_component_build_icebox(RoutingTest)
astscf_test_icebox(RoutingTest config/routingtest.conf)
-target_link_libraries(RoutingTest astscf-ice-util-cpp)
+target_link_libraries(RoutingTest ASTSCFIceUtilCpp)
commit 7d834ea98a7bc7b3dd6f76bd19167c8779fcaf2b
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Dec 27 16:31:35 2011 -0600
Adjust for logging filename changes.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 03c845f..abf2412 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,7 +38,7 @@ astscf_component_add_ice_libraries(BasicRoutingService IceStorm)
astscf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
astscf_component_add_slice_collection_libraries(BasicRoutingService ASTSCF)
astscf_component_build_icebox(BasicRoutingService)
-target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} logging-client astscf-util-cpp astscf-ice-util-cpp)
+target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} LoggingClient astscf-util-cpp astscf-ice-util-cpp)
if(UNIX)
target_link_libraries(BasicRoutingService dl)
endif()
@@ -50,5 +50,5 @@ astscf_component_add_slices(BasicRoutingStateReplicator PROJECT AsteriskSCF/Repl
astscf_component_add_ice_libraries(BasicRoutingStateReplicator IceStorm)
astscf_component_add_slice_collection_libraries(BasicRoutingStateReplicator ASTSCF)
astscf_component_build_icebox(BasicRoutingStateReplicator)
-target_link_libraries(BasicRoutingStateReplicator logging-client)
+target_link_libraries(BasicRoutingStateReplicator LoggingClient)
astscf_component_install(BasicRoutingStateReplicator)
commit bcb4d997e7ccf7fe06e8b23e2a191ee6b2a20dd5
Merge: 33840f0 f0c1913
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Dec 27 16:03:14 2011 -0600
Merge branch 'master' into rename
commit 33840f0b349ba235a0638e163db4ae803b61e552
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Dec 1 10:53:47 2011 -0600
Some changes to deal with renaming conventions. Mostly
making sure at this point that we're including properly
renamed files.
diff --git a/src/BasicRoutingStateReplicatorApp.cpp b/src/BasicRoutingStateReplicatorApp.cpp
index 6b95542..0e385dd 100644
--- a/src/BasicRoutingStateReplicatorApp.cpp
+++ b/src/BasicRoutingStateReplicatorApp.cpp
@@ -21,7 +21,7 @@
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include <AsteriskSCF/System/Component/ComponentServiceIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Logger/IceLogger.h>
#include <AsteriskSCF/Replication/StateReplicator.h>
#include "BasicRoutingStateReplicationIf.h"
diff --git a/src/Component.cpp b/src/Component.cpp
index 7d5f03d..fbd60a2 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -25,7 +25,7 @@
#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
#include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Component/Component.h>
#include "AsteriskSCF/Threading/SimpleWorkQueue.h"
diff --git a/src/ConnectBridgedSessionsOperation.cpp b/src/ConnectBridgedSessionsOperation.cpp
index ab1dc2c..b4a1894 100644
--- a/src/ConnectBridgedSessionsOperation.cpp
+++ b/src/ConnectBridgedSessionsOperation.cpp
@@ -16,7 +16,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/bind.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "ConnectBridgedSessionsOperation.h"
diff --git a/src/ConnectBridgedSessionsWithDestinationOperation.cpp b/src/ConnectBridgedSessionsWithDestinationOperation.cpp
index a62b309..43b86d0 100644
--- a/src/ConnectBridgedSessionsWithDestinationOperation.cpp
+++ b/src/ConnectBridgedSessionsWithDestinationOperation.cpp
@@ -16,7 +16,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/bind.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "BasicRoutingStateReplicationIf.h"
#include "ConnectBridgedSessionsWithDestinationOperation.h"
diff --git a/src/EndpointRegistry.cpp b/src/EndpointRegistry.cpp
index 97cc956..0f37e78 100644
--- a/src/EndpointRegistry.cpp
+++ b/src/EndpointRegistry.cpp
@@ -17,7 +17,7 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Discovery/SmartProxy.h>
#include "RoutingServiceEventPublisher.h"
diff --git a/src/LuaScriptProcessor.cpp b/src/LuaScriptProcessor.cpp
index fcc3066..44512ac 100644
--- a/src/LuaScriptProcessor.cpp
+++ b/src/LuaScriptProcessor.cpp
@@ -18,7 +18,7 @@
#include <boost/thread/locks.hpp>
#include <boost/thread/shared_mutex.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "LuaScriptProcessor.h"
diff --git a/src/RouteSessionOperation.cpp b/src/RouteSessionOperation.cpp
index 63bd4d3..d54c632 100644
--- a/src/RouteSessionOperation.cpp
+++ b/src/RouteSessionOperation.cpp
@@ -16,7 +16,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/bind.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Component/TestContext.h>
#include "BasicRoutingStateReplicationIf.h"
diff --git a/src/RoutingServiceEventPublisher.cpp b/src/RoutingServiceEventPublisher.cpp
index 80031e2..eba8bef 100644
--- a/src/RoutingServiceEventPublisher.cpp
+++ b/src/RoutingServiceEventPublisher.cpp
@@ -18,7 +18,7 @@
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <boost/thread/mutex.hpp>
#include "RoutingServiceEventPublisher.h"
diff --git a/src/RoutingStateReplicatorListener.cpp b/src/RoutingStateReplicatorListener.cpp
index 3e96cc0..d237d46 100644
--- a/src/RoutingStateReplicatorListener.cpp
+++ b/src/RoutingStateReplicatorListener.cpp
@@ -18,7 +18,7 @@
#include <boost/thread.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "RoutingStateReplicatorListener.h"
#include "OperationReplicaCache.h"
diff --git a/src/SessionListener.cpp b/src/SessionListener.cpp
index 34c4337..8661543 100644
--- a/src/SessionListener.cpp
+++ b/src/SessionListener.cpp
@@ -17,7 +17,7 @@
#include <boost/thread/shared_mutex.hpp>
#include <boost/thread/thread.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "SessionRouter.h"
#include "SessionListener.h"
diff --git a/src/SessionRouter.cpp b/src/SessionRouter.cpp
index 9d9477a..ee69565 100644
--- a/src/SessionRouter.cpp
+++ b/src/SessionRouter.cpp
@@ -21,12 +21,12 @@
#include <AsteriskSCF/Core/Routing/RoutingIf.h>
#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "AsteriskSCF/Threading/WorkQueue.h"
#include <AsteriskSCF/Core/Routing/RoutingIf.h>
#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "SessionRouter.h"
#include "RouteSessionOperation.h"
diff --git a/src/SessionRouterOperation.cpp b/src/SessionRouterOperation.cpp
index d365a33..f642dc5 100644
--- a/src/SessionRouterOperation.cpp
+++ b/src/SessionRouterOperation.cpp
@@ -16,7 +16,7 @@
#include <boost/shared_ptr.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "SessionRouterOperation.h"
diff --git a/src/SessionRouterOperation.h b/src/SessionRouterOperation.h
index db25bbb..a93c058 100644
--- a/src/SessionRouterOperation.h
+++ b/src/SessionRouterOperation.h
@@ -26,7 +26,7 @@
#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
#include <AsteriskSCF/Discovery/SmartProxy.h>
#include <AsteriskSCF/Core/Routing/RoutingIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "RoutingReplicationContext.h"
#include "SessionListener.h"
-----------------------------------------------------------------------
--
asterisk-scf/release/routing.git
More information about the asterisk-scf-commits
mailing list