[asterisk-scf-commits] asterisk-scf/integration/logger.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Oct 14 18:36:48 CDT 2010
branch "master" has been updated
via e376034d1791e30821dc5f37bd64fd155643d478 (commit)
from ba4a638028ee1ffe7de58862b23e30a740faffda (commit)
Summary of changes:
CMakeLists.txt | 4 +-
client/src/CMakeLists.txt | 32 +++++++++++++-------------
client/src/IceConfigurator.h | 6 ++--
client/src/IceLogger.h | 2 +-
client/src/LogOut.h | 4 +-
client/src/logger.h | 50 +++++++++++++++++++++---------------------
client/test/CMakeLists.txt | 30 ++++++++++++------------
client/test/scf-log.cpp | 2 +-
server/src/CMakeLists.txt | 30 ++++++++++++------------
server/src/LoggingServer.h | 14 ++++++------
server/src/main.cpp | 2 +-
server/test/CMakeLists.txt | 12 +++++-----
12 files changed, 94 insertions(+), 94 deletions(-)
- Log -----------------------------------------------------------------
commit e376034d1791e30821dc5f37bd64fd155643d478
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Oct 14 18:38:13 2010 -0500
Replacing references to project's old internal working name.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca52922..72fbec5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,11 @@ if(NOT integrated_build STREQUAL "true")
# Minimum we require is 2.6, any lower and stuff would fail horribly
cmake_minimum_required(VERSION 2.6)
- # Include common Hydra build infrastructure
+ # Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
# This project is C++ based and requires a minimum of 3.4
- hydra_project("Logger" 3.4 CXX)
+ asterisk_scf_project("Logger" 3.4 CXX)
# Take care of slice definitions
add_subdirectory(slice)
diff --git a/client/src/CMakeLists.txt b/client/src/CMakeLists.txt
index c97df57..74675bd 100644
--- a/client/src/CMakeLists.txt
+++ b/client/src/CMakeLists.txt
@@ -6,25 +6,25 @@
# All rights reserved.
#
-hydra_component_init(logging-client CXX)
+asterisk_scf_component_init(logging-client CXX)
include_directories(../../common)
-hydra_component_add_file(logging-client Logger.cpp)
-hydra_component_add_file(logging-client LoggerFactory.cpp)
-hydra_component_add_file(logging-client LogOut.cpp)
-hydra_component_add_file(logging-client IceConfigurator.cpp)
-hydra_component_add_file(logging-client IceLogger.cpp)
-hydra_component_add_file(logging-client OstreamLogger.cpp)
-hydra_component_add_file(logging-client logger.h)
-hydra_component_add_file(logging-client IceConfigurator.h)
-hydra_component_add_file(logging-client LogOut.h)
+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)
-hydra_component_add_slice(logging-client LoggerIf)
-hydra_component_add_slice(logging-client ServiceLocatorIf)
-hydra_component_add_slice(logging-client ServiceLocatorEventsIf)
+asterisk_scf_component_add_slice(logging-client LoggerIf)
+asterisk_scf_component_add_slice(logging-client ServiceLocatorIf)
+asterisk_scf_component_add_slice(logging-client ServiceLocatorEventsIf)
-hydra_add_boost_libraries(thread)
-hydra_add_ice_libraries(IceStorm)
+asterisk_scf_add_boost_libraries(thread)
+asterisk_scf_add_ice_libraries(IceStorm)
-hydra_component_build_library(logging-client)
+asterisk_scf_component_build_library(logging-client)
diff --git a/client/src/IceConfigurator.h b/client/src/IceConfigurator.h
index 33cb3d3..9eb50d9 100644
--- a/client/src/IceConfigurator.h
+++ b/client/src/IceConfigurator.h
@@ -29,15 +29,15 @@ public:
{
}
- HYDRA_ICEBOX_EXPORT void configured(Configuration const &logConfiguration, Ice::Current const &);
- HYDRA_ICEBOX_EXPORT void configured(Configuration const &logConfiguration);
+ ASTERISK_SCF_ICEBOX_EXPORT void configured(Configuration const &logConfiguration, Ice::Current const &);
+ ASTERISK_SCF_ICEBOX_EXPORT void configured(Configuration const &logConfiguration);
private:
LoggerFactory &mFactory;
};
typedef IceUtil::Handle<IceConfigurator> IceConfiguratorPtr;
-HYDRA_ICEBOX_EXPORT IceConfiguratorPtr createIceConfigurator(Ice::ObjectAdapterPtr adapter,
+ASTERISK_SCF_ICEBOX_EXPORT IceConfiguratorPtr createIceConfigurator(Ice::ObjectAdapterPtr adapter,
LoggerFactory &factory);
} // Logging
diff --git a/client/src/IceLogger.h b/client/src/IceLogger.h
index 5a056a0..49ea64e 100644
--- a/client/src/IceLogger.h
+++ b/client/src/IceLogger.h
@@ -90,7 +90,7 @@ typedef IceUtil::Handle<ConfiguredIceLogger> ConfiguredIceLoggerPtr;
* @param adapter ObjectAdapter to use for listening to the Discovery topic.
* @return Smart pointer to a new ConfiguredIceLogger. Will never return null.
*/
-HYDRA_ICEBOX_EXPORT ConfiguredIceLoggerPtr createIceLogger(
+ASTERISK_SCF_ICEBOX_EXPORT ConfiguredIceLoggerPtr createIceLogger(
Ice::ObjectAdapterPtr adapter);
} // Logging
diff --git a/client/src/LogOut.h b/client/src/LogOut.h
index eca1f11..fc1ecef 100755
--- a/client/src/LogOut.h
+++ b/client/src/LogOut.h
@@ -25,8 +25,8 @@ namespace Logging
class LogOut
{
public:
- HYDRA_ICEBOX_EXPORT virtual ~LogOut();
- HYDRA_ICEBOX_EXPORT virtual void logs(std::string const &name, Level logLevel,
+ ASTERISK_SCF_ICEBOX_EXPORT virtual ~LogOut();
+ ASTERISK_SCF_ICEBOX_EXPORT virtual void logs(std::string const &name, Level logLevel,
std::string const &message) = 0;
};
diff --git a/client/src/logger.h b/client/src/logger.h
index f7a3688..3347416 100755
--- a/client/src/logger.h
+++ b/client/src/logger.h
@@ -31,15 +31,15 @@ namespace Logging
class LogBuf : public std::streambuf
{
public:
- HYDRA_ICEBOX_EXPORT LogBuf(LogOut &out, std::string const &name, Level logLevel);
+ ASTERISK_SCF_ICEBOX_EXPORT LogBuf(LogOut &out, std::string const &name, Level logLevel);
/**
* Copy ctor.
* @param orig Original.
*/
- HYDRA_ICEBOX_EXPORT LogBuf(LogBuf const &orig);
+ ASTERISK_SCF_ICEBOX_EXPORT LogBuf(LogBuf const &orig);
- HYDRA_ICEBOX_EXPORT ~LogBuf();
+ ASTERISK_SCF_ICEBOX_EXPORT ~LogBuf();
protected:
int overflow(int c);
@@ -135,14 +135,14 @@ public:
/**
* Construct a root Logger.
*/
- HYDRA_ICEBOX_EXPORT Logger(std::string const &name, LogOut &out, Level logLevel = Debug);
+ ASTERISK_SCF_ICEBOX_EXPORT Logger(std::string const &name, LogOut &out, Level logLevel = Debug);
/**
* Construct a child Logger.
*/
- HYDRA_ICEBOX_EXPORT Logger(Logger const &parent, std::string const &name);
+ ASTERISK_SCF_ICEBOX_EXPORT Logger(Logger const &parent, std::string const &name);
- HYDRA_ICEBOX_EXPORT ~Logger();
+ ASTERISK_SCF_ICEBOX_EXPORT ~Logger();
/**
* If true, this Logger would log messages of the given Level.
@@ -150,7 +150,7 @@ public:
* @param level Level to check.
* @return true if enabled for given level.
*/
- HYDRA_ICEBOX_EXPORT bool isEnabledFor(Level level) const
+ ASTERISK_SCF_ICEBOX_EXPORT bool isEnabledFor(Level level) const
{
return level >= getEffectiveLevel();
}
@@ -161,58 +161,58 @@ public:
* @param level Level for messages sent to this stream.
* @return LogStream that logs at the given level.
*/
- HYDRA_ICEBOX_EXPORT CondStream operator()(Level level) const;
+ ASTERISK_SCF_ICEBOX_EXPORT CondStream operator()(Level level) const;
/**
* Log a single message.
*/
- HYDRA_ICEBOX_EXPORT void logs(Level level, std::string const &message) const;
+ ASTERISK_SCF_ICEBOX_EXPORT void logs(Level level, std::string const &message) const;
/**
* Log a single printf-formatted message.
*/
- HYDRA_ICEBOX_EXPORT void logf(Level level, char const *fmt, ...) const;
+ ASTERISK_SCF_ICEBOX_EXPORT void logf(Level level, char const *fmt, ...) const;
/**
* Log a single vprintf-formatted message.
*/
- HYDRA_ICEBOX_EXPORT void vlogf(Level level, char const *fmt, va_list ap) const;
+ ASTERISK_SCF_ICEBOX_EXPORT void vlogf(Level level, char const *fmt, va_list ap) const;
Logger const *getParent() const
{
return mParent;
}
- HYDRA_ICEBOX_EXPORT Logger &getChild(std::string const &childName);
- HYDRA_ICEBOX_EXPORT std::vector<Logger const *> getChildren() const;
+ ASTERISK_SCF_ICEBOX_EXPORT Logger &getChild(std::string const &childName);
+ ASTERISK_SCF_ICEBOX_EXPORT std::vector<Logger const *> getChildren() const;
- HYDRA_ICEBOX_EXPORT std::string const &getName() const
+ ASTERISK_SCF_ICEBOX_EXPORT std::string const &getName() const
{
return mName;
}
- HYDRA_ICEBOX_EXPORT LogOut &getOutput() const
+ ASTERISK_SCF_ICEBOX_EXPORT LogOut &getOutput() const
{
return *mOut;
}
- HYDRA_ICEBOX_EXPORT void setOutput(LogOut &out);
+ ASTERISK_SCF_ICEBOX_EXPORT void setOutput(LogOut &out);
/**
* Set's the current logLevel. Until unsetLevel() is called, we are no
* longer affected by changes to our parent's log level.
*/
- HYDRA_ICEBOX_EXPORT void setLevel(Level logLevel);
+ ASTERISK_SCF_ICEBOX_EXPORT void setLevel(Level logLevel);
/**
* Changes our logLevel to now inherit from out parent.
*/
- HYDRA_ICEBOX_EXPORT void unsetLevel();
+ ASTERISK_SCF_ICEBOX_EXPORT void unsetLevel();
/**
* Returns the effective level of this Logger.
*/
- HYDRA_ICEBOX_EXPORT Level getEffectiveLevel() const;
+ ASTERISK_SCF_ICEBOX_EXPORT Level getEffectiveLevel() const;
private:
// non-copyable
@@ -258,7 +258,7 @@ private:
class LoggerFactory
{
public:
- HYDRA_ICEBOX_EXPORT LoggerFactory(LogOut &out);
+ ASTERISK_SCF_ICEBOX_EXPORT LoggerFactory(LogOut &out);
/**
* Will get the Logger with the given name. If the Logger does not exist,
@@ -268,15 +268,15 @@ public:
* @return Ref to the Logger.
* @thread-safe
*/
- HYDRA_ICEBOX_EXPORT Logger &getLogger(std::string const &name);
+ ASTERISK_SCF_ICEBOX_EXPORT Logger &getLogger(std::string const &name);
/**
* Returns a vector of the names of all currently configured Logger's.
* @return Vector of Logger names.
*/
- HYDRA_ICEBOX_EXPORT std::vector<std::string> getLoggerNames() const;
+ ASTERISK_SCF_ICEBOX_EXPORT std::vector<std::string> getLoggerNames() const;
- HYDRA_ICEBOX_EXPORT void setLogOutput(LogOut &out);
+ ASTERISK_SCF_ICEBOX_EXPORT void setLogOutput(LogOut &out);
private:
Logger mRoot;
@@ -284,12 +284,12 @@ private:
static void accumulateLoggerNames(Logger const &logger, std::vector<std::string> &out);
};
-HYDRA_ICEBOX_EXPORT std::auto_ptr<LogOut> buildOstreamLogger(std::ostream &out);
+ASTERISK_SCF_ICEBOX_EXPORT std::auto_ptr<LogOut> buildOstreamLogger(std::ostream &out);
/**
* Returns the default configured LoggerFactory.
*/
-HYDRA_ICEBOX_EXPORT LoggerFactory &getLoggerFactory();
+ASTERISK_SCF_ICEBOX_EXPORT LoggerFactory &getLoggerFactory();
} // Logging
} // System
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index a3b8eda..fc1e634 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -6,37 +6,37 @@
# All rights reserved.
#
-hydra_component_init(logging-client-test CXX)
+asterisk_scf_component_init(logging-client-test CXX)
include_directories(../src)
include_directories(../../common)
-hydra_component_add_file(logging-client-test Logger-test.cpp)
-hydra_component_add_file(logging-client-test LoggerFactory-test.cpp)
-hydra_component_add_file(logging-client-test LogBuf-test.cpp)
-hydra_component_add_file(logging-client-test IceConfigurator-test.cpp)
-hydra_component_add_file(logging-client-test client-test.cpp)
+asterisk_scf_component_add_file(logging-client-test Logger-test.cpp)
+asterisk_scf_component_add_file(logging-client-test LoggerFactory-test.cpp)
+asterisk_scf_component_add_file(logging-client-test LogBuf-test.cpp)
+asterisk_scf_component_add_file(logging-client-test IceConfigurator-test.cpp)
+asterisk_scf_component_add_file(logging-client-test client-test.cpp)
-hydra_component_add_boost_libraries(logging-client-test unit_test_framework)
+asterisk_scf_component_add_boost_libraries(logging-client-test unit_test_framework)
-hydra_component_add_slice(logging-client-test LoggerIf)
-hydra_component_add_slice(logging-client-test ServiceLocatorIf)
+asterisk_scf_component_add_slice(logging-client-test LoggerIf)
+asterisk_scf_component_add_slice(logging-client-test ServiceLocatorIf)
-hydra_component_build_standalone(logging-client-test)
+asterisk_scf_component_build_standalone(logging-client-test)
target_link_libraries(logging-client-test logging-client)
boost_add_test(logging-client-test)
-hydra_component_init(scf-log CXX)
+asterisk_scf_component_init(scf-log CXX)
-hydra_component_add_file(scf-log scf-log.cpp)
-hydra_component_add_slice(scf-log LoggerIf)
+asterisk_scf_component_add_file(scf-log scf-log.cpp)
+asterisk_scf_component_add_slice(scf-log LoggerIf)
# For reasons unknown, adding this library causes duplicate symbol errors
# on Windows. But without it, Mac and Linux fail to compile
if(NOT WIN32)
- hydra_component_add_boost_libraries(scf-log program_options)
+ asterisk_scf_component_add_boost_libraries(scf-log program_options)
endif()
-hydra_component_build_standalone(scf-log)
+asterisk_scf_component_build_standalone(scf-log)
target_link_libraries(scf-log logging-client)
diff --git a/client/test/scf-log.cpp b/client/test/scf-log.cpp
index 29745a6..994cc40 100644
--- a/client/test/scf-log.cpp
+++ b/client/test/scf-log.cpp
@@ -117,7 +117,7 @@ void ScfLogClientApplication::setupDefaultProperties()
setDefaultProperty(*props, "LocatorService.Proxy",
"LocatorService:tcp -p 4411");
setDefaultProperty(*props, "TopicManager.Proxy",
- "HydraIceStorm/TopicManager:default -p 10000");
+ "AsteriskSCFIceStorm/TopicManager:default -p 10000");
}
void ScfLogClientApplication::setDefaultProperty(Ice::Properties &props,
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 2959867..1cf9d8f 100755
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -6,26 +6,26 @@
# All rights reserved.
#
-hydra_component_init(logging-service CXX)
+asterisk_scf_component_init(logging-service CXX)
include_directories(../../common)
-hydra_component_add_slice(logging-service LoggerIf)
-hydra_component_add_slice(logging-service ServiceLocatorIf)
+asterisk_scf_component_add_slice(logging-service LoggerIf)
+asterisk_scf_component_add_slice(logging-service ServiceLocatorIf)
-hydra_component_add_file(logging-service ChainedLogOut.cpp)
-hydra_component_add_file(logging-service FileChainedLogOut.cpp)
-hydra_component_add_file(logging-service LoggingServer.cpp)
-hydra_component_add_file(logging-service OstreamChainedLogOut.cpp)
-hydra_component_add_file(logging-service main.cpp)
+asterisk_scf_component_add_file(logging-service ChainedLogOut.cpp)
+asterisk_scf_component_add_file(logging-service FileChainedLogOut.cpp)
+asterisk_scf_component_add_file(logging-service LoggingServer.cpp)
+asterisk_scf_component_add_file(logging-service OstreamChainedLogOut.cpp)
+asterisk_scf_component_add_file(logging-service main.cpp)
-hydra_component_add_file(logging-service ChainedLogOut.h)
-hydra_component_add_file(logging-service FileChainedLogOut.h)
-hydra_component_add_file(logging-service OstreamChainedLogOut.h)
-hydra_component_add_file(logging-service LoggingServer.h)
+asterisk_scf_component_add_file(logging-service ChainedLogOut.h)
+asterisk_scf_component_add_file(logging-service FileChainedLogOut.h)
+asterisk_scf_component_add_file(logging-service OstreamChainedLogOut.h)
+asterisk_scf_component_add_file(logging-service LoggingServer.h)
-hydra_add_ice_libraries(IceStorm)
+asterisk_scf_add_ice_libraries(IceStorm)
-hydra_component_build_icebox(logging-service)
+asterisk_scf_component_build_icebox(logging-service)
-#hydra_component_install(logging-service RUNTIME bin "Logging Service" System)
+#asterisk_scf_component_install(logging-service RUNTIME bin "Logging Service" System)
diff --git a/server/src/LoggingServer.h b/server/src/LoggingServer.h
index fdc67af..f3c4b9b 100644
--- a/server/src/LoggingServer.h
+++ b/server/src/LoggingServer.h
@@ -54,21 +54,21 @@ private:
class LoggingServerI : public LoggingServer
{
public:
- HYDRA_ICEBOX_EXPORT LoggingServerI();
+ ASTERISK_SCF_ICEBOX_EXPORT LoggingServerI();
- HYDRA_ICEBOX_EXPORT void logs(std::string const &, Level,
+ ASTERISK_SCF_ICEBOX_EXPORT void logs(std::string const &, Level,
const std::string&, const Ice::Current&) const;
Configuration getConfiguration(Ice::Current const &) const
{
return getConfiguration();
}
- HYDRA_ICEBOX_EXPORT Configuration getConfiguration() const;
+ ASTERISK_SCF_ICEBOX_EXPORT Configuration getConfiguration() const;
- HYDRA_ICEBOX_EXPORT bool isEnabledFor(std::string const &name, Level level) const;
- HYDRA_ICEBOX_EXPORT Level getEffectiveLevel(std::string const &name) const;
- HYDRA_ICEBOX_EXPORT void setLevel(std::string const &name, Level level);
+ ASTERISK_SCF_ICEBOX_EXPORT bool isEnabledFor(std::string const &name, Level level) const;
+ ASTERISK_SCF_ICEBOX_EXPORT Level getEffectiveLevel(std::string const &name) const;
+ ASTERISK_SCF_ICEBOX_EXPORT void setLevel(std::string const &name, Level level);
- HYDRA_ICEBOX_EXPORT void configure(std::auto_ptr<ChainedLogOut> out, ServerConfigurationListenerPrx configurationListener, Ice::PropertiesPtr props);
+ ASTERISK_SCF_ICEBOX_EXPORT void configure(std::auto_ptr<ChainedLogOut> out, ServerConfigurationListenerPrx configurationListener, Ice::PropertiesPtr props);
static const std::string LoggingPropertyPrefix;
diff --git a/server/src/main.cpp b/server/src/main.cpp
index 8fb0449..24c3894 100755
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -167,7 +167,7 @@ void LoggingService::stop()
}
}
-extern "C" HYDRA_ICEBOX_EXPORT IceBox::Service* createLoggingService(
+extern "C" ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* createLoggingService(
Ice::CommunicatorPtr communicator)
{
return new LoggingService;
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index 4fe7102..62a4b9d 100755
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -6,19 +6,19 @@
# All rights reserved.
#
-hydra_component_init(logging-service-test CXX)
+asterisk_scf_component_init(logging-service-test CXX)
include_directories(../src)
include_directories(../../common)
-hydra_component_add_slice(logging-service-test LoggerIf)
+asterisk_scf_component_add_slice(logging-service-test LoggerIf)
-hydra_component_add_file(logging-service-test LoggingServer-test.cpp)
-hydra_component_add_file(logging-service-test server-test.cpp)
+asterisk_scf_component_add_file(logging-service-test LoggingServer-test.cpp)
+asterisk_scf_component_add_file(logging-service-test server-test.cpp)
-hydra_component_add_boost_libraries(logging-service-test unit_test_framework)
+asterisk_scf_component_add_boost_libraries(logging-service-test unit_test_framework)
-hydra_component_build_standalone(logging-service-test)
+asterisk_scf_component_build_standalone(logging-service-test)
target_link_libraries(logging-service-test logging-service)
-----------------------------------------------------------------------
--
asterisk-scf/integration/logger.git
More information about the asterisk-scf-commits
mailing list