Merge master codes

Author: xuzhenbao

.asf.yaml

@@ -47,3 +47,15 @@ github:
         require_code_owner_reviews: false
         required_approving_review_count: 0
 
+  # Attempt to make the auto-generated github emails more easily readable in email clients.
+  custom_subjects:
+    new_pr: "[PR] {title} ({repository})"
+    close_pr: "Re: [PR] {title} ({repository})"
+    comment_pr: "Re: [PR] {title} ({repository})"
+    diffcomment: "Re: [PR] {title} ({repository})"
+    merge_pr: "Re: [PR] {title} ({repository})"
+    new_issue: "[I] {title} ({repository})"
+    comment_issue: "Re: [I] {title} ({repository})"
+    close_issue: "Re: [I] {title} ({repository})"
+    catchall: "[GH] {title} ({repository})"
+

CMakeLists.txt

@@ -196,6 +196,9 @@ include(CheckLinkerFlag)
 check_linker_flag(CXX LINKER:--wrap,celix_nonexistent_symbol LINKER_WRAP_SUPPORTED)
 cmake_pop_check_state()
 
+#Add generate_export_header to cmake
+include(GenerateExportHeader)
+
 #Libraries and Launcher
 add_subdirectory(libs)
 

bundles/deployment_admin/CMakeLists.txt

@@ -48,6 +48,7 @@ if (DEPLOYMENT_ADMIN)
     target_compile_definitions(deployment_admin PRIVATE -DUSE_FILE32API)
     target_link_libraries(deployment_admin PRIVATE CURL::libcurl libuuid::libuuid ZLIB::ZLIB deployment_admin_api)
     celix_deprecated_utils_headers(deployment_admin)
+    celix_deprecated_framework_headers(deployment_admin)
 
     install(TARGETS deployment_admin_api EXPORT celix COMPONENT deployment_admin
             INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/deployment_admin)

bundles/http_admin/http_admin/src/activator.c

@@ -20,8 +20,7 @@
 #include <stdlib.h>
 #include <memory.h>
 
-#include "celix_api.h"
-#include "celix_types.h"
+#include "celix_bundle_activator.h"
 #include "http_admin.h"
 #include "websocket_admin.h"
 #include "http_admin/api.h"

bundles/http_admin/http_admin/src/http_admin.c

@@ -28,7 +28,6 @@
 
 #include "civetweb.h"
 
-#include "celix_api.h"
 #include "celix_utils_api.h"
 
 

bundles/http_admin/http_admin/src/websocket_admin.c

@@ -24,12 +24,9 @@
 #include "http_admin/api.h"
 #include "http_admin.h"
 #include "service_tree.h"
-
 #include "civetweb.h"
 
-#include "celix_api.h"
 #include "celix_utils_api.h"
-#include "hash_map.h"
 
 
 struct websocket_admin_manager {
@@ -39,7 +36,6 @@ struct websocket_admin_manager {
 
     service_tree_t sock_svc_tree;
     celix_thread_mutex_t admin_lock;
-
 };
 
 websocket_admin_manager_t *websocketAdmin_create(celix_bundle_context_t *context, struct mg_context *svr_ctx) {

bundles/http_admin/http_admin/src/websocket_admin.h

@@ -27,7 +27,7 @@
 #ifndef CELIX_WEBSOCKET_ADMIN_H
 #define CELIX_WEBSOCKET_ADMIN_H
 
-#include "bundle_context.h"
+#include "celix_bundle_context.h"
 #include "civetweb.h"
 
 typedef struct websocket_admin_manager websocket_admin_manager_t;

bundles/logging/log_helper/CMakeLists.txt

@@ -39,7 +39,9 @@ install(TARGETS log_helper EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMP
 		INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/log_helper)
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/log_helper COMPONENT logging)
 
+celix_target_hide_symbols(log_helper)
 celix_deprecated_utils_headers(log_helper)
+celix_deprecated_framework_headers(log_helper)
 
 add_library(Celix::log_helper ALIAS log_helper)
 

bundles/logging/log_service_v2/CMakeLists.txt

@@ -33,6 +33,7 @@ add_celix_bundle(log_service
 target_include_directories(log_service PRIVATE src)
 target_link_libraries(log_service PRIVATE Celix::log_service_api)
 celix_deprecated_utils_headers(log_service)
+celix_deprecated_framework_headers(log_service)
 install_celix_bundle(log_service EXPORT celix COMPONENT logging)
 
 add_celix_bundle(log_writer_stdout

bundles/logging/log_service_v2/src/deprecated_log_writer_stdout_activator.c

@@ -17,7 +17,7 @@
  *under the License.
  */
 
-#include "celix_api.h"
+#include "celix_bundle_activator.h"
 
 typedef struct deprecated_log_writer_stdout_activator {
     //nop