You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2021/05/06 16:28:03 UTC
[celix] 01/02: Merge branch 'feature/async_update' into
feature/cxx_rsa_update
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/cxx_rsa_update
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 123096bc91f55a988481db89ba8fd01cbcf9c9d6
Merge: 20ad07b ee23f57
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Thu May 6 18:19:21 2021 +0200
Merge branch 'feature/async_update' into feature/cxx_rsa_update
# Conflicts:
# bundles/async_remote_services/admin/src/admin.cc
# libs/framework/gtest/CMakeLists.txt
.github/workflows/celix_etcdlib.yml | 2 +-
.github/workflows/celix_promise.yml | 2 +-
.github/workflows/coverage.yml | 2 +-
.github/workflows/coverity-scan.yml | 2 +-
.github/workflows/ubuntu-nightly.yml | 6 +-
.github/workflows/ubuntu.yml | 6 +-
bundles/pubsub/CMakeLists.txt | 3 +-
bundles/pubsub/pubsub_admin_tcp/v2/CMakeLists.txt | 2 +-
.../v2/src/pubsub_tcp_topic_receiver.c | 1 -
.../pubsub_admin_websocket/{ => v1}/CMakeLists.txt | 0
.../{ => v1}/src/psa_activator.c | 0
.../{ => v1}/src/pubsub_psa_websocket_constants.h | 0
.../{ => v1}/src/pubsub_websocket_admin.c | 0
.../{ => v1}/src/pubsub_websocket_admin.h | 0
.../{ => v1}/src/pubsub_websocket_common.c | 0
.../{ => v1}/src/pubsub_websocket_common.h | 0
.../{ => v1}/src/pubsub_websocket_topic_receiver.c | 0
.../{ => v1}/src/pubsub_websocket_topic_receiver.h | 0
.../{ => v1}/src/pubsub_websocket_topic_sender.c | 0
.../{ => v1}/src/pubsub_websocket_topic_sender.h | 0
.../pubsub_admin_websocket/{ => v2}/CMakeLists.txt | 20 +-
.../{ => v2}/src/psa_activator.c | 6 +-
.../{ => v2}/src/pubsub_psa_websocket_constants.h | 0
.../{ => v2}/src/pubsub_websocket_admin.c | 267 +++++++++++++--------
.../{ => v2}/src/pubsub_websocket_admin.h | 12 +
.../{ => v2}/src/pubsub_websocket_common.c | 0
.../{ => v2}/src/pubsub_websocket_common.h | 0
.../{ => v2}/src/pubsub_websocket_topic_receiver.c | 138 +++++------
.../{ => v2}/src/pubsub_websocket_topic_receiver.h | 6 +-
.../{ => v2}/src/pubsub_websocket_topic_sender.c | 121 +++++-----
.../{ => v2}/src/pubsub_websocket_topic_sender.h | 7 +-
bundles/pubsub/test/CMakeLists.txt | 74 +++++-
libs/framework/gtest/CMakeLists.txt | 20 +-
.../framework/gtest/src/CmpTestBundleActivator.cc | 44 ++--
.../gtest/src/CxxBundleActivatorTestSuite.cc | 55 +++++
libs/framework/include/celix/BundleActivator.h | 6 +-
libs/framework/src/dm_dependency_manager_impl.c | 3 +-
37 files changed, 493 insertions(+), 312 deletions(-)
diff --cc libs/framework/gtest/CMakeLists.txt
index 178735a,d898d72..9880463
--- a/libs/framework/gtest/CMakeLists.txt
+++ b/libs/framework/gtest/CMakeLists.txt
@@@ -43,7 -44,7 +44,8 @@@ add_executable(test_framewor
src/HelloWorldCxxActivator.cc
src/CxxFilterTestSuite.cc
src/CxxFrameworkFactoryTestSuite.cc
+ src/CxxBundleActivatorTestSuite.cc
+ src/CxxUtilsTestSuite.cc
)
target_link_libraries(test_framework Celix::framework CURL::libcurl GTest::gtest GTest::gtest_main)