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 2020/02/10 19:45:12 UTC
[celix] 01/01: Merge branch 'develop' into feature/gh-142-rsa-issues
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/gh-142-rsa-issues
in repository https://gitbox.apache.org/repos/asf/celix.git
commit b20d8e55f33a50d448018258c2befd873bd89f67
Merge: 0e5b514 9c43e3a
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Mon Feb 10 20:43:38 2020 +0100
Merge branch 'develop' into feature/gh-142-rsa-issues
.travis.yml | 60 +-
CMakeLists.txt | 10 +-
bundles/http_admin/http_admin/src/activator.c | 1 -
bundles/http_admin/http_admin/src/service_tree.c | 3 +-
.../http_admin/http_admin/src/websocket_admin.c | 3 +-
bundles/pubsub/examples/CMakeLists.txt | 6 +-
bundles/pubsub/examples/pubsub/CMakeLists.txt | 2 +-
.../examples/pubsub/common/include/poiCmd.h} | 23 +-
.../pubsub/msg_descriptors/msg_poiCmd.descriptor | 8 +
.../poiCmd.properties} | 20 +-
.../CMakeLists.txt | 36 +-
.../private/include/pubsub_websocket_private.h | 97 ++++
.../private/src/ps_websocket_activator.c | 164 ++++++
.../private/src/pubsub_websocket_example.c | 207 +++++++
.../resources/index.html | 20 +
.../resources/script.js | 24 +-
.../pubsub/pubsub_admin_tcp/src/psa_activator.c | 12 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 2 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 2 +-
bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 2 +-
.../pubsub/pubsub_admin_udp_mc/src/psa_activator.c | 12 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c | 5 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h | 2 +-
.../pubsub_admin_websocket/src/psa_activator.c | 12 +-
.../src/pubsub_websocket_admin.c | 36 +-
.../src/pubsub_websocket_admin.h | 2 +-
.../src/pubsub_websocket_topic_receiver.c | 126 +++-
.../src/pubsub_websocket_topic_receiver.h | 5 +-
.../pubsub/pubsub_admin_zmq/src/psa_activator.c | 12 +-
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 2 +-
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.h | 2 +-
.../pubsub/pubsub_discovery/src/psd_activator.c | 12 +-
.../pubsub_discovery/src/pubsub_discovery_impl.c | 4 +-
.../pubsub_discovery/src/pubsub_discovery_impl.h | 2 +-
.../pubsub_topology_manager/src/pstm_activator.c | 10 +-
.../src/pubsub_topology_manager.c | 16 +-
.../src/pubsub_topology_manager.h | 4 +-
.../examples/calculator_shell/src/add_command.c | 1 -
.../src/calculator_shell_activator.c | 33 +-
bundles/shell/remote_shell/src/shell_mediator.c | 9 +-
bundles/shell/remote_shell/src/shell_mediator.h | 4 +-
bundles/shell/shell/CMakeLists.txt | 21 +-
bundles/shell/shell/api/celix_shell.h | 65 +++
bundles/shell/shell/api/celix_shell_command.h | 67 +++
.../shell/shell/api/celix_shell_constants.h | 10 +-
.../shell/{include => deprecated_api}/command.h | 17 +-
.../shell.h} | 29 +-
.../{include => deprecated_api}/shell_constants.h | 6 +-
bundles/shell/shell/include/shell.h | 51 --
bundles/shell/shell/src/activator.c | 269 +++++----
bundles/shell/shell/src/dm_shell_list_command.c | 5 +-
bundles/shell/shell/src/help_command.c | 40 +-
bundles/shell/shell/src/inspect_command.c | 277 ---------
bundles/shell/shell/src/install_command.c | 20 +-
bundles/shell/shell/src/lb_command.c | 56 +-
bundles/shell/shell/src/log_command.c | 7 +-
bundles/shell/shell/src/query_command.c | 253 +++++++++
bundles/shell/shell/src/quit_command.c | 26 +
bundles/shell/shell/src/shell.c | 434 +++++++-------
bundles/shell/shell/src/shell_private.h | 77 ++-
bundles/shell/shell/src/start_command.c | 10 +-
bundles/shell/shell/src/std_commands.h | 21 +-
bundles/shell/shell/src/stop_command.c | 10 +-
bundles/shell/shell/src/uninstall_command.c | 11 +-
bundles/shell/shell/src/update_command.c | 22 +-
.../shell/shell/test}/CMakeLists.txt | 21 +-
.../shell/shell/test/src}/run_tests.cpp | 1 +
bundles/shell/shell/test/src/shell_tests.cpp | 195 +++++++
.../shell/shell_tui/private/include/shell_tui.h | 4 +-
bundles/shell/shell_tui/private/src/activator.c | 43 +-
bundles/shell/shell_tui/private/src/shell_tui.c | 18 +-
.../shell_wui/src/shell_wui_bundle_activator.c | 8 +-
cmake/cmake_celix/BundlePackaging.cmake | 7 +-
cmake/cmake_celix/ContainerPackaging.cmake | 5 +
cmake/cmake_celix/DockerPackaging.cmake | 5 +
.../dm_example_cxx/phase1/src/Phase1Activator.cc | 36 +-
.../dm_example_cxx/phase1/src/Phase1Activator.h | 8 +-
.../dm_example_cxx/phase1/src/Phase1Cmp.cc | 2 +-
.../dm_example_cxx/phase1/src/Phase1Cmp.h | 2 +-
libs/framework/CMakeLists.txt | 8 +-
libs/framework/include/celix_bundle.h | 59 ++
libs/framework/include/celix_bundle_context.h | 32 +-
libs/framework/include/celix_dm_component.h | 2 +
libs/framework/include/celix_framework.h | 58 ++
libs/framework/include/service_registration.h | 4 +
libs/framework/include/service_registry.h | 31 +-
libs/framework/include/service_tracker.h | 10 +-
libs/framework/private/mock/bundle_context_mock.c | 2 +-
libs/framework/private/mock/bundle_mock.c | 26 +
libs/framework/private/mock/framework_mock.c | 59 +-
.../private/mock/service_registration_mock.c | 5 +
.../framework/private/mock/service_registry_mock.c | 25 +
.../private/mock/service_tracker_customizer_mock.c | 3 -
libs/framework/private/mock/service_tracker_stub.c | 3 +-
.../framework/private/test/bundle_context_test.cpp | 10 +-
libs/framework/private/test/bundle_test.cpp | 12 +-
libs/framework/src/bundle.c | 80 ++-
libs/framework/src/bundle_context.c | 96 +---
libs/framework/src/bundle_context_private.h | 4 +-
libs/framework/src/dm_component_impl.c | 60 +-
libs/framework/src/framework.c | 631 ++++++++++++---------
libs/framework/src/framework_private.h | 8 +-
libs/framework/src/service_registration.c | 17 +-
libs/framework/src/service_registry.c | 58 +-
libs/framework/src/service_tracker.c | 92 ++-
libs/framework/src/service_tracker_private.h | 10 +-
libs/framework/{tst => test}/CMakeLists.txt | 3 +
.../{tst => test}/bundle_context_bundles_tests.cpp | 106 +++-
.../{tst => test}/bundle_context_services_test.cpp | 77 +++
libs/framework/{tst => test}/config.properties.in | 0
libs/framework/{tst => test}/dm_tests.cpp | 0
.../{tst => test}/framework1.properties.in | 0
.../{tst => test}/framework2.properties.in | 0
.../{tst => test}/multiple_frameworks_test.cpp | 0
libs/framework/{tst => test}/nop_activator.c | 0
libs/framework/{tst => test}/run_tests.cpp | 1 +
.../{tst => test}/single_framework_test.cpp | 0
libs/framework/{tst => test}/subdir/CMakeLists.txt | 0
libs/framework/{tst => test}/subdir/src/foo.c | 0
libs/utils/CMakeLists.txt | 10 +
libs/utils/include/celix_errno.h | 7 -
libs/utils/include/celix_utils.h | 53 ++
libs/utils/include/celix_utils_api.h | 1 +
libs/utils/include/memstream/open_memstream.h | 2 +
libs/utils/include/version_range.h | 26 +-
libs/utils/private/test/array_list_test.cpp | 1 +
libs/utils/private/test/celix_threads_test.cpp | 1 +
libs/utils/private/test/filter_test.cpp | 1 +
libs/utils/private/test/hash_map_test.cpp | 1 +
libs/utils/private/test/ip_utils_test.cpp | 1 +
libs/utils/private/test/linked_list_test.cpp | 1 +
libs/utils/private/test/properties_test.cpp | 1 +
libs/utils/private/test/thread_pool_test.cpp | 1 +
libs/utils/private/test/utils_test.cpp | 79 ++-
libs/utils/private/test/version_range_test.cpp | 416 ++++++++++----
libs/utils/private/test/version_test.cpp | 11 +-
libs/utils/src/filter.c | 28 +-
libs/utils/src/utils.c | 75 ++-
libs/utils/src/version.c | 8 +-
libs/utils/src/version_range.c | 76 +++
140 files changed, 3840 insertions(+), 1724 deletions(-)