[asterisk-scf-commits] asterisk-scf/release/logger.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 21:02:30 UTC 2011
branch "master" has been updated
via 343eb5a60b09417f4ba706445373fabfd9040b8f (commit)
via 3c13b6d094c74285cd6c4fd35482853290943288 (commit)
from 554326af9808dd5830de626e5e2ee8931168a9b6 (commit)
Summary of changes:
CMakeLists.txt | 31 +++++++++++++++++++-
client/CMakeLists.txt | 1 -
client/src/CMakeLists.txt | 30 -------------------
client/src/IceConfigurator.h | 2 +-
client/src/IceLogger.cpp | 6 ++--
client/src/LogOut.cpp | 2 +-
client/src/Logger.cpp | 2 +-
client/src/LoggerFactory.cpp | 2 +-
client/src/OstreamLogger.cpp | 2 +-
client/test/CMakeLists.txt | 2 +-
client/test/ExpectedLogOut.h | 2 +-
client/test/LogBuf-test.cpp | 2 +-
client/test/Logger-test.cpp | 2 +-
client/test/LoggerFactory-test.cpp | 2 +-
client/test/scf-log.cpp | 4 +-
.../src => include/AsteriskSCF/Logger}/IceLogger.h | 0
{common => include/AsteriskSCF/Logger}/Level.h | 0
.../src => include/AsteriskSCF/Logger}/LogOut.h | 2 +-
{client/src => include/AsteriskSCF}/logger.h | 6 ++--
server/src/CMakeLists.txt | 2 +-
server/src/ChainedLogOut.h | 2 +-
server/src/LoggingServer.cpp | 3 +-
server/src/LoggingServer.h | 2 +-
server/src/main.cpp | 2 +-
server/test/CMakeLists.txt | 2 +-
25 files changed, 56 insertions(+), 57 deletions(-)
delete mode 100644 client/src/CMakeLists.txt
rename {client/src => include/AsteriskSCF/Logger}/IceLogger.h (100%)
rename {common => include/AsteriskSCF/Logger}/Level.h (100%)
rename {client/src => include/AsteriskSCF/Logger}/LogOut.h (95%)
rename {client/src => include/AsteriskSCF}/logger.h (98%)
- Log -----------------------------------------------------------------
commit 343eb5a60b09417f4ba706445373fabfd9040b8f
Merge: 3c13b6d 554326a
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Jan 7 15:02:21 2011 -0600
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/logger
commit 3c13b6d094c74285cd6c4fd35482853290943288
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Jan 7 14:54:42 2011 -0600
Adjust #includes to use <> and prefix paths with AsteriskSCF.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72fbec5..edd81ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,4 +27,33 @@ else()
endif()
add_subdirectory(server)
-add_subdirectory(client)
+add_subdirectory(client) # For the client test directory.
+
+
+# The client component is built here, so as to be able to add files
+# from both src and include directories.
+
+asterisk_scf_component_init(logging-client CXX)
+
+include_directories(include)
+
+asterisk_scf_component_add_file(logging-client client/src/Logger.cpp)
+asterisk_scf_component_add_file(logging-client client/src/LoggerFactory.cpp)
+asterisk_scf_component_add_file(logging-client client/src/LogOut.cpp)
+asterisk_scf_component_add_file(logging-client client/src/IceConfigurator.cpp)
+asterisk_scf_component_add_file(logging-client client/src/IceLogger.cpp)
+asterisk_scf_component_add_file(logging-client client/src/OstreamLogger.cpp)
+asterisk_scf_component_add_file(logging-client client/src/IceConfigurator.h)
+asterisk_scf_component_add_file(logging-client include/AsteriskSCF/logger.h)
+asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/LogOut.h)
+asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/IceLogger.h)
+asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/Level.h)
+
+asterisk_scf_component_add_slice(logging-client LoggerIf)
+asterisk_scf_component_add_slice(logging-client ServiceLocatorIf)
+asterisk_scf_component_add_slice(logging-client ServiceLocatorEventsIf)
+
+asterisk_scf_component_add_boost_libraries(logging-client thread date_time)
+asterisk_scf_add_ice_libraries(IceStorm)
+
+asterisk_scf_component_build_library(logging-client)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 6b2ef65..b38354d 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -6,5 +6,4 @@
# All rights reserved.
#
-add_subdirectory(src)
add_subdirectory(test)
diff --git a/client/src/CMakeLists.txt b/client/src/CMakeLists.txt
deleted file mode 100644
index cdf9c90..0000000
--- a/client/src/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-asterisk_scf_component_init(logging-client CXX)
-
-include_directories(../../common)
-
-asterisk_scf_component_add_file(logging-client Logger.cpp)
-asterisk_scf_component_add_file(logging-client LoggerFactory.cpp)
-asterisk_scf_component_add_file(logging-client LogOut.cpp)
-asterisk_scf_component_add_file(logging-client IceConfigurator.cpp)
-asterisk_scf_component_add_file(logging-client IceLogger.cpp)
-asterisk_scf_component_add_file(logging-client OstreamLogger.cpp)
-asterisk_scf_component_add_file(logging-client logger.h)
-asterisk_scf_component_add_file(logging-client IceConfigurator.h)
-asterisk_scf_component_add_file(logging-client LogOut.h)
-
-asterisk_scf_component_add_slice(logging-client LoggerIf)
-asterisk_scf_component_add_slice(logging-client ServiceLocatorIf)
-asterisk_scf_component_add_slice(logging-client ServiceLocatorEventsIf)
-
-asterisk_scf_component_add_boost_libraries(logging-client thread date_time)
-asterisk_scf_add_ice_libraries(IceStorm)
-
-asterisk_scf_component_build_library(logging-client)
diff --git a/client/src/IceConfigurator.h b/client/src/IceConfigurator.h
index 5a5d032..1742cb0 100644
--- a/client/src/IceConfigurator.h
+++ b/client/src/IceConfigurator.h
@@ -16,7 +16,7 @@
#pragma once
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
namespace AsteriskSCF
{
diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index 2a67f4b..42622c6 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -16,10 +16,10 @@
#include <IceStorm/IceStorm.h>
-#include "Core/Discovery/ServiceLocatorIf.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
-#include "IceLogger.h"
-#include "Level.h"
+#include <AsteriskSCF/Logger/IceLogger.h>
+#include <AsteriskSCF/Logger/Level.h>
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::System::Logging;
diff --git a/client/src/LogOut.cpp b/client/src/LogOut.cpp
index 7f361bb..b8a3d4a 100644
--- a/client/src/LogOut.cpp
+++ b/client/src/LogOut.cpp
@@ -14,7 +14,7 @@
* at the top of the source tree.
*/
-#include "LogOut.h"
+#include <AsteriskSCF/Logger/LogOut.h>
using namespace AsteriskSCF::System::Logging;
diff --git a/client/src/Logger.cpp b/client/src/Logger.cpp
index c1403e3..bd56c19 100644
--- a/client/src/Logger.cpp
+++ b/client/src/Logger.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include <cstdio>
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
using namespace AsteriskSCF::System::Logging;
diff --git a/client/src/LoggerFactory.cpp b/client/src/LoggerFactory.cpp
index 0b1e845..3ad3c42 100644
--- a/client/src/LoggerFactory.cpp
+++ b/client/src/LoggerFactory.cpp
@@ -24,7 +24,7 @@
#include <boost/algorithm/string/split.hpp>
#include <boost/thread/once.hpp>
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
using namespace AsteriskSCF::System::Logging;
using namespace boost::algorithm;
diff --git a/client/src/OstreamLogger.cpp b/client/src/OstreamLogger.cpp
index a1f8076..d3b35c6 100644
--- a/client/src/OstreamLogger.cpp
+++ b/client/src/OstreamLogger.cpp
@@ -14,7 +14,7 @@
* at the top of the source tree.
*/
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
using namespace AsteriskSCF::System::Logging;
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index e52affb..c5a55fd 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -9,7 +9,7 @@
asterisk_scf_component_init(logging-client-test CXX)
include_directories(../src)
-include_directories(../../common)
+include_directories(../../include)
asterisk_scf_component_add_file(logging-client-test Logger-test.cpp)
asterisk_scf_component_add_file(logging-client-test LoggerFactory-test.cpp)
diff --git a/client/test/ExpectedLogOut.h b/client/test/ExpectedLogOut.h
index 1c964f7..2fdcb02 100644
--- a/client/test/ExpectedLogOut.h
+++ b/client/test/ExpectedLogOut.h
@@ -8,7 +8,7 @@
#pragma once
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
namespace AsteriskSCF
{
diff --git a/client/test/LogBuf-test.cpp b/client/test/LogBuf-test.cpp
index 8d035f3..845f5f6 100644
--- a/client/test/LogBuf-test.cpp
+++ b/client/test/LogBuf-test.cpp
@@ -17,7 +17,7 @@
#include <boost/test/unit_test.hpp>
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
#include "ExpectedLogOut.h"
using namespace AsteriskSCF::System::Logging;
diff --git a/client/test/Logger-test.cpp b/client/test/Logger-test.cpp
index dc8fea6..0964c6f 100644
--- a/client/test/Logger-test.cpp
+++ b/client/test/Logger-test.cpp
@@ -16,7 +16,7 @@
#include <boost/test/unit_test.hpp>
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
#include "ExpectedLogOut.h"
using namespace AsteriskSCF::System::Logging;
diff --git a/client/test/LoggerFactory-test.cpp b/client/test/LoggerFactory-test.cpp
index 160b814..ea98bcc 100644
--- a/client/test/LoggerFactory-test.cpp
+++ b/client/test/LoggerFactory-test.cpp
@@ -16,7 +16,7 @@
#include <boost/test/unit_test.hpp>
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
#include "ExpectedLogOut.h"
using namespace AsteriskSCF::System::Logging;
diff --git a/client/test/scf-log.cpp b/client/test/scf-log.cpp
index a80beb4..c7bdf64 100644
--- a/client/test/scf-log.cpp
+++ b/client/test/scf-log.cpp
@@ -22,8 +22,8 @@
#include <boost/program_options/variables_map.hpp>
#include <boost/program_options/parsers.hpp>
-#include "IceLogger.h"
-#include "logger.h"
+#include <AsteriskSCF/Logger/IceLogger.h>
+#include <AsteriskSCF/logger.h>
using namespace AsteriskSCF::System::Logging;
namespace po = boost::program_options;
diff --git a/client/src/IceLogger.h b/include/AsteriskSCF/Logger/IceLogger.h
similarity index 100%
rename from client/src/IceLogger.h
rename to include/AsteriskSCF/Logger/IceLogger.h
diff --git a/common/Level.h b/include/AsteriskSCF/Logger/Level.h
similarity index 100%
rename from common/Level.h
rename to include/AsteriskSCF/Logger/Level.h
diff --git a/client/src/LogOut.h b/include/AsteriskSCF/Logger/LogOut.h
similarity index 95%
rename from client/src/LogOut.h
rename to include/AsteriskSCF/Logger/LogOut.h
index 1fa9911..482612f 100644
--- a/client/src/LogOut.h
+++ b/include/AsteriskSCF/Logger/LogOut.h
@@ -18,7 +18,7 @@
#include <string>
-#include "System/Logger/LoggerIf.h"
+#include <AsteriskSCF/System/Logger/LoggerIf.h>
namespace AsteriskSCF
{
diff --git a/client/src/logger.h b/include/AsteriskSCF/logger.h
similarity index 98%
rename from client/src/logger.h
rename to include/AsteriskSCF/logger.h
index 03ed7d1..9cabc4c 100644
--- a/client/src/logger.h
+++ b/include/AsteriskSCF/logger.h
@@ -25,9 +25,9 @@
#include <boost/thread/shared_mutex.hpp>
#include <boost/weak_ptr.hpp>
-#include "System/Logger/LoggerIf.h"
-#include "Level.h"
-#include "LogOut.h"
+#include <AsteriskSCF/System/Logger/LoggerIf.h>
+#include <AsteriskSCF/Logger/Level.h>
+#include <AsteriskSCF/Logger/LogOut.h>
namespace AsteriskSCF
{
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 63e6c1e..0826d82 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -8,7 +8,7 @@
asterisk_scf_component_init(logging-service CXX)
-include_directories(../../common)
+include_directories(../../include)
asterisk_scf_component_add_slice(logging-service LoggerIf)
asterisk_scf_component_add_slice(logging-service ServiceLocatorIf)
diff --git a/server/src/ChainedLogOut.h b/server/src/ChainedLogOut.h
index 931895b..eb5cedc 100644
--- a/server/src/ChainedLogOut.h
+++ b/server/src/ChainedLogOut.h
@@ -20,7 +20,7 @@
#include <boost/shared_ptr.hpp>
-#include "Level.h"
+#include <AsteriskSCF/Logger/Level.h>
namespace AsteriskSCF
{
diff --git a/server/src/LoggingServer.cpp b/server/src/LoggingServer.cpp
index 9ffd9eb..43428aa 100644
--- a/server/src/LoggingServer.cpp
+++ b/server/src/LoggingServer.cpp
@@ -16,8 +16,9 @@
#include <iomanip>
+#include <AsteriskSCF/Logger/Level.h>
+
#include "LoggingServer.h"
-#include "Level.h"
using namespace AsteriskSCF::System::Logging;
diff --git a/server/src/LoggingServer.h b/server/src/LoggingServer.h
index 2e81a12..a557a05 100644
--- a/server/src/LoggingServer.h
+++ b/server/src/LoggingServer.h
@@ -22,7 +22,7 @@
#include <Ice/Properties.h>
-#include "LoggerIf.h"
+#include <AsteriskSCF/System/Logger/LoggerIf.h>
#include "ChainedLogOut.h"
namespace AsteriskSCF
diff --git a/server/src/main.cpp b/server/src/main.cpp
index 73edd63..9c5ad35 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -19,7 +19,7 @@
#include <IceBox/IceBox.h>
#include <IceStorm/IceStorm.h>
-#include "Core/Discovery/ServiceLocatorIf.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include "LoggingServer.h"
#include "FileChainedLogOut.h"
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index 62a4b9d..a7e99e9 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -9,7 +9,7 @@
asterisk_scf_component_init(logging-service-test CXX)
include_directories(../src)
-include_directories(../../common)
+include_directories(../../include)
asterisk_scf_component_add_slice(logging-service-test LoggerIf)
-----------------------------------------------------------------------
--
asterisk-scf/release/logger.git
More information about the asterisk-scf-commits
mailing list