This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a change to branch feature/cxx17_headers
in repository https://gitbox.apache.org/repos/asf/celix.git.
from 82d45eb Small improvements based on pr comments.
add 99865c0 Removes pubsub admin _v1 versions
add f1efeac Removes integration test for pubsub_admin _v1 versions
add 3e6db25 Updates psa target to drop _v2 postfix
add a1d9102 Removes tmp _v2 psa targets
add 8412f3e Merge pull request #371 from
apache/feature/remove_psa_versions_v1
add c070b8a Eliminate unnecessary blocking and mutext from
useServiceWithOptions.
add f6af626 Fix typo in useServiceDoesNotBlockInEventLoop.
add b5ac4a3 Merge pull request #376 from PengZheng/tracker-improvements
add a5904b8 Merge branch 'master' into feature/cxx17_headers
No new revisions were added by this update.
Summary of changes:
.../cxx_remote_services/integration/CMakeLists.txt | 4 +-
.../integration/gtest/CMakeLists.txt | 4 +-
bundles/pubsub/CMakeLists.txt | 14 +-
bundles/pubsub/integration/CMakeLists.txt | 371 +----
.../gtest/PubSubInterceptorTestSuite.cc | 1 +
.../meta_data/deadlock.scope.properties | 2 +-
.../meta_data/deadlock.scope2.properties | 2 +-
.../pubsub/integration/meta_data/ping.properties | 2 +-
.../pubsub_admin_tcp/{v1 => }/CMakeLists.txt | 9 +-
.../pubsub_admin_tcp/{v2 => }/src/psa_activator.c | 0
.../{v2 => }/src/pubsub_psa_tcp_constants.h | 0
.../{v2 => }/src/pubsub_tcp_admin.c | 0
.../{v2 => }/src/pubsub_tcp_admin.h | 0
.../{v2 => }/src/pubsub_tcp_common.c | 0
.../{v2 => }/src/pubsub_tcp_common.h | 0
.../{v2 => }/src/pubsub_tcp_handler.c | 0
.../{v2 => }/src/pubsub_tcp_handler.h | 0
.../{v2 => }/src/pubsub_tcp_topic_receiver.c | 0
.../{v2 => }/src/pubsub_tcp_topic_receiver.h | 0
.../{v2 => }/src/pubsub_tcp_topic_sender.c | 0
.../{v2 => }/src/pubsub_tcp_topic_sender.h | 0
.../pubsub/pubsub_admin_tcp/v1/src/psa_activator.c | 144 --
.../v1/src/pubsub_psa_tcp_constants.h | 140 --
.../pubsub_admin_tcp/v1/src/pubsub_tcp_admin.c | 785 -----------
.../pubsub_admin_tcp/v1/src/pubsub_tcp_admin.h | 80 --
.../pubsub_admin_tcp/v1/src/pubsub_tcp_common.c | 38 -
.../pubsub_admin_tcp/v1/src/pubsub_tcp_common.h | 33 -
.../pubsub_admin_tcp/v1/src/pubsub_tcp_handler.c | 1448 --------------------
.../pubsub_admin_tcp/v1/src/pubsub_tcp_handler.h | 92 --
.../v1/src/pubsub_tcp_topic_receiver.c | 804 -----------
.../v1/src/pubsub_tcp_topic_receiver.h | 57 -
.../v1/src/pubsub_tcp_topic_sender.c | 613 ---------
.../v1/src/pubsub_tcp_topic_sender.h | 60 -
bundles/pubsub/pubsub_admin_tcp/v2/CMakeLists.txt | 44 -
.../pubsub_admin_websocket/{v1 => }/CMakeLists.txt | 15 +-
.../{v2 => }/src/psa_activator.c | 0
.../{v2 => }/src/pubsub_psa_websocket_constants.h | 0
.../{v2 => }/src/pubsub_websocket_admin.c | 0
.../{v2 => }/src/pubsub_websocket_admin.h | 0
.../{v2 => }/src/pubsub_websocket_common.c | 0
.../{v2 => }/src/pubsub_websocket_common.h | 0
.../{v2 => }/src/pubsub_websocket_topic_receiver.c | 2 +-
.../{v2 => }/src/pubsub_websocket_topic_receiver.h | 0
.../{v2 => }/src/pubsub_websocket_topic_sender.c | 0
.../{v2 => }/src/pubsub_websocket_topic_sender.h | 0
.../pubsub_admin_websocket/v1/src/psa_activator.c | 112 --
.../v1/src/pubsub_psa_websocket_constants.h | 54 -
.../v1/src/pubsub_websocket_admin.c | 605 --------
.../v1/src/pubsub_websocket_admin.h | 52 -
.../v1/src/pubsub_websocket_common.c | 68 -
.../v1/src/pubsub_websocket_common.h | 43 -
.../v1/src/pubsub_websocket_topic_receiver.c | 774 -----------
.../v1/src/pubsub_websocket_topic_receiver.h | 47 -
.../v1/src/pubsub_websocket_topic_sender.c | 381 -----
.../v1/src/pubsub_websocket_topic_sender.h | 43 -
.../pubsub_admin_websocket/v2/CMakeLists.txt | 45 -
.../pubsub_admin_zmq/{v1 => }/CMakeLists.txt | 17 +-
.../pubsub_admin_zmq/{v2 => }/src/psa_activator.c | 0
.../{v2 => }/src/pubsub_psa_zmq_constants.h | 0
.../{v2 => }/src/pubsub_zmq_admin.c | 0
.../{v2 => }/src/pubsub_zmq_admin.h | 0
.../{v2 => }/src/pubsub_zmq_topic_receiver.c | 0
.../{v2 => }/src/pubsub_zmq_topic_receiver.h | 0
.../{v2 => }/src/pubsub_zmq_topic_sender.c | 0
.../{v2 => }/src/pubsub_zmq_topic_sender.h | 0
.../pubsub_admin_zmq/{v2 => }/src/zmq_crypto.c | 0
.../pubsub_admin_zmq/{v2 => }/src/zmq_crypto.h | 0
.../pubsub/pubsub_admin_zmq/v1/src/psa_activator.c | 141 --
.../v1/src/pubsub_psa_zmq_constants.h | 112 --
.../pubsub_admin_zmq/v1/src/pubsub_zmq_admin.c | 885 ------------
.../pubsub_admin_zmq/v1/src/pubsub_zmq_admin.h | 57 -
.../v1/src/pubsub_zmq_topic_receiver.c | 855 ------------
.../v1/src/pubsub_zmq_topic_receiver.h | 53 -
.../v1/src/pubsub_zmq_topic_sender.c | 748 ----------
.../v1/src/pubsub_zmq_topic_sender.h | 60 -
.../pubsub/pubsub_admin_zmq/v1/src/zmq_crypto.c | 278 ----
.../pubsub/pubsub_admin_zmq/v1/src/zmq_crypto.h | 41 -
bundles/pubsub/pubsub_admin_zmq/v2/CMakeLists.txt | 58 -
cmake/CelixConfig.cmake | 2 +-
.../gtest/src/bundle_context_services_test.cpp | 40 +-
libs/framework/include/celix_bundle_context.h | 2 +-
libs/framework/src/bundle_context.c | 53 +-
82 files changed, 116 insertions(+), 10274 deletions(-)
rename bundles/pubsub/pubsub_admin_tcp/{v1 => }/CMakeLists.txt (87%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/psa_activator.c (100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/pubsub_psa_tcp_constants.h
(100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/pubsub_tcp_admin.c (100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/pubsub_tcp_admin.h (100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/pubsub_tcp_common.c (100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/pubsub_tcp_common.h (100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/pubsub_tcp_handler.c (100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/pubsub_tcp_handler.h (100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 =>
}/src/pubsub_tcp_topic_receiver.c (100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 =>
}/src/pubsub_tcp_topic_receiver.h (100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/pubsub_tcp_topic_sender.c
(100%)
rename bundles/pubsub/pubsub_admin_tcp/{v2 => }/src/pubsub_tcp_topic_sender.h
(100%)
delete mode 100644 bundles/pubsub/pubsub_admin_tcp/v1/src/psa_activator.c
delete mode 100644
bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_psa_tcp_constants.h
delete mode 100644 bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_admin.c
delete mode 100644 bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_admin.h
delete mode 100644 bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_common.c
delete mode 100644 bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_common.h
delete mode 100644 bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_handler.c
delete mode 100644 bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_handler.h
delete mode 100644
bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_topic_receiver.c
delete mode 100644
bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_topic_receiver.h
delete mode 100644
bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_topic_sender.c
delete mode 100644
bundles/pubsub/pubsub_admin_tcp/v1/src/pubsub_tcp_topic_sender.h
delete mode 100644 bundles/pubsub/pubsub_admin_tcp/v2/CMakeLists.txt
rename bundles/pubsub/pubsub_admin_websocket/{v1 => }/CMakeLists.txt (79%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 => }/src/psa_activator.c
(100%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 =>
}/src/pubsub_psa_websocket_constants.h (100%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 =>
}/src/pubsub_websocket_admin.c (100%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 =>
}/src/pubsub_websocket_admin.h (100%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 =>
}/src/pubsub_websocket_common.c (100%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 =>
}/src/pubsub_websocket_common.h (100%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 =>
}/src/pubsub_websocket_topic_receiver.c (99%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 =>
}/src/pubsub_websocket_topic_receiver.h (100%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 =>
}/src/pubsub_websocket_topic_sender.c (100%)
rename bundles/pubsub/pubsub_admin_websocket/{v2 =>
}/src/pubsub_websocket_topic_sender.h (100%)
delete mode 100644 bundles/pubsub/pubsub_admin_websocket/v1/src/psa_activator.c
delete mode 100644
bundles/pubsub/pubsub_admin_websocket/v1/src/pubsub_psa_websocket_constants.h
delete mode 100644
bundles/pubsub/pubsub_admin_websocket/v1/src/pubsub_websocket_admin.c
delete mode 100644
bundles/pubsub/pubsub_admin_websocket/v1/src/pubsub_websocket_admin.h
delete mode 100644
bundles/pubsub/pubsub_admin_websocket/v1/src/pubsub_websocket_common.c
delete mode 100644
bundles/pubsub/pubsub_admin_websocket/v1/src/pubsub_websocket_common.h
delete mode 100644
bundles/pubsub/pubsub_admin_websocket/v1/src/pubsub_websocket_topic_receiver.c
delete mode 100644
bundles/pubsub/pubsub_admin_websocket/v1/src/pubsub_websocket_topic_receiver.h
delete mode 100644
bundles/pubsub/pubsub_admin_websocket/v1/src/pubsub_websocket_topic_sender.c
delete mode 100644
bundles/pubsub/pubsub_admin_websocket/v1/src/pubsub_websocket_topic_sender.h
delete mode 100644 bundles/pubsub/pubsub_admin_websocket/v2/CMakeLists.txt
rename bundles/pubsub/pubsub_admin_zmq/{v1 => }/CMakeLists.txt (83%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 => }/src/psa_activator.c (100%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 => }/src/pubsub_psa_zmq_constants.h
(100%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 => }/src/pubsub_zmq_admin.c (100%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 => }/src/pubsub_zmq_admin.h (100%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 =>
}/src/pubsub_zmq_topic_receiver.c (100%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 =>
}/src/pubsub_zmq_topic_receiver.h (100%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 => }/src/pubsub_zmq_topic_sender.c
(100%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 => }/src/pubsub_zmq_topic_sender.h
(100%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 => }/src/zmq_crypto.c (100%)
rename bundles/pubsub/pubsub_admin_zmq/{v2 => }/src/zmq_crypto.h (100%)
delete mode 100644 bundles/pubsub/pubsub_admin_zmq/v1/src/psa_activator.c
delete mode 100644
bundles/pubsub/pubsub_admin_zmq/v1/src/pubsub_psa_zmq_constants.h
delete mode 100644 bundles/pubsub/pubsub_admin_zmq/v1/src/pubsub_zmq_admin.c
delete mode 100644 bundles/pubsub/pubsub_admin_zmq/v1/src/pubsub_zmq_admin.h
delete mode 100644
bundles/pubsub/pubsub_admin_zmq/v1/src/pubsub_zmq_topic_receiver.c
delete mode 100644
bundles/pubsub/pubsub_admin_zmq/v1/src/pubsub_zmq_topic_receiver.h
delete mode 100644
bundles/pubsub/pubsub_admin_zmq/v1/src/pubsub_zmq_topic_sender.c
delete mode 100644
bundles/pubsub/pubsub_admin_zmq/v1/src/pubsub_zmq_topic_sender.h
delete mode 100644 bundles/pubsub/pubsub_admin_zmq/v1/src/zmq_crypto.c
delete mode 100644 bundles/pubsub/pubsub_admin_zmq/v1/src/zmq_crypto.h
delete mode 100644 bundles/pubsub/pubsub_admin_zmq/v2/CMakeLists.txt
