This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/deprecated_framework_header_without_celix_prefix in repository https://gitbox.apache.org/repos/asf/celix.git
commit 1984a9ebdfcfee5b354bb7ad258b8f67abbe4394 Author: Pepijn Noltes <[email protected]> AuthorDate: Sat Apr 1 16:22:02 2023 +0200 Explicitly use deprecated framework headers when needed. Where it is only a very small change, remove the usage of the deprecated framework headers. --- bundles/deployment_admin/CMakeLists.txt | 1 + bundles/http_admin/http_admin/src/activator.c | 3 +- bundles/http_admin/http_admin/src/http_admin.c | 1 - .../http_admin/http_admin/src/websocket_admin.c | 4 - .../http_admin/http_admin/src/websocket_admin.h | 2 +- bundles/logging/log_helper/CMakeLists.txt | 1 + bundles/logging/log_service_v2/CMakeLists.txt | 1 + .../src/deprecated_log_writer_stdout_activator.c | 2 +- .../examples/pubsub/publisher/CMakeLists.txt | 1 + .../private/include/pubsub_publisher_private.h | 7 +- .../publisher/private/src/ps_pub_activator.c | 6 +- .../publisher/private/src/pubsub_publisher.c | 3 +- .../pubsub/pubsub_websocket/CMakeLists.txt | 1 + .../examples/pubsub/subscriber/CMakeLists.txt | 1 + .../subscriber/private/src/ps_sub_activator.c | 14 ++-- .../pubsub/integration/gtest/loopback_activator.c | 2 +- .../integration/gtest/serializer_activator.cc | 2 +- bundles/pubsub/integration/gtest/sut_activator.c | 2 +- .../integration/gtest/sut_endpoint_activator.c | 2 +- bundles/pubsub/integration/gtest/tst_activator.c | 2 +- .../integration/gtest/tst_endpoint_activator.c | 2 +- bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt | 1 + .../pubsub/pubsub_admin_tcp/src/psa_activator.c | 2 +- .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 1 + .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 1 - bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 1 + .../pubsub/pubsub_admin_websocket/CMakeLists.txt | 1 + bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 1 + .../pubsub/pubsub_admin_zmq/src/psa_activator.c | 2 +- bundles/pubsub/pubsub_discovery/CMakeLists.txt | 1 + .../pubsub_protocol_wire_v1/CMakeLists.txt | 1 + .../pubsub_serializer_avrobin/CMakeLists.txt | 1 + .../PubSubAvrobinSerializationProviderTestSuite.cc | 4 +- .../pubsub/pubsub_serializer_json/CMakeLists.txt | 1 + .../src/ps_json_serializer_activator.c | 2 +- .../src/pubsub_serializer_impl.c | 3 +- bundles/pubsub/pubsub_spi/CMakeLists.txt | 1 + bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 7 +- .../pubsub_topology_manager/src/pstm_activator.c | 5 +- .../src/pubsub_topology_manager.h | 2 - bundles/pubsub/pubsub_utils/CMakeLists.txt | 1 + .../gtest/src/PubSubMatchingTestSuite.cpp | 3 +- .../src/PubSubSerializationProviderTestSuite.cc | 3 +- .../pubsub/pubsub_utils/include/pubsub_matching.h | 1 - bundles/pubsub/pubsub_utils/include/pubsub_utils.h | 1 - .../src/pubsub_serialization_provider.c | 1 + bundles/pubsub/pubsub_utils/src/pubsub_utils.c | 1 + .../discovery_common/CMakeLists.txt | 1 + .../remote_service_admin_dfi/CMakeLists.txt | 1 + .../remote_service_admin_dfi/gtest/CMakeLists.txt | 2 + .../gtest/src/tst_activator.c | 9 ++- .../src/remote_service_admin_activator.c | 2 +- .../rsa_shm/CMakeLists.txt | 2 +- .../rsa_shm/gtest/CMakeLists.txt | 1 + bundles/remote_services/rsa_common/CMakeLists.txt | 1 + .../rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc | 4 +- .../remote_services/rsa_dfi_utils/src/dfi_utils.c | 94 +++++++++------------- .../remote_services/rsa_rpc_json/CMakeLists.txt | 1 + .../gtest/src/RsaJsonRpcActivatorTestSuite.cc | 6 +- .../rsa_rpc_json/gtest/src/RsaJsonRpcTestSuite.cc | 16 ++-- .../rsa_rpc_json/src/rsa_json_rpc_activator.c | 2 +- .../rsa_rpc_json/src/rsa_json_rpc_endpoint_impl.h | 1 - .../rsa_rpc_json/src/rsa_json_rpc_impl.c | 7 +- .../rsa_rpc_json/src/rsa_json_rpc_impl.h | 1 - .../rsa_rpc_json/src/rsa_json_rpc_proxy_impl.h | 1 - .../rsa_rpc_json/src/rsa_request_sender_tracker.c | 3 +- bundles/remote_services/rsa_spi/CMakeLists.txt | 1 - .../topology_manager/CMakeLists.txt | 1 + .../topology_manager/tms_tst/CMakeLists.txt | 1 + .../topology_manager/tms_tst/bundle/CMakeLists.txt | 1 + bundles/shell/remote_shell/CMakeLists.txt | 1 + bundles/shell/remote_shell/src/activator.c | 8 +- bundles/shell/shell/src/c_shell_activator.c | 16 ++-- bundles/shell/shell/src/help_command.c | 7 +- bundles/shell/shell/src/install_command.c | 6 +- bundles/shell/shell/src/query_command.c | 13 +-- bundles/shell/shell_bonjour/CMakeLists.txt | 1 + libs/dependency_manager/CMakeLists.txt | 2 + libs/dependency_manager_cxx/CMakeLists.txt | 1 + libs/framework/CMakeLists.txt | 4 +- libs/framework/gtest/CMakeLists.txt | 1 + .../BundleArchiveWithErrorInjectionTestSuite.cc | 7 +- libs/framework/include/celix_log.h | 1 - 83 files changed, 171 insertions(+), 165 deletions(-) diff --git a/bundles/deployment_admin/CMakeLists.txt b/bundles/deployment_admin/CMakeLists.txt index 370b6b9f..ddc624d7 100644 --- a/bundles/deployment_admin/CMakeLists.txt +++ b/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) diff --git a/bundles/http_admin/http_admin/src/activator.c b/bundles/http_admin/http_admin/src/activator.c index 2db1506c..6821bdd8 100644 --- a/bundles/http_admin/http_admin/src/activator.c +++ b/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" diff --git a/bundles/http_admin/http_admin/src/http_admin.c b/bundles/http_admin/http_admin/src/http_admin.c index b234ad65..b28f7e44 100755 --- a/bundles/http_admin/http_admin/src/http_admin.c +++ b/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" diff --git a/bundles/http_admin/http_admin/src/websocket_admin.c b/bundles/http_admin/http_admin/src/websocket_admin.c index 16327959..25219bd2 100644 --- a/bundles/http_admin/http_admin/src/websocket_admin.c +++ b/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) { diff --git a/bundles/http_admin/http_admin/src/websocket_admin.h b/bundles/http_admin/http_admin/src/websocket_admin.h index ebd4e77b..a364828f 100644 --- a/bundles/http_admin/http_admin/src/websocket_admin.h +++ b/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; diff --git a/bundles/logging/log_helper/CMakeLists.txt b/bundles/logging/log_helper/CMakeLists.txt index 6d17c44e..2014a8e4 100644 --- a/bundles/logging/log_helper/CMakeLists.txt +++ b/bundles/logging/log_helper/CMakeLists.txt @@ -40,6 +40,7 @@ install(TARGETS log_helper EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMP install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/log_helper COMPONENT logging) celix_deprecated_utils_headers(log_helper) +celix_deprecated_framework_headers(log_helper) add_library(Celix::log_helper ALIAS log_helper) diff --git a/bundles/logging/log_service_v2/CMakeLists.txt b/bundles/logging/log_service_v2/CMakeLists.txt index 51a33443..17596fad 100644 --- a/bundles/logging/log_service_v2/CMakeLists.txt +++ b/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 diff --git a/bundles/logging/log_service_v2/src/deprecated_log_writer_stdout_activator.c b/bundles/logging/log_service_v2/src/deprecated_log_writer_stdout_activator.c index 0bfe9b34..a7cbeb4c 100644 --- a/bundles/logging/log_service_v2/src/deprecated_log_writer_stdout_activator.c +++ b/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 diff --git a/bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt b/bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt index 11f042c8..250f64bd 100644 --- a/bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt +++ b/bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt @@ -26,6 +26,7 @@ add_celix_bundle(celix_pubsub_poi_publisher target_link_libraries(celix_pubsub_poi_publisher PRIVATE Celix::framework Celix::pubsub_api) target_include_directories(celix_pubsub_poi_publisher PRIVATE private/include) celix_deprecated_utils_headers(celix_pubsub_poi_publisher) +celix_deprecated_framework_headers(celix_pubsub_poi_publisher) celix_bundle_files(celix_pubsub_poi_publisher ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor diff --git a/bundles/pubsub/examples/pubsub/publisher/private/include/pubsub_publisher_private.h b/bundles/pubsub/examples/pubsub/publisher/private/include/pubsub_publisher_private.h index b8c1c684..12d42272 100644 --- a/bundles/pubsub/examples/pubsub/publisher/private/include/pubsub_publisher_private.h +++ b/bundles/pubsub/examples/pubsub/publisher/private/include/pubsub_publisher_private.h @@ -20,12 +20,13 @@ #ifndef PUBSUB_PUBLISHER_PRIVATE_H_ #define PUBSUB_PUBLISHER_PRIVATE_H_ -#include "celix_api.h" +#include "celix_array_list.h" +#include "hash_map.h" #include <pthread.h> #include "pubsub/publisher.h" struct pubsub_sender { - array_list_pt trackers; + celix_array_list_t* trackers; const char *ident; hash_map_pt tid_map; //service -> tid long bundleId; @@ -40,7 +41,7 @@ struct send_thread_struct { }; typedef struct send_thread_struct send_thread_struct_t; -pubsub_sender_t* publisher_create(array_list_pt trackers, const char* ident,long bundleId); +pubsub_sender_t* publisher_create(celix_array_list_t* trackers, const char* ident,long bundleId); void publisher_start(pubsub_sender_t *client); void publisher_stop(pubsub_sender_t *client); diff --git a/bundles/pubsub/examples/pubsub/publisher/private/src/ps_pub_activator.c b/bundles/pubsub/examples/pubsub/publisher/private/src/ps_pub_activator.c index c87e8e0e..00745e56 100644 --- a/bundles/pubsub/examples/pubsub/publisher/private/src/ps_pub_activator.c +++ b/bundles/pubsub/examples/pubsub/publisher/private/src/ps_pub_activator.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "pubsub/publisher.h" #include "pubsub_publisher_private.h" @@ -34,7 +34,7 @@ static const char * PUB_TOPICS[] = { struct publisherActivator { pubsub_sender_t *client; - array_list_pt trackerList;//List<service_tracker_pt> + celix_array_list_t* trackerList;//List<service_tracker_pt> }; static int pub_start(struct publisherActivator *act, celix_bundle_context_t *ctx) { @@ -82,7 +82,7 @@ static int pub_start(struct publisherActivator *act, celix_bundle_context_t *ctx } static int pub_stop(struct publisherActivator *act, celix_bundle_context_t *ctx) { - for (int i = 0; i < arrayList_size(act->trackerList); i++) { + for (int i = 0; i < celix_arrayList_size(act->trackerList); i++) { long trkId = celix_arrayList_getLong(act->trackerList, i); celix_bundleContext_stopTracker(ctx, trkId); } diff --git a/bundles/pubsub/examples/pubsub/publisher/private/src/pubsub_publisher.c b/bundles/pubsub/examples/pubsub/publisher/private/src/pubsub_publisher.c index 03857dd3..c65146f6 100644 --- a/bundles/pubsub/examples/pubsub/publisher/private/src/pubsub_publisher.c +++ b/bundles/pubsub/examples/pubsub/publisher/private/src/pubsub_publisher.c @@ -29,7 +29,6 @@ #include <pthread.h> #include <unistd.h> -#include "service_tracker.h" #include "celix_threads.h" #include "poi.h" @@ -108,7 +107,7 @@ static void* send_thread(void* arg) { return NULL; } -pubsub_sender_t* publisher_create(array_list_pt trackers,const char* ident,long bundleId) { +pubsub_sender_t* publisher_create(celix_array_list_t* trackers,const char* ident,long bundleId) { pubsub_sender_t *publisher = malloc(sizeof(*publisher)); publisher->trackers = trackers; diff --git a/bundles/pubsub/examples/pubsub/pubsub_websocket/CMakeLists.txt b/bundles/pubsub/examples/pubsub/pubsub_websocket/CMakeLists.txt index 8f2f0d64..8bf54247 100644 --- a/bundles/pubsub/examples/pubsub/pubsub_websocket/CMakeLists.txt +++ b/bundles/pubsub/examples/pubsub/pubsub_websocket/CMakeLists.txt @@ -29,6 +29,7 @@ add_celix_bundle(celix_pubsub_websocket_example target_link_libraries(celix_pubsub_websocket_example PRIVATE Celix::framework Celix::pubsub_api ${CURL_LIBRARIES}) target_include_directories(celix_pubsub_websocket_example PRIVATE private/include) celix_deprecated_utils_headers(celix_pubsub_websocket_example) +celix_deprecated_framework_headers(celix_pubsub_websocket_example) celix_bundle_files(celix_pubsub_websocket_example ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor diff --git a/bundles/pubsub/examples/pubsub/subscriber/CMakeLists.txt b/bundles/pubsub/examples/pubsub/subscriber/CMakeLists.txt index 0fd513c0..1ab0cf7a 100644 --- a/bundles/pubsub/examples/pubsub/subscriber/CMakeLists.txt +++ b/bundles/pubsub/examples/pubsub/subscriber/CMakeLists.txt @@ -26,6 +26,7 @@ add_celix_bundle(celix_pubsub_poi_subscriber target_link_libraries(celix_pubsub_poi_subscriber PRIVATE Celix::framework Celix::pubsub_api) target_include_directories(celix_pubsub_poi_subscriber PRIVATE private/include) celix_deprecated_utils_headers(celix_pubsub_poi_subscriber) +celix_deprecated_framework_headers(celix_pubsub_poi_subscriber) celix_bundle_files(celix_pubsub_poi_subscriber diff --git a/bundles/pubsub/examples/pubsub/subscriber/private/src/ps_sub_activator.c b/bundles/pubsub/examples/pubsub/subscriber/private/src/ps_sub_activator.c index 16193c3e..9d4c344b 100644 --- a/bundles/pubsub/examples/pubsub/subscriber/private/src/ps_sub_activator.c +++ b/bundles/pubsub/examples/pubsub/subscriber/private/src/ps_sub_activator.c @@ -27,7 +27,8 @@ #include <stdlib.h> #include <pubsub/subscriber.h> -#include "bundle_activator.h" +#include "celix_bundle_activator.h" +#include "bundle_context.h" #include "pubsub_subscriber_private.h" @@ -39,14 +40,14 @@ static const char * SUB_TOPICS[] = { }; struct subscriberActivator { - array_list_pt registrationList; //List<service_registration_pt> + celix_array_list_t* registrationList; //List<service_registration_pt> pubsub_subscriber_t *subsvc; }; celix_status_t bundleActivator_create(celix_bundle_context_t *context, void **userData) { struct subscriberActivator * act = calloc(1,sizeof(struct subscriberActivator)); *userData = act; - arrayList_create(&(act->registrationList)); + act->registrationList = celix_arrayList_create(); return CELIX_SUCCESS; } @@ -73,7 +74,7 @@ celix_status_t bundleActivator_start(void * userData, celix_bundle_context_t *co #endif service_registration_pt reg = NULL; bundleContext_registerService(context, PUBSUB_SUBSCRIBER_SERVICE_NAME, subsvc, props, ®); - arrayList_add(act->registrationList,reg); + celix_arrayList_add(act->registrationList,reg); } subscriber_start((pubsub_receiver_t *) act->subsvc->handle); @@ -85,7 +86,7 @@ celix_status_t bundleActivator_stop(void * userData, celix_bundle_context_t *con struct subscriberActivator * act = (struct subscriberActivator *) userData; int i; - for (i = 0; i < arrayList_size(act->registrationList); i++) { + for (i = 0; i < celix_arrayList_size(act->registrationList); i++) { service_registration_pt reg = arrayList_get(act->registrationList, i); serviceRegistration_unregister(reg); @@ -105,8 +106,7 @@ celix_status_t bundleActivator_destroy(void * userData, celix_bundle_context_t * act->subsvc->handle = NULL; free(act->subsvc); act->subsvc = NULL; - - arrayList_destroy(act->registrationList); + celix_arrayList_destroy(act->registrationList); free(act); return CELIX_SUCCESS; diff --git a/bundles/pubsub/integration/gtest/loopback_activator.c b/bundles/pubsub/integration/gtest/loopback_activator.c index 8024fd5c..c718c4a7 100644 --- a/bundles/pubsub/integration/gtest/loopback_activator.c +++ b/bundles/pubsub/integration/gtest/loopback_activator.c @@ -22,7 +22,7 @@ #include "celix_constants.h" #include <unistd.h> -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "pubsub/api.h" #include "msg.h" diff --git a/bundles/pubsub/integration/gtest/serializer_activator.cc b/bundles/pubsub/integration/gtest/serializer_activator.cc index 63f9ee68..f3477b2a 100644 --- a/bundles/pubsub/integration/gtest/serializer_activator.cc +++ b/bundles/pubsub/integration/gtest/serializer_activator.cc @@ -22,7 +22,7 @@ #include <pubsub_message_serialization_service.h> #include <pubsub_constants.h> -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "msg.h" struct activator { diff --git a/bundles/pubsub/integration/gtest/sut_activator.c b/bundles/pubsub/integration/gtest/sut_activator.c index 5a829e7a..27ad18a6 100644 --- a/bundles/pubsub/integration/gtest/sut_activator.c +++ b/bundles/pubsub/integration/gtest/sut_activator.c @@ -22,7 +22,7 @@ #include "celix_constants.h" #include <unistd.h> -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "pubsub/api.h" #include "msg.h" diff --git a/bundles/pubsub/integration/gtest/sut_endpoint_activator.c b/bundles/pubsub/integration/gtest/sut_endpoint_activator.c index 53c75595..3b97ab73 100644 --- a/bundles/pubsub/integration/gtest/sut_endpoint_activator.c +++ b/bundles/pubsub/integration/gtest/sut_endpoint_activator.c @@ -22,7 +22,7 @@ #include "celix_constants.h" #include <unistd.h> -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "pubsub/api.h" #include "msg.h" diff --git a/bundles/pubsub/integration/gtest/tst_activator.c b/bundles/pubsub/integration/gtest/tst_activator.c index 4017326f..4084d5f0 100644 --- a/bundles/pubsub/integration/gtest/tst_activator.c +++ b/bundles/pubsub/integration/gtest/tst_activator.c @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "pubsub/api.h" #include "msg.h" diff --git a/bundles/pubsub/integration/gtest/tst_endpoint_activator.c b/bundles/pubsub/integration/gtest/tst_endpoint_activator.c index 05520ed5..e01a8ea8 100644 --- a/bundles/pubsub/integration/gtest/tst_endpoint_activator.c +++ b/bundles/pubsub/integration/gtest/tst_endpoint_activator.c @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "pubsub/api.h" #include "msg.h" diff --git a/bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt b/bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt index 03a9671b..8bd326a1 100644 --- a/bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt @@ -41,6 +41,7 @@ if (PUBSUB_PSA_TCP) target_link_libraries(celix_pubsub_admin_tcp PRIVATE libuuid::libuuid) endif() celix_deprecated_utils_headers(celix_pubsub_admin_tcp) + celix_deprecated_framework_headers(celix_pubsub_admin_tcp) install_celix_bundle(celix_pubsub_admin_tcp EXPORT celix COMPONENT pubsub) add_library(Celix::celix_pubsub_admin_tcp ALIAS celix_pubsub_admin_tcp) diff --git a/bundles/pubsub/pubsub_admin_tcp/src/psa_activator.c b/bundles/pubsub/pubsub_admin_tcp/src/psa_activator.c index ec3f8530..008cb7ce 100644 --- a/bundles/pubsub/pubsub_admin_tcp/src/psa_activator.c +++ b/bundles/pubsub/pubsub_admin_tcp/src/psa_activator.c @@ -19,7 +19,7 @@ #include <stdlib.h> -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "pubsub_protocol.h" #include "celix_log_helper.h" diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c index 9806991b..b491c101 100644 --- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c +++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c @@ -29,6 +29,7 @@ #include "pubsub_psa_tcp_constants.h" #include "pubsub_tcp_topic_sender.h" #include "pubsub_tcp_topic_receiver.h" +#include "celix_constants.h" #define L_DEBUG(...) \ celix_logHelper_log(psa->log, CELIX_LOG_LEVEL_DEBUG, __VA_ARGS__) diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h index 513a9341..fe8d97a5 100644 --- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h +++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h @@ -23,7 +23,6 @@ #include <pubsub_admin_metrics.h> #include <pubsub_message_serialization_service.h> #include <stdint.h> -#include "celix_api.h" #include "celix_log_helper.h" #include "pubsub_psa_tcp_constants.h" diff --git a/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt b/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt index 5b514bd1..6092f2b7 100644 --- a/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt @@ -38,6 +38,7 @@ if (PUBSUB_PSA_UDP_MC) target_link_libraries(celix_pubsub_admin_udp_multicast PRIVATE Celix::framework Celix::dfi Celix::log_helper Celix::utils Celix::shell_api) target_link_libraries(celix_pubsub_admin_udp_multicast PRIVATE Celix::pubsub_spi Celix::pubsub_utils ) celix_deprecated_utils_headers(celix_pubsub_admin_udp_multicast) + celix_deprecated_framework_headers(celix_pubsub_admin_udp_multicast) install_celix_bundle(celix_pubsub_admin_udp_multicast EXPORT celix COMPONENT pubsub) add_library(Celix::celix_pubsub_admin_udp_multicast ALIAS celix_pubsub_admin_udp_multicast) diff --git a/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt b/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt index c47d13f9..180437e5 100644 --- a/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt @@ -40,6 +40,7 @@ if (PUBSUB_PSA_WS) target_link_libraries(celix_pubsub_admin_websocket PRIVATE Celix::shell_api) target_include_directories(celix_pubsub_admin_websocket PRIVATE src) celix_deprecated_utils_headers(celix_pubsub_admin_websocket) + celix_deprecated_framework_headers(celix_pubsub_admin_websocket) install_celix_bundle(celix_pubsub_admin_websocket EXPORT celix COMPONENT pubsub) add_library(Celix::celix_pubsub_admin_websocket ALIAS celix_pubsub_admin_websocket) diff --git a/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt b/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt index cd870b55..58f2500a 100644 --- a/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt @@ -53,6 +53,7 @@ if (PUBSUB_PSA_ZMQ) target_link_libraries(celix_pubsub_admin_zmq PRIVATE Celix::pubsub_spi Celix::pubsub_utils) target_include_directories(celix_pubsub_admin_zmq PRIVATE src) celix_deprecated_utils_headers(celix_pubsub_admin_zmq) + celix_deprecated_framework_headers(celix_pubsub_admin_zmq) install_celix_bundle(celix_pubsub_admin_zmq EXPORT celix COMPONENT pubsub) add_library(Celix::celix_pubsub_admin_zmq ALIAS celix_pubsub_admin_zmq) endif (PUBSUB_PSA_ZMQ) diff --git a/bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c b/bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c index 7aaee4da..913ad34d 100644 --- a/bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c +++ b/bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <pubsub_message_serialization_service.h> -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "pubsub_protocol.h" #include "celix_log_helper.h" diff --git a/bundles/pubsub/pubsub_discovery/CMakeLists.txt b/bundles/pubsub/pubsub_discovery/CMakeLists.txt index 13a2bac4..daab5b9e 100644 --- a/bundles/pubsub/pubsub_discovery/CMakeLists.txt +++ b/bundles/pubsub/pubsub_discovery/CMakeLists.txt @@ -36,6 +36,7 @@ if (PUBSUB_DISCOVERY_ETCD) ) target_link_libraries(celix_pubsub_discovery_etcd PRIVATE Celix::pubsub_spi Celix::pubsub_utils) celix_deprecated_utils_headers(celix_pubsub_discovery_etcd) + celix_deprecated_framework_headers(celix_pubsub_discovery_etcd) install_celix_bundle(celix_pubsub_discovery_etcd EXPORT celix COMPONENT pubsub) diff --git a/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v1/CMakeLists.txt b/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v1/CMakeLists.txt index b21f8e4b..4050e7f4 100644 --- a/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v1/CMakeLists.txt +++ b/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v1/CMakeLists.txt @@ -34,6 +34,7 @@ target_include_directories(celix_pubsub_protocol_wire_v1 PRIVATE src) target_link_libraries(celix_pubsub_protocol_wire_v1 PRIVATE Celix::pubsub_spi Celix::pubsub_utils) target_link_libraries(celix_pubsub_protocol_wire_v1 PRIVATE celix_wire_protocol_v1_impl) celix_deprecated_utils_headers(celix_pubsub_protocol_wire_v1) +celix_deprecated_framework_headers(celix_pubsub_protocol_wire_v1) install_celix_bundle(celix_pubsub_protocol_wire_v1 EXPORT celix COMPONENT pubsub) diff --git a/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt index 2b183827..fd04b2c1 100644 --- a/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt +++ b/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt @@ -34,6 +34,7 @@ set_target_properties(celix_pubsub_serializer_avrobin PROPERTIES INSTALL_RPATH " target_link_libraries(celix_pubsub_serializer_avrobin PRIVATE Celix::framework Celix::dfi ${JANSSON_LIBRARIES} Celix::log_helper) target_link_libraries(celix_pubsub_serializer_avrobin PRIVATE Celix::pubsub_spi Celix::pubsub_utils ) celix_deprecated_utils_headers(celix_pubsub_serializer_avrobin) +celix_deprecated_framework_headers(celix_pubsub_serializer_avrobin) install_celix_bundle(celix_pubsub_serializer_avrobin EXPORT celix COMPONENT pubsub) diff --git a/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc b/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc index 1ba57a94..937f59fd 100644 --- a/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc +++ b/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc @@ -21,7 +21,9 @@ #include <memory> -#include <celix_api.h> +#include "celix_constants.h" +#include "celix_framework_factory.h" +#include "celix_bundle_context.h" #include "pubsub_message_serialization_service.h" class PubSubAvrobinSerializationProviderTestSuite : public ::testing::Test { diff --git a/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt index b5199086..3738c00d 100644 --- a/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt +++ b/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt @@ -34,6 +34,7 @@ set_target_properties(celix_pubsub_serializer_json PROPERTIES INSTALL_RPATH "$OR target_link_libraries(celix_pubsub_serializer_json PRIVATE Celix::framework Celix::dfi jansson::jansson Celix::log_helper) target_link_libraries(celix_pubsub_serializer_json PRIVATE Celix::pubsub_spi Celix::pubsub_utils) celix_deprecated_utils_headers(celix_pubsub_serializer_json) +celix_deprecated_framework_headers(celix_pubsub_serializer_json) install_celix_bundle(celix_pubsub_serializer_json EXPORT celix COMPONENT pubsub) diff --git a/bundles/pubsub/pubsub_serializer_json/src/ps_json_serializer_activator.c b/bundles/pubsub/pubsub_serializer_json/src/ps_json_serializer_activator.c index 075aaf10..9df8e13f 100644 --- a/bundles/pubsub/pubsub_serializer_json/src/ps_json_serializer_activator.c +++ b/bundles/pubsub/pubsub_serializer_json/src/ps_json_serializer_activator.c @@ -21,7 +21,7 @@ #include <pubsub_constants.h> #include "pubsub_json_serialization_provider.h" -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "pubsub_serializer_impl.h" typedef struct psjs_activator { diff --git a/bundles/pubsub/pubsub_serializer_json/src/pubsub_serializer_impl.c b/bundles/pubsub/pubsub_serializer_json/src/pubsub_serializer_impl.c index 723b3a15..45956335 100644 --- a/bundles/pubsub/pubsub_serializer_json/src/pubsub_serializer_impl.c +++ b/bundles/pubsub/pubsub_serializer_json/src/pubsub_serializer_impl.c @@ -26,10 +26,9 @@ #include "utils.h" #include "hash_map.h" -#include "bundle_context.h" #include "celix_log_helper.h" - +#include "bundle_context.h" #include "json_serializer.h" #include "pubsub_serializer_impl.h" diff --git a/bundles/pubsub/pubsub_spi/CMakeLists.txt b/bundles/pubsub/pubsub_spi/CMakeLists.txt index 588d6840..8b9dc526 100644 --- a/bundles/pubsub/pubsub_spi/CMakeLists.txt +++ b/bundles/pubsub/pubsub_spi/CMakeLists.txt @@ -30,6 +30,7 @@ target_include_directories(pubsub_spi PUBLIC target_link_libraries(pubsub_spi PUBLIC Celix::framework Celix::pubsub_api) target_link_libraries(pubsub_spi PUBLIC Celix::pubsub_utils ) celix_deprecated_utils_headers(pubsub_spi) +celix_deprecated_framework_headers(pubsub_spi) add_library(Celix::pubsub_spi ALIAS pubsub_spi) install(TARGETS pubsub_spi EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT pubsub diff --git a/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c b/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c index 9d1ffe9e..09b4fdf9 100644 --- a/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c +++ b/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c @@ -27,16 +27,14 @@ #include <string.h> #include <stdlib.h> #include <uuid/uuid.h> -#include <celix_api.h> #include <assert.h> #include "celix_errno.h" #include "celix_log.h" - #include "pubsub_endpoint.h" #include "celix_constants.h" - #include "pubsub_utils.h" +#include "celix_bundle_context.h" static void pubsubEndpoint_setFields(celix_properties_t *psEp, const char* fwUUID, const char* scope, const char* topic, const char *pubsubType, const char *adminType, const char *serType, const char *protType, const celix_properties_t *topic_props); @@ -154,8 +152,7 @@ celix_properties_t* pubsubEndpoint_createFromSubscriberSvc(bundle_context_t* ctx celix_properties_t* pubsubEndpoint_createFromPublisherTrackerInfo(bundle_context_t *ctx, long bundleId, const char *filter) { celix_properties_t *ep = celix_properties_create(); - const char* fwUUID=NULL; - bundleContext_getProperty(ctx, OSGI_FRAMEWORK_FRAMEWORK_UUID, &fwUUID); + const char* fwUUID= celix_bundleContext_getProperty(ctx, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); assert(fwUUID != NULL); char* topic = NULL; diff --git a/bundles/pubsub/pubsub_topology_manager/src/pstm_activator.c b/bundles/pubsub/pubsub_topology_manager/src/pstm_activator.c index 3049b8a5..347d6471 100644 --- a/bundles/pubsub/pubsub_topology_manager/src/pstm_activator.c +++ b/bundles/pubsub/pubsub_topology_manager/src/pstm_activator.c @@ -23,11 +23,8 @@ #include <celix_bundle_activator.h> #include <pubsub_admin.h> #include <pubsub_admin_metrics.h> - -#include "celix_api.h" - #include "celix_log_helper.h" - +#include "hash_map.h" #include "pubsub_topology_manager.h" #include "pubsub_listeners.h" diff --git a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.h b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.h index 9cecf6f0..93df5144 100644 --- a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.h +++ b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.h @@ -20,8 +20,6 @@ #ifndef PUBSUB_TOPOLOGY_MANAGER_H_ #define PUBSUB_TOPOLOGY_MANAGER_H_ -#include "service_reference.h" -#include "bundle_context.h" #include "celix_log_helper.h" #include "celix_shell_command.h" #include "celix_bundle_context.h" diff --git a/bundles/pubsub/pubsub_utils/CMakeLists.txt b/bundles/pubsub/pubsub_utils/CMakeLists.txt index d34ba631..91fe2523 100644 --- a/bundles/pubsub/pubsub_utils/CMakeLists.txt +++ b/bundles/pubsub/pubsub_utils/CMakeLists.txt @@ -30,6 +30,7 @@ target_include_directories(pubsub_utils PUBLIC target_link_libraries(pubsub_utils PUBLIC Celix::framework Celix::dfi Celix::pubsub_api Celix::log_helper Celix::shell_api) target_link_libraries(pubsub_utils PRIVATE Celix::pubsub_spi) celix_deprecated_utils_headers(pubsub_utils) +celix_deprecated_framework_headers(pubsub_utils) add_library(Celix::pubsub_utils ALIAS pubsub_utils) diff --git a/bundles/pubsub/pubsub_utils/gtest/src/PubSubMatchingTestSuite.cpp b/bundles/pubsub/pubsub_utils/gtest/src/PubSubMatchingTestSuite.cpp index 10555a31..000a90a4 100644 --- a/bundles/pubsub/pubsub_utils/gtest/src/PubSubMatchingTestSuite.cpp +++ b/bundles/pubsub/pubsub_utils/gtest/src/PubSubMatchingTestSuite.cpp @@ -22,7 +22,8 @@ #include <memory> #include <cstdarg> -#include "celix_api.h" +#include "celix_constants.h" +#include "celix_framework_factory.h" #include "pubsub_message_serialization_service.h" #include "dyn_message.h" #include "pubsub_protocol.h" diff --git a/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationProviderTestSuite.cc b/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationProviderTestSuite.cc index e9ec48d2..a9b3c8c8 100644 --- a/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationProviderTestSuite.cc +++ b/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationProviderTestSuite.cc @@ -21,7 +21,8 @@ #include <memory> -#include "celix_api.h" +#include "celix_framework_factory.h" +#include "celix_constants.h" #include "pubsub_message_serialization_marker.h" #include "pubsub_serialization_provider.h" diff --git a/bundles/pubsub/pubsub_utils/include/pubsub_matching.h b/bundles/pubsub/pubsub_utils/include/pubsub_matching.h index b416d902..0417769a 100644 --- a/bundles/pubsub/pubsub_utils/include/pubsub_matching.h +++ b/bundles/pubsub/pubsub_utils/include/pubsub_matching.h @@ -21,7 +21,6 @@ #define PUBSUB_MATCHING_H_ #include <celix_log_helper.h> -#include "bundle_context.h" #include "celix_array_list.h" #include "celix_bundle_context.h" #ifdef __cplusplus diff --git a/bundles/pubsub/pubsub_utils/include/pubsub_utils.h b/bundles/pubsub/pubsub_utils/include/pubsub_utils.h index a326068c..261f403d 100644 --- a/bundles/pubsub/pubsub_utils/include/pubsub_utils.h +++ b/bundles/pubsub/pubsub_utils/include/pubsub_utils.h @@ -20,7 +20,6 @@ #ifndef PUBSUB_UTILS_H_ #define PUBSUB_UTILS_H_ -#include "bundle_context.h" #include "celix_array_list.h" #include "celix_bundle_context.h" #ifdef __cplusplus diff --git a/bundles/pubsub/pubsub_utils/src/pubsub_serialization_provider.c b/bundles/pubsub/pubsub_utils/src/pubsub_serialization_provider.c index 33f56874..3b33df3e 100644 --- a/bundles/pubsub/pubsub_utils/src/pubsub_serialization_provider.c +++ b/bundles/pubsub/pubsub_utils/src/pubsub_serialization_provider.c @@ -35,6 +35,7 @@ #include "celix_log_helper.h" #include "pubsub_message_serialization_service.h" #include "celix_shell_command.h" +#include "celix_threads.h" #define MAX_PATH_LEN 1024 diff --git a/bundles/pubsub/pubsub_utils/src/pubsub_utils.c b/bundles/pubsub/pubsub_utils/src/pubsub_utils.c index a5029399..2ec9bfb7 100644 --- a/bundles/pubsub/pubsub_utils/src/pubsub_utils.c +++ b/bundles/pubsub/pubsub_utils/src/pubsub_utils.c @@ -26,6 +26,7 @@ #include "pubsub/publisher.h" #include "pubsub_utils.h" +#include "bundle_context.h" #include "array_list.h" #include "celix_bundle.h" diff --git a/bundles/remote_services/discovery_common/CMakeLists.txt b/bundles/remote_services/discovery_common/CMakeLists.txt index ee6c0eb0..eacd835a 100644 --- a/bundles/remote_services/discovery_common/CMakeLists.txt +++ b/bundles/remote_services/discovery_common/CMakeLists.txt @@ -37,6 +37,7 @@ target_include_directories(rsa_discovery_common PUBLIC ${CURL_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) celix_deprecated_utils_headers(rsa_discovery_common) +celix_deprecated_framework_headers(rsa_discovery_common) target_link_libraries(rsa_discovery_common PUBLIC civetweb::civetweb) #Setup target aliases to match external usage diff --git a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt index fcb8d25e..0fd31de9 100644 --- a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt +++ b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt @@ -44,6 +44,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI) jansson::jansson ) celix_deprecated_utils_headers(rsa_dfi) + celix_deprecated_framework_headers(rsa_dfi) install_celix_bundle(rsa_dfi EXPORT celix COMPONENT rsa) #Setup target aliases to match external usage diff --git a/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt b/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt index 8a9db3ac..4de2a276 100644 --- a/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt +++ b/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt @@ -21,6 +21,7 @@ add_celix_bundle(rsa_dfi_tst_bundle src/tst_activator.c ) celix_deprecated_utils_headers(rsa_dfi_tst_bundle) +celix_deprecated_framework_headers(rsa_dfi_tst_bundle) #add calculator avpr get_target_property(DESCR calculator_api INTERFACE_DESCRIPTOR) @@ -40,6 +41,7 @@ add_executable(test_rsa_dfi ) target_include_directories(test_rsa_dfi PRIVATE src) celix_deprecated_utils_headers(test_rsa_dfi) +celix_deprecated_framework_headers(test_rsa_dfi) target_link_libraries(test_rsa_dfi PRIVATE civetweb::civetweb CURL::libcurl diff --git a/bundles/remote_services/remote_service_admin_dfi/gtest/src/tst_activator.c b/bundles/remote_services/remote_service_admin_dfi/gtest/src/tst_activator.c index 031731f6..a571f1d0 100644 --- a/bundles/remote_services/remote_service_admin_dfi/gtest/src/tst_activator.c +++ b/bundles/remote_services/remote_service_admin_dfi/gtest/src/tst_activator.c @@ -20,13 +20,16 @@ #include <stdlib.h> #include <string.h> #include <time.h> - -#include <celix_api.h> - +#include "celix_threads.h" +#include "celix_bundle_context.h" #include "tst_service.h" #include "calculator_service.h" #include "remote_example.h" #include <unistd.h> +#include "celix_utils.h" +#include "celix_dm_component.h" +#include "dm_dependency_manager.h" +#include "celix_bundle_activator.h" //note exports double diff variable (time in ms) #define TIMED_EXPR(expr) \ diff --git a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_activator.c b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_activator.c index b524b453..0b470da7 100644 --- a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_activator.c +++ b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_activator.c @@ -17,7 +17,7 @@ * under the License. */ -#include "celix_api.h" +#include "celix_bundle_activator.h" #include "remote_service_admin_dfi.h" #include "export_registration_dfi.h" diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/CMakeLists.txt b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/CMakeLists.txt index a5dc771d..bb1f8128 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/CMakeLists.txt +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/CMakeLists.txt @@ -32,7 +32,7 @@ add_celix_bundle(rsa_shm ) celix_deprecated_utils_headers(rsa_shm) - +celix_deprecated_framework_headers(rsa_shm) target_include_directories(rsa_shm PRIVATE src) diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt index ecfc2644..c059a74d 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt @@ -25,6 +25,7 @@ add_executable(test_rsa_shm target_include_directories(test_rsa_shm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src) celix_deprecated_utils_headers(test_rsa_shm) +celix_deprecated_framework_headers(test_rsa_shm) target_link_libraries(test_rsa_shm PRIVATE Celix::c_rsa_spi diff --git a/bundles/remote_services/rsa_common/CMakeLists.txt b/bundles/remote_services/rsa_common/CMakeLists.txt index 436b1a11..72586a65 100644 --- a/bundles/remote_services/rsa_common/CMakeLists.txt +++ b/bundles/remote_services/rsa_common/CMakeLists.txt @@ -24,6 +24,7 @@ set_target_properties(rsa_common PROPERTIES OUTPUT_NAME "celix_rsa_common") target_include_directories(rsa_common PRIVATE src) target_link_libraries(rsa_common PUBLIC Celix::framework Celix::c_rsa_spi Celix::log_helper) celix_deprecated_utils_headers(rsa_common) +celix_deprecated_framework_headers(rsa_common) install(TARGETS rsa_common EXPORT celix COMPONENT rsa DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/bundles/remote_services/rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc b/bundles/remote_services/rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc index 23e057c2..23392c04 100644 --- a/bundles/remote_services/rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc +++ b/bundles/remote_services/rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc @@ -19,11 +19,11 @@ #include <dfi_utils.h> #include <celix_log_helper.h> -#include <celix_api.h> #include <gtest/gtest.h> #include <memory> #include <string> - +#include "celix_constants.h" +#include "celix_framework_factory.h" class DfiUtilsTestSuite : public ::testing::Test { public: diff --git a/bundles/remote_services/rsa_dfi_utils/src/dfi_utils.c b/bundles/remote_services/rsa_dfi_utils/src/dfi_utils.c index fcbd8f7a..01487666 100644 --- a/bundles/remote_services/rsa_dfi_utils/src/dfi_utils.c +++ b/bundles/remote_services/rsa_dfi_utils/src/dfi_utils.c @@ -20,59 +20,52 @@ #include "dfi_utils.h" #include <stdlib.h> #include <unistd.h> -#include "bundle_context.h" +#include "celix_bundle_context.h" static celix_status_t dfi_findFileForFramework(celix_bundle_context_t *context, const char *fileName, FILE **out) { - celix_status_t status; + celix_status_t status = CELIX_SUCCESS; char pwd[1024]; char path[1024]; - const char *extPath = NULL; - - status = bundleContext_getProperty(context, "CELIX_FRAMEWORK_EXTENDER_PATH", &extPath); - if (status != CELIX_SUCCESS || extPath == NULL) { + const char *extPath = celix_bundleContext_getProperty(context, "CELIX_FRAMEWORK_EXTENDER_PATH", NULL); + if (extPath == NULL) { getcwd(pwd, sizeof(pwd)); extPath = pwd; } snprintf(path, sizeof(path), "%s/%s", extPath, fileName); - if (status == CELIX_SUCCESS) { - FILE *df = fopen(path, "r"); - if (df == NULL) { - status = CELIX_FILE_IO_EXCEPTION; - } else { - *out = df; - } + FILE *df = fopen(path, "r"); + if (df == NULL) { + status = CELIX_FILE_IO_EXCEPTION; + } else { + *out = df; } return status; } static celix_status_t dfi_findFileForBundle(const celix_bundle_t *bundle, const char *fileName, FILE **out) { - celix_status_t status; + celix_status_t status = CELIX_SUCCESS; //Checking if descriptor is in root dir of bundle - char *path = NULL; - status = bundle_getEntry(bundle, fileName, &path); + char *path = celix_bundle_getEntry(bundle, fileName); char metaInfFileName[512]; - if (status != CELIX_SUCCESS || path == NULL) { - free(path); + if (path == NULL) { //Checking if descriptor is in META-INF/descriptors snprintf(metaInfFileName, sizeof(metaInfFileName), "META-INF/descriptors/%s", fileName); - status = bundle_getEntry(bundle, metaInfFileName, &path); + path = celix_bundle_getEntry(bundle, metaInfFileName); } - if (status != CELIX_SUCCESS || path == NULL) { - free(path); + if (path == NULL) { //Checking if descriptor is in META-INF/descriptors/services snprintf(metaInfFileName, sizeof(metaInfFileName), "META-INF/descriptors/services/%s", fileName); - status = bundle_getEntry(bundle, metaInfFileName, &path); + path = celix_bundle_getEntry(bundle, metaInfFileName); } - if (status == CELIX_SUCCESS && path != NULL) { + if (path != NULL) { FILE *df = fopen(path, "r"); if (df == NULL) { status = CELIX_FILE_IO_EXCEPTION; @@ -87,19 +80,17 @@ static celix_status_t dfi_findFileForBundle(const celix_bundle_t *bundle, const } static celix_status_t dfi_findAvprFileForBundle(const celix_bundle_t *bundle, const char* fileName, FILE **out) { - celix_status_t status; - char *path = NULL; - status = bundle_getEntry(bundle, fileName, &path); + celix_status_t status = CELIX_SUCCESS; + char* path = celix_bundle_getEntry(bundle, fileName); char metaInfFileName[512]; - if (status != CELIX_SUCCESS || path == NULL) { - free(path); + if (path == NULL) { snprintf(metaInfFileName, sizeof(metaInfFileName), "META-INF/avpr/%s", fileName); - status = bundle_getEntry(bundle, metaInfFileName, &path); + path = celix_bundle_getEntry(bundle, metaInfFileName); } - if (status == CELIX_SUCCESS && path != NULL) { + if (path != NULL) { FILE *df = fopen(path, "r"); if (df == NULL) { status = CELIX_FILE_IO_EXCEPTION; @@ -114,44 +105,35 @@ static celix_status_t dfi_findAvprFileForBundle(const celix_bundle_t *bundle, co } celix_status_t dfi_findDescriptor(celix_bundle_context_t *context, const celix_bundle_t *bundle, const char *name, FILE **out) { - celix_status_t status; char fileName[128]; - snprintf(fileName, 128, "%s.descriptor", name); + long id = celix_bundle_getId(bundle); - long id; - status = bundle_getBundleId(bundle, &id); - - if (status == CELIX_SUCCESS) { - if (id == 0) { - //framework bundle - status = dfi_findFileForFramework(context, fileName, out); - } else { - //normal bundle - status = dfi_findFileForBundle(bundle, fileName, out); - } + celix_status_t status; + if (id == 0) { + //framework bundle + status = dfi_findFileForFramework(context, fileName, out); + } else { + //normal bundle + status = dfi_findFileForBundle(bundle, fileName, out); } + return status; } celix_status_t dfi_findAvprDescriptor(celix_bundle_context_t *context, const celix_bundle_t *bundle, const char *name, FILE **out) { - celix_status_t status; char fileName[128]; - snprintf(fileName, 128, "%s.avpr", name); + long id = celix_bundle_getId(bundle); - long id; - status = bundle_getBundleId(bundle, &id); - - if (status == CELIX_SUCCESS) { - if (id == 0) { - //framework bundle - status = dfi_findFileForFramework(context, fileName, out); - } else { - //normal bundle - status = dfi_findAvprFileForBundle(bundle, fileName, out); - } + celix_status_t status; + if (id == 0) { + //framework bundle + status = dfi_findFileForFramework(context, fileName, out); + } else { + //normal bundle + status = dfi_findAvprFileForBundle(bundle, fileName, out); } return status; diff --git a/bundles/remote_services/rsa_rpc_json/CMakeLists.txt b/bundles/remote_services/rsa_rpc_json/CMakeLists.txt index 824ac514..1bc2696d 100644 --- a/bundles/remote_services/rsa_rpc_json/CMakeLists.txt +++ b/bundles/remote_services/rsa_rpc_json/CMakeLists.txt @@ -34,6 +34,7 @@ if (RSA_JSON_RPC) ) celix_deprecated_utils_headers(rsa_json_rpc) + celix_deprecated_framework_headers(rsa_json_rpc) target_include_directories(rsa_json_rpc PRIVATE src) target_link_libraries(rsa_json_rpc PRIVATE diff --git a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcActivatorTestSuite.cc b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcActivatorTestSuite.cc index 3f614aad..5f63f799 100644 --- a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcActivatorTestSuite.cc +++ b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcActivatorTestSuite.cc @@ -16,7 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -#include <celix_api.h> + +#include "celix_constants.h" +#include "celix_framework_factory.h" +#include "celix_bundle_context.h" + #include <gtest/gtest.h> #include <rsa_rpc_factory.h> diff --git a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcTestSuite.cc b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcTestSuite.cc index 4632f900..54bf173c 100644 --- a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcTestSuite.cc +++ b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcTestSuite.cc @@ -23,14 +23,16 @@ #include <endpoint_description.h> #include <remote_constants.h> #include <celix_shell_command.h> -#include <celix_api.h> #include <gtest/gtest.h> -#include <stdio.h> -#include <string.h> #include <uuid/uuid.h> #include <jansson.h> #include <sys/uio.h> #include <rsa_rpc_factory.h> +#include "celix_bundle_context.h" +#include "celix_constants.h" +#include "celix_framework_factory.h" +#include "celix_version.h" +#include "celix_utils.h" static celix_status_t rsaJsonRpcTst_sendRequest(void *sendFnHandle, const endpoint_description_t *endpointDesciption, celix_properties_t *metadata, const struct iovec *request, struct iovec *response); @@ -217,11 +219,9 @@ void rsaJsonRpcTestSuite_useEndpointService(void *handle, void *svc, const celix const char *bundleSymName = celix_bundle_getSymbolicName(svcOwner); const char *bundleVer = celix_bundle_getManifestValue(svcOwner, OSGI_FRAMEWORK_BUNDLE_VERSION); - version_pt version = NULL; - celix_status_t status = version_createVersionFromString(bundleVer, &version); - EXPECT_EQ(CELIX_SUCCESS, status); - int major = 0; - (void)version_getMajor(version, &major); + celix_version_t* version = celix_version_createVersionFromString(bundleVer); + EXPECT_NE(version, nullptr); + int major = celix_version_getMajor(version); celix_version_destroy(version); unsigned int serialProtoId = celix_utils_stringHash(bundleSymName) + major; celix_properties_t *metadata = celix_properties_create(); diff --git a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_activator.c b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_activator.c index 15ccd4ab..2a9a39db 100644 --- a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_activator.c +++ b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_activator.c @@ -19,9 +19,9 @@ #include <rsa_json_rpc_impl.h> #include <celix_log_helper.h> -#include <celix_api.h> #include <assert.h> #include <rsa_rpc_factory.h> +#include "celix_bundle_activator.h" typedef struct rsa_json_rpc_activator { diff --git a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_endpoint_impl.h b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_endpoint_impl.h index a8a2226d..96af331a 100644 --- a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_endpoint_impl.h +++ b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_endpoint_impl.h @@ -26,7 +26,6 @@ extern "C" { #include <endpoint_description.h> #include <remote_interceptors_handler.h> #include <celix_log_helper.h> -#include <celix_api.h> #include <stdio.h> #include <sys/uio.h> diff --git a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.c b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.c index 07bab985..4731b12d 100644 --- a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.c +++ b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.c @@ -27,12 +27,15 @@ #include <celix_log_helper.h> #include <dyn_interface.h> #include <version.h> -#include <celix_api.h> -#include <limits.h> +#include <stdlib.h> #include <stdio.h> #include <assert.h> #include <stdbool.h> #include <stddef.h> +#include "celix_threads.h" +#include "celix_constants.h" +#include "celix_utils.h" + struct rsa_json_rpc { celix_bundle_context_t *ctx; diff --git a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.h b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.h index 6ba87a67..3fe1f6a8 100644 --- a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.h +++ b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.h @@ -25,7 +25,6 @@ extern "C" { #endif #include <endpoint_description.h> #include <celix_log_helper.h> -#include <celix_api.h> typedef struct rsa_json_rpc rsa_json_rpc_t; diff --git a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_proxy_impl.h b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_proxy_impl.h index 3dba251a..f1f7ea70 100644 --- a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_proxy_impl.h +++ b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_proxy_impl.h @@ -27,7 +27,6 @@ extern "C" { #include <rsa_request_sender_tracker.h> #include <endpoint_description.h> #include <celix_log_helper.h> -#include <celix_api.h> #include <stdio.h> typedef struct rsa_json_rpc_proxy_factory rsa_json_rpc_proxy_factory_t; diff --git a/bundles/remote_services/rsa_rpc_json/src/rsa_request_sender_tracker.c b/bundles/remote_services/rsa_rpc_json/src/rsa_request_sender_tracker.c index 293bd246..50fae98d 100644 --- a/bundles/remote_services/rsa_rpc_json/src/rsa_request_sender_tracker.c +++ b/bundles/remote_services/rsa_rpc_json/src/rsa_request_sender_tracker.c @@ -21,11 +21,12 @@ #include <rsa_request_sender_service.h> #include <celix_log_helper.h> #include <celix_long_hash_map.h> -#include <celix_api.h> #include <stdlib.h> #include <limits.h> #include <string.h> #include <assert.h> +#include "celix_threads.h" +#include "celix_constants.h" struct rsa_request_sender_tracker { celix_bundle_context_t *ctx; diff --git a/bundles/remote_services/rsa_spi/CMakeLists.txt b/bundles/remote_services/rsa_spi/CMakeLists.txt index 80285123..83999ec7 100644 --- a/bundles/remote_services/rsa_spi/CMakeLists.txt +++ b/bundles/remote_services/rsa_spi/CMakeLists.txt @@ -20,7 +20,6 @@ target_include_directories(c_rsa_spi INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> ) target_link_libraries(c_rsa_spi INTERFACE Celix::framework) - install(TARGETS c_rsa_spi EXPORT celix COMPONENT rsa INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/rsa) install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/rsa COMPONENT rsa) diff --git a/bundles/remote_services/topology_manager/CMakeLists.txt b/bundles/remote_services/topology_manager/CMakeLists.txt index 5b037c32..8541c050 100644 --- a/bundles/remote_services/topology_manager/CMakeLists.txt +++ b/bundles/remote_services/topology_manager/CMakeLists.txt @@ -29,6 +29,7 @@ target_include_directories(rsa_topology_manager PRIVATE src) target_include_directories(rsa_topology_manager PRIVATE include) target_link_libraries(rsa_topology_manager PRIVATE Celix::log_helper Celix::c_rsa_spi) celix_deprecated_utils_headers(rsa_topology_manager) +celix_deprecated_framework_headers(rsa_topology_manager) install_celix_bundle(rsa_topology_manager EXPORT celix COMPONENT rsa) #Setup target aliases to match external usage diff --git a/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt b/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt index 347daab1..64b420ec 100644 --- a/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt +++ b/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt @@ -33,6 +33,7 @@ add_executable(test_tm_scoped tms_tests.cpp ) celix_deprecated_utils_headers(test_tm_scoped) +celix_deprecated_framework_headers(test_tm_scoped) target_include_directories(test_tm_scoped PRIVATE ../src ../include) target_link_libraries(test_tm_scoped PRIVATE Celix::framework diff --git a/bundles/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt b/bundles/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt index 5ea2723d..029e28b0 100644 --- a/bundles/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt +++ b/bundles/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt @@ -32,3 +32,4 @@ celix_bundle_files(topology_manager_test_bundle target_link_libraries(topology_manager_test_bundle PRIVATE Celix::c_rsa_spi calculator_api) celix_deprecated_utils_headers(topology_manager_test_bundle) +celix_deprecated_framework_headers(topology_manager_test_bundle) diff --git a/bundles/shell/remote_shell/CMakeLists.txt b/bundles/shell/remote_shell/CMakeLists.txt index 17648896..99627c97 100644 --- a/bundles/shell/remote_shell/CMakeLists.txt +++ b/bundles/shell/remote_shell/CMakeLists.txt @@ -38,6 +38,7 @@ if (REMOTE_SHELL) target_link_libraries(remote_shell PRIVATE Celix::shell_api) celix_deprecated_utils_headers(remote_shell) + celix_deprecated_framework_headers(remote_shell) install_celix_bundle(remote_shell EXPORT celix COMPONENT remote_shell) #Alias setup to match external usage diff --git a/bundles/shell/remote_shell/src/activator.c b/bundles/shell/remote_shell/src/activator.c index 13a3c1a7..d381ed66 100644 --- a/bundles/shell/remote_shell/src/activator.c +++ b/bundles/shell/remote_shell/src/activator.c @@ -28,8 +28,8 @@ #include <stdlib.h> -#include "bundle_activator.h" -#include "bundle_context.h" +#include "celix_bundle_activator.h" +#include "celix_bundle_context.h" #include "celix_log_helper.h" #include "connection_listener.h" @@ -127,10 +127,8 @@ static int bundleActivator_getMaximumConnections(bundle_instance_pt bi, bundle_c } static int bundleActivator_getProperty(bundle_instance_pt bi, bundle_context_pt context, char* propertyName, int defaultValue) { - const char *strValue = NULL; int value; - - bundleContext_getProperty(context, propertyName, &strValue); + const char* strValue = celix_bundleContext_getProperty(context, propertyName, NULL); if (strValue != NULL) { char* endptr = (char*)strValue; diff --git a/bundles/shell/shell/src/c_shell_activator.c b/bundles/shell/shell/src/c_shell_activator.c index 2376409f..93a9c82a 100644 --- a/bundles/shell/shell/src/c_shell_activator.c +++ b/bundles/shell/shell/src/c_shell_activator.c @@ -22,13 +22,15 @@ #include <string.h> #include "shell_private.h" -#include "bundle_activator.h" +#include "celix_bundle_activator.h" #include "std_commands.h" -#include "service_tracker.h" #include "celix_constants.h" #include "celix_shell_command.h" #include "std_commands.h" +//declaration of bundleArchive_create used for testing +extern celix_status_t bundleArchive_create(celix_framework_t* fw, const char *archiveRoot, long id, const char *location, bundle_archive_pt *bundle_archive); + struct shell_bundle_activator { shell_t *shell; @@ -42,7 +44,7 @@ struct shell_bundle_activator { typedef struct shell_bundle_activator shell_bundle_activator_t; -celix_status_t bundleActivator_create(celix_bundle_context_t* ctx, void **_pptr) { +celix_status_t celix_bundleActivator_create(celix_bundle_context_t* ctx, void **_pptr) { celix_status_t status = CELIX_SUCCESS; shell_bundle_activator_t* activator = NULL; @@ -68,13 +70,13 @@ celix_status_t bundleActivator_create(celix_bundle_context_t* ctx, void **_pptr) if (status != CELIX_SUCCESS) { - bundleActivator_destroy(activator, ctx); + celix_bundleActivator_destroy(activator, ctx); } return status; } -celix_status_t bundleActivator_start(void *activatorData, celix_bundle_context_t* ctx) { +celix_status_t celix_bundleActivator_start(void *activatorData, celix_bundle_context_t* ctx) { celix_status_t status = CELIX_SUCCESS; shell_bundle_activator_t* activator = (shell_bundle_activator_t*) activatorData; @@ -128,7 +130,7 @@ celix_status_t bundleActivator_start(void *activatorData, celix_bundle_context_t return status; } -celix_status_t bundleActivator_stop(void *activatorData, celix_bundle_context_t* ctx) { +celix_status_t celix_bundleActivator_stop(void *activatorData, celix_bundle_context_t* ctx) { celix_status_t status = CELIX_SUCCESS; shell_bundle_activator_t* activator = activatorData; @@ -146,7 +148,7 @@ celix_status_t bundleActivator_stop(void *activatorData, celix_bundle_context_t* return status; } -celix_status_t bundleActivator_destroy(void *activatorData, celix_bundle_context_t* __attribute__((__unused__)) ctx) { +celix_status_t celix_bundleActivator_destroy(void *activatorData, celix_bundle_context_t* __attribute__((__unused__)) ctx) { celix_status_t status = CELIX_SUCCESS; shell_bundle_activator_t* activator = activatorData; diff --git a/bundles/shell/shell/src/help_command.c b/bundles/shell/shell/src/help_command.c index a2ad219e..1339969a 100644 --- a/bundles/shell/shell/src/help_command.c +++ b/bundles/shell/shell/src/help_command.c @@ -21,7 +21,8 @@ #include <string.h> #include <stdint.h> -#include "celix_api.h" +#include "celix_array_list.h" +#include "celix_utils.h" #include "celix_shell.h" #include "std_commands.h" @@ -54,8 +55,8 @@ static void printHelp(void *handle, void *svc) { celix_array_list_t *commands = NULL; shell->getCommands(shell->handle, &commands); - for (i = 0; i < arrayList_size(commands); i++) { - char *name = arrayList_get(commands, i); + for (i = 0; i < celix_arrayList_size(commands); i++) { + char *name = celix_arrayList_get(commands, i); fprintf(out, "%s\n", name); free(name); } diff --git a/bundles/shell/shell/src/install_command.c b/bundles/shell/shell/src/install_command.c index e1656729..9fe4ad00 100644 --- a/bundles/shell/shell/src/install_command.c +++ b/bundles/shell/shell/src/install_command.c @@ -19,7 +19,11 @@ #include <stdlib.h> #include <string.h> -#include "celix_api.h" +#include <stdbool.h> +#include <stdio.h> +#include "celix_bundle_context.h" +#include "celix_utils.h" +#include "celix_framework.h" bool installCommand_execute(void *handle, const char *const_line, FILE *outStream, FILE *errStream) { celix_bundle_context_t *ctx = handle; diff --git a/bundles/shell/shell/src/query_command.c b/bundles/shell/shell/src/query_command.c index 739d3450..ff7f7a8a 100644 --- a/bundles/shell/shell/src/query_command.c +++ b/bundles/shell/shell/src/query_command.c @@ -19,13 +19,12 @@ #include <string.h> #include <stdlib.h> -#include <celix_api.h> #include "celix_shell_constants.h" #include "celix_bundle_context.h" #include "std_commands.h" #include "celix_bundle.h" - +#include "celix_utils.h" struct query_options { @@ -95,12 +94,6 @@ static void queryCommand_callback(void *handle, const celix_bundle_t *bnd) { queryCommand_printBundleHeader(data->sout, bnd, &printBundleCalled); fprintf(data->sout, "|- Provided service '%s' [id = %li]\n", entry->serviceName, entry->serviceId); if (data->opts->verbose) { - const char *cmpUUID = celix_properties_get(entry->serviceProperties, "component.uuid", NULL); - if (cmpUUID != NULL) { - //TODO add context to opts - //TODO add celix_dependencyManager_createInfoForUUID() } - //TODO print component name - } fprintf(data->sout, " |- Is factory: %s\n", entry->factory ? "true" : "false"); fprintf(data->sout, " |- Properties:\n"); const char *key; @@ -234,13 +227,13 @@ bool queryCommand_execute(void *_ptr, const char *command_line_str, FILE *sout, queryCommand_listServices(ctx, &opts, sout, serr); } - for (int i = 0; i < arrayList_size(opts.nameQueries); ++i) { + for (int i = 0; i < celix_arrayList_size(opts.nameQueries); ++i) { char *name = celix_arrayList_get(opts.nameQueries, i); free(name); } celix_arrayList_destroy(opts.nameQueries); - for (int i = 0; i < arrayList_size(opts.filterQueries); ++i) { + for (int i = 0; i < celix_arrayList_size(opts.filterQueries); ++i) { celix_filter_t *filter = celix_arrayList_get(opts.filterQueries, i); celix_filter_destroy(filter); } diff --git a/bundles/shell/shell_bonjour/CMakeLists.txt b/bundles/shell/shell_bonjour/CMakeLists.txt index bd2d1068..b492a14d 100644 --- a/bundles/shell/shell_bonjour/CMakeLists.txt +++ b/bundles/shell/shell_bonjour/CMakeLists.txt @@ -37,6 +37,7 @@ if (SHELL_BONJOUR) private/src/bonjour_shell.c ) celix_deprecated_utils_headers(bonjour_shell) + celix_deprecated_framework_headers(bonjour_shell) add_library(Celix::bonjour_shell ALIAS bonjour_shell) diff --git a/libs/dependency_manager/CMakeLists.txt b/libs/dependency_manager/CMakeLists.txt index 00af213b..8dbc604b 100644 --- a/libs/dependency_manager/CMakeLists.txt +++ b/libs/dependency_manager/CMakeLists.txt @@ -17,6 +17,7 @@ #dummy libaries to ensure backward compatability with projects using the dependency manager libs/shell add_library(dependency_manager_static STATIC src/dm_activator.c) +celix_deprecated_framework_headers(dependency_manager_static) target_include_directories(dependency_manager_static PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/api> ) @@ -27,6 +28,7 @@ else() endif() add_library(dependency_manager_so SHARED src/dm_activator.c) +celix_deprecated_framework_headers(dependency_manager_so) target_include_directories(dependency_manager_so PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/api> ) diff --git a/libs/dependency_manager_cxx/CMakeLists.txt b/libs/dependency_manager_cxx/CMakeLists.txt index 3d29ea95..15fc29df 100644 --- a/libs/dependency_manager_cxx/CMakeLists.txt +++ b/libs/dependency_manager_cxx/CMakeLists.txt @@ -18,6 +18,7 @@ add_library(dependency_manager_cxx_static STATIC src/dm_activator.cc ) +celix_deprecated_framework_headers(dependency_manager_cxx_static) set_target_properties(dependency_manager_cxx_static PROPERTIES OUTPUT_NAME "celix_dependency_manager_cxx_static") target_compile_options(dependency_manager_cxx_static PRIVATE -fPIC) target_compile_options(dependency_manager_cxx_static PRIVATE -Wno-deprecated-declarations) diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt index 8cc42270..bf3a560c 100644 --- a/libs/framework/CMakeLists.txt +++ b/libs/framework/CMakeLists.txt @@ -39,9 +39,7 @@ add_library(framework_obj OBJECT ${SOURCES}) target_include_directories(framework_obj PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> ) -target_include_directories(framework_obj PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include_deprecated> -) +target_include_directories(framework_obj PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include_deprecated) target_compile_options(framework_obj PRIVATE -DUSE_FILE32API) target_compile_options(framework_obj PRIVATE -Wno-deprecated-declarations) #note part of the api is deprecated, ignore this warning on own api target_link_libraries(framework_obj PUBLIC Celix::utils ${CELIX_OPTIONAL_EXTRA_LIBS}) diff --git a/libs/framework/gtest/CMakeLists.txt b/libs/framework/gtest/CMakeLists.txt index 2bbe5f27..0db4e4a1 100644 --- a/libs/framework/gtest/CMakeLists.txt +++ b/libs/framework/gtest/CMakeLists.txt @@ -57,6 +57,7 @@ set(CELIX_FRAMEWORK_TEST_SOURCES add_executable(test_framework ${CELIX_FRAMEWORK_TEST_SOURCES}) target_link_libraries(test_framework PRIVATE Celix::framework CURL::libcurl GTest::gtest GTest::gtest_main) +celix_deprecated_framework_headers(test_framework) #embed bundle in the test_framework executable diff --git a/libs/framework/gtest/src/BundleArchiveWithErrorInjectionTestSuite.cc b/libs/framework/gtest/src/BundleArchiveWithErrorInjectionTestSuite.cc index e2bb9559..238535eb 100644 --- a/libs/framework/gtest/src/BundleArchiveWithErrorInjectionTestSuite.cc +++ b/libs/framework/gtest/src/BundleArchiveWithErrorInjectionTestSuite.cc @@ -26,9 +26,10 @@ #include "celix_utils_ei.h" #include "asprintf_ei.h" -//including private headers, which should only be used for testing -#include "bundle_archive_private.h" -#include "bundle_revision_private.h" +//extern declarations for testing purposes. Note signatures are not correct, but that is not important for the test. +extern "C" celix_status_t bundleArchive_create(void); +extern "C" celix_status_t manifest_create(void); +extern "C" celix_status_t bundleRevision_create(void); class BundleArchiveWithErrorInjectionTestSuite : public ::testing::Test { public: diff --git a/libs/framework/include/celix_log.h b/libs/framework/include/celix_log.h index 80b2fb6b..994a29e1 100644 --- a/libs/framework/include/celix_log.h +++ b/libs/framework/include/celix_log.h @@ -24,7 +24,6 @@ #include "celix_log_level.h" #include "celix_errno.h" -#include "framework_exports.h" #include <stdarg.h> #ifdef __cplusplus
