diff --git a/rc_logging_log4cxx/CMakeLists.txt b/rcl_logging_log4cxx/CMakeLists.txt similarity index 91% rename from rc_logging_log4cxx/CMakeLists.txt rename to rcl_logging_log4cxx/CMakeLists.txt index 2c8d880..9c5cce6 100644 --- a/rc_logging_log4cxx/CMakeLists.txt +++ b/rcl_logging_log4cxx/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(rc_logging_log4cxx) +project(rcl_logging_log4cxx) # Default to C11 if(NOT CMAKE_C_STANDARD) @@ -24,7 +24,7 @@ if(NOT WIN32) endif() set(${PROJECT_NAME}_sources - src/rc_logging_log4cxx/rc_logging_log4cxx.cpp + src/rcl_logging_log4cxx/rcl_logging_log4cxx.cpp ) #set_source_files_properties(${${PROJECT_NAME}_sources} PROPERTIES language "CXX") diff --git a/rc_logging_log4cxx/COLCON_IGNORE b/rcl_logging_log4cxx/COLCON_IGNORE similarity index 100% rename from rc_logging_log4cxx/COLCON_IGNORE rename to rcl_logging_log4cxx/COLCON_IGNORE diff --git a/rc_logging_noop/Doxyfile b/rcl_logging_log4cxx/Doxyfile similarity index 86% rename from rc_logging_noop/Doxyfile rename to rcl_logging_log4cxx/Doxyfile index 0247d4f..96b77ec 100644 --- a/rc_logging_noop/Doxyfile +++ b/rcl_logging_log4cxx/Doxyfile @@ -1,8 +1,8 @@ # All settings not listed here will use the Doxygen default values. -PROJECT_NAME = "rc_external_logging" +PROJECT_NAME = "rcl_external_logging" PROJECT_NUMBER = master -PROJECT_BRIEF = "A shared library implementation of rc_external_logging that utilizes the log4cxx library." +PROJECT_BRIEF = "A shared library implementation of rcl_external_logging that utilizes the log4cxx library." # Use these lines to include the generated logging_macro.h (update install path if needed) #INPUT = README.md ../../../install_isolated/rcutils/include diff --git a/rc_logging_log4cxx/package.xml b/rcl_logging_log4cxx/package.xml similarity index 91% rename from rc_logging_log4cxx/package.xml rename to rcl_logging_log4cxx/package.xml index a961175..decb0af 100644 --- a/rc_logging_log4cxx/package.xml +++ b/rcl_logging_log4cxx/package.xml @@ -1,7 +1,7 @@ - rc_logging_log4cxx + rcl_logging_log4cxx 0.1.0 C API providing common interface to a shared library wrapping 3rd party loggers. Amazon B9 @@ -20,7 +20,7 @@ ament_lint_auto launch_testing - rc_logging_packages + rcl_logging_packages ament_cmake diff --git a/rc_logging_log4cxx/src/rc_logging_log4cxx/rc_logging_log4cxx.cpp b/rcl_logging_log4cxx/src/rcl_logging_log4cxx/rcl_logging_log4cxx.cpp similarity index 94% rename from rc_logging_log4cxx/src/rc_logging_log4cxx/rc_logging_log4cxx.cpp rename to rcl_logging_log4cxx/src/rcl_logging_log4cxx/rcl_logging_log4cxx.cpp index 18fd878..f77403d 100644 --- a/rc_logging_log4cxx/src/rc_logging_log4cxx/rc_logging_log4cxx.cpp +++ b/rcl_logging_log4cxx/src/rcl_logging_log4cxx/rcl_logging_log4cxx.cpp @@ -34,7 +34,7 @@ extern "C" { -typedef int rc_logging_ret_t; +typedef int rcl_logging_ret_t; #define RC_LOGGING_RET_OK (0) #define RC_LOGGING_RET_WARN (1) #define RC_LOGGING_RET_ERROR (2) @@ -85,13 +85,13 @@ static const log4cxx::LevelPtr map_external_log_level_to_library_level(int exter return level; } -rc_logging_ret_t rcl_logging_external_initialize(const char * config_file) +rcl_logging_ret_t rcl_logging_external_initialize(const char * config_file) { log4cxx::File file(config_file); log4cxx::helpers::Pool pool; bool config_file_provided = (nullptr != config_file) && (config_file[0] != '\0'); bool use_default_config = !config_file_provided; - rc_logging_ret_t status = RC_LOGGING_RET_OK; + rcl_logging_ret_t status = RC_LOGGING_RET_OK; if (config_file_provided && !file.exists(pool)) { // The provided config file doesn't exist, fall back to using default configuration @@ -122,7 +122,7 @@ rc_logging_ret_t rcl_logging_external_initialize(const char * config_file) return status; } -rc_logging_ret_t rcl_logging_external_shutdown() +rcl_logging_ret_t rcl_logging_external_shutdown() { log4cxx::BasicConfigurator::resetConfiguration(); return RC_LOGGING_RET_OK; @@ -135,7 +135,7 @@ void rcl_logging_external_log(int severity, const char * name, const char * msg) logger->log(level, msg); } -rc_logging_ret_t rcl_logging_external_set_logger_level(const char * name, int level) +rcl_logging_ret_t rcl_logging_external_set_logger_level(const char * name, int level) { log4cxx::LoggerPtr logger(get_logger(name)); logger->setLevel(map_external_log_level_to_library_level(level)); diff --git a/rc_logging_noop/CMakeLists.txt b/rcl_logging_noop/CMakeLists.txt similarity index 93% rename from rc_logging_noop/CMakeLists.txt rename to rcl_logging_noop/CMakeLists.txt index 6d2778b..132a641 100644 --- a/rc_logging_noop/CMakeLists.txt +++ b/rcl_logging_noop/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(rc_logging_noop) +project(rcl_logging_noop) # Default to C11 if(NOT CMAKE_C_STANDARD) @@ -20,7 +20,7 @@ if(NOT WIN32) endif() set(${PROJECT_NAME}_sources - src/rc_logging_noop/rc_logging_noop.cpp + src/rcl_logging_noop/rcl_logging_noop.cpp ) #set_source_files_properties(${${PROJECT_NAME}_sources} PROPERTIES language "CXX") diff --git a/rc_logging_log4cxx/Doxyfile b/rcl_logging_noop/Doxyfile similarity index 86% rename from rc_logging_log4cxx/Doxyfile rename to rcl_logging_noop/Doxyfile index 0247d4f..99fb096 100644 --- a/rc_logging_log4cxx/Doxyfile +++ b/rcl_logging_noop/Doxyfile @@ -1,8 +1,8 @@ # All settings not listed here will use the Doxygen default values. -PROJECT_NAME = "rc_external_logging" +PROJECT_NAME = "rcl_logging_noop" PROJECT_NUMBER = master -PROJECT_BRIEF = "A shared library implementation of rc_external_logging that utilizes the log4cxx library." +PROJECT_BRIEF = "A library implementation of the rcl_logging interface that does nothing." # Use these lines to include the generated logging_macro.h (update install path if needed) #INPUT = README.md ../../../install_isolated/rcutils/include diff --git a/rc_logging_noop/package.xml b/rcl_logging_noop/package.xml similarity index 91% rename from rc_logging_noop/package.xml rename to rcl_logging_noop/package.xml index c2b3a7d..4975744 100644 --- a/rc_logging_noop/package.xml +++ b/rcl_logging_noop/package.xml @@ -1,7 +1,7 @@ - rc_logging_noop + rcl_logging_noop 0.1.0 An rc logger implementation that doesn't do anything with log messages. Amazon B9 @@ -18,7 +18,7 @@ ament_lint_auto launch_testing - rc_logging_packages + rcl_logging_packages ament_cmake diff --git a/rc_logging_noop/src/rc_logging_noop/rc_logging_noop.cpp b/rcl_logging_noop/src/rcl_logging_noop/rcl_logging_noop.cpp similarity index 79% rename from rc_logging_noop/src/rc_logging_noop/rc_logging_noop.cpp rename to rcl_logging_noop/src/rcl_logging_noop/rcl_logging_noop.cpp index 9962490..cef9e69 100644 --- a/rc_logging_noop/src/rc_logging_noop/rc_logging_noop.cpp +++ b/rcl_logging_noop/src/rcl_logging_noop/rcl_logging_noop.cpp @@ -15,16 +15,16 @@ extern "C" { -typedef int rc_logging_ret_t; +typedef int rcl_logging_ret_t; #define RC_LOGGING_RET_OK (0) -rc_logging_ret_t rcl_logging_external_initialize(const char * config_file) +rcl_logging_ret_t rcl_logging_external_initialize(const char * config_file) { (void) config_file; return RC_LOGGING_RET_OK; } -rc_logging_ret_t rcl_logging_external_shutdown() +rcl_logging_ret_t rcl_logging_external_shutdown() { return RC_LOGGING_RET_OK; } @@ -36,7 +36,7 @@ void rcl_logging_external_log(int severity, const char * name, const char * msg) (void) msg; } -rc_logging_ret_t rcl_logging_external_set_logger_level(const char * name, int level) +rcl_logging_ret_t rcl_logging_external_set_logger_level(const char * name, int level) { (void) name; (void) level;