This is an automated email from the ASF dual-hosted git repository. rlenferink pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git
commit 1d02e16012dc094c05a068c4e4bae5f99d77aee1 Merge: 85ef063 f30a2bd Author: Roy Lenferink <[email protected]> AuthorDate: Thu May 7 19:23:55 2020 +0200 Merge branch 'develop' .github/workflows/build.yml | 109 -- .github/workflows/coverage.yml | 49 + .github/workflows/macos.yml | 38 + .github/workflows/ubuntu.yml | 76 + .travis.yml | 116 -- CMakeLists.txt | 33 +- bundles/deployment_admin/CMakeLists.txt | 2 +- bundles/deployment_admin/src/deployment_admin.c | 26 +- bundles/deployment_admin/src/log_sync.c | 8 +- bundles/device_access/CMakeLists.txt | 2 +- bundles/device_access/device_access/CMakeLists.txt | 2 - .../device_access/device_access/src/activator.c | 15 +- .../device_access/src/device_manager.c | 47 +- .../device_access/src/device_manager.h | 4 +- .../device_access/src/driver_matcher.c | 17 +- bundles/device_access/example/CMakeLists.txt | 2 +- .../example/base_driver/src/activator.c | 6 +- .../example/consuming_driver/src/activator.c | 3 +- .../example/refining_driver/CMakeLists.txt | 2 + .../example/refining_driver/src/activator.c | 3 +- .../example/refining_driver/src/refining_driver.c | 4 +- bundles/http_admin/civetweb/CMakeLists.txt | 2 + bundles/http_admin/http_admin/src/activator.c | 1 - bundles/http_admin/http_admin/src/http_admin.c | 19 +- bundles/http_admin/http_admin/src/service_tree.c | 3 +- .../http_admin/http_admin/src/websocket_admin.c | 3 +- bundles/http_admin/test/CMakeLists.txt | 6 +- bundles/logging/CMakeLists.txt | 15 +- bundles/logging/README.md | 53 + .../log_admin}/CMakeLists.txt | 26 +- .../logging/log_admin/gtest}/CMakeLists.txt | 15 +- .../log_admin/gtest/src/LogAdminTestSuite.cc | 446 ++++++ bundles/logging/log_admin/src/celix_log_admin.c | 659 +++++++++ bundles/logging/log_admin/src/celix_log_admin.h | 76 + .../log_admin/src/celix_log_admin_activator.c | 29 +- bundles/logging/log_helper/CMakeLists.txt | 46 + .../logging/log_helper/gtest}/CMakeLists.txt | 12 +- .../log_helper/gtest/src/LogHelperTestSuite.cc | 101 ++ .../logging/log_helper/include/celix_log_helper.h | 114 ++ .../include_v2}/log_helper.h | 0 bundles/logging/log_helper/src/celix_log_helper.c | 169 +++ .../{log_service => log_helper}/src/log_helper.c | 0 bundles/logging/log_service/CMakeLists.txt | 60 - bundles/logging/log_service/README.md | 19 - .../log_service_api}/CMakeLists.txt | 29 +- .../log_service_api/include/celix_log_control.h | 59 + .../log_service_api/include/celix_log_service.h | 118 ++ .../log_service_api/include/celix_log_sink.h | 60 + .../include_v2}/log_entry.h | 0 .../include_v2}/log_listener.h | 0 .../include_v2}/log_reader_service.h | 0 .../include_v2}/log_service.h | 0 .../CMakeLists.txt | 45 +- .../src/deprecated_log_writer_stdout_activator.c | 36 + .../{log_service => log_service_v2}/src/log.c | 2 +- .../{log_service => log_service_v2}/src/log.h | 0 .../src/log_entry.c | 0 .../src/log_factory.c | 0 .../src/log_factory.h | 0 .../src/log_reader_service_impl.c | 0 .../src/log_reader_service_impl.h | 0 .../src/log_service_activator.c | 1 - .../src/log_service_impl.c | 0 .../src/log_service_impl.h | 0 bundles/logging/log_writer/README.md | 13 - .../log_writer/include/celix_log_writer.h | 33 - .../log_writer/src/log_writer_activator.c | 65 - .../log_writer_stdout/src/log_writer_stdout.c | 50 - .../log_writer/log_writer_syslog/CMakeLists.txt | 45 - .../private/src/log_writer_syslog.c | 68 - .../logging/log_writers}/CMakeLists.txt | 6 +- bundles/logging/log_writers/README.md | 11 + .../log_writers/syslog_writer}/CMakeLists.txt | 24 +- .../syslog_writer/gtest}/CMakeLists.txt | 16 +- .../gtest/src/SyslogWriterTestSuite.cc | 100 ++ .../src/celix_syslog_writer_activator.c | 93 ++ bundles/pubsub/CMakeLists.txt | 38 +- bundles/pubsub/README.md | 28 +- bundles/pubsub/examples/CMakeLists.txt | 311 ++-- bundles/pubsub/examples/pubsub/CMakeLists.txt | 5 +- .../pubsub/examples/pubsub/common/include/poiCmd.h | 20 +- .../examples/pubsub/interceptors}/CMakeLists.txt | 16 +- .../include/first_interceptor_private.h | 43 + .../include/second_interceptor_private.h | 36 + .../pubsub/interceptors/src/first_interceptor.c | 73 + .../interceptors/src/ps_interceptor_activator.c | 94 ++ .../pubsub/interceptors/src/second_interceptor.c | 58 + .../pubsub/msg_descriptors/msg_poiCmd.descriptor | 8 + .../pubsub/msg_descriptors/poiCmd.properties} | 23 +- .../publisher/private/src/ps_pub_activator.c | 2 +- .../publisher/private/src/pubsub_publisher.c | 4 +- .../CMakeLists.txt | 36 +- .../private/include/pubsub_websocket_private.h} | 60 +- .../private/src/ps_websocket_activator.c | 164 +++ .../private/src/pubsub_websocket_example.c} | 114 +- .../resources/index.html | 20 + .../resources/script.js | 24 +- .../private/include/pubsub_subscriber_private.h | 2 +- .../subscriber/private/src/pubsub_subscriber.c | 14 +- bundles/pubsub/mock/CMakeLists.txt | 2 +- bundles/pubsub/mock/src/publisher_mock.cc | 4 +- bundles/pubsub/mock/tst/pubsubmock_test.cc | 5 +- bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt | 7 +- .../pubsub/pubsub_admin_tcp/src/psa_activator.c | 45 +- .../src/pubsub_psa_tcp_constants.h | 43 +- .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 412 +++--- .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 42 +- .../pubsub_admin_tcp/src/pubsub_tcp_common.c | 142 -- .../pubsub_admin_tcp/src/pubsub_tcp_common.h | 26 +- .../pubsub_admin_tcp/src/pubsub_tcp_handler.c | 1558 ++++++++++++-------- .../pubsub_admin_tcp/src/pubsub_tcp_handler.h | 78 +- .../pubsub_admin_tcp/src/pubsub_tcp_msg_header.h | 40 - .../src/pubsub_tcp_topic_receiver.c | 398 ++--- .../src/pubsub_tcp_topic_receiver.h | 24 +- .../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 368 ++--- .../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.h | 40 +- bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 4 +- .../pubsub/pubsub_admin_udp_mc/src/psa_activator.c | 22 +- .../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c | 81 +- .../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h | 14 +- .../src/pubsub_udpmc_topic_receiver.c | 106 +- .../src/pubsub_udpmc_topic_receiver.h | 4 +- .../src/pubsub_udpmc_topic_sender.c | 23 +- .../pubsub/pubsub_admin_websocket/CMakeLists.txt | 2 +- .../pubsub_admin_websocket/src/psa_activator.c | 36 +- .../src/pubsub_websocket_admin.c | 130 +- .../src/pubsub_websocket_admin.h | 16 +- .../src/pubsub_websocket_topic_receiver.c | 180 ++- .../src/pubsub_websocket_topic_receiver.h | 11 +- .../src/pubsub_websocket_topic_sender.c | 51 +- .../src/pubsub_websocket_topic_sender.h | 7 +- bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 85 +- .../pubsub/pubsub_admin_zmq/src/psa_activator.c | 38 +- .../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 209 ++- .../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.h | 17 +- .../pubsub_admin_zmq/src/pubsub_zmq_common.c | 132 -- .../pubsub_admin_zmq/src/pubsub_zmq_common.h | 59 - .../src/pubsub_zmq_topic_receiver.c | 282 ++-- .../src/pubsub_zmq_topic_receiver.h | 9 +- .../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 281 ++-- .../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.h | 6 +- bundles/pubsub/pubsub_api/CMakeLists.txt | 1 + .../pubsub/pubsub_api/include/pubsub/publisher.h | 27 +- .../pubsub/pubsub_api/include/pubsub/subscriber.h | 42 +- bundles/pubsub/pubsub_discovery/CMakeLists.txt | 3 +- .../pubsub/pubsub_discovery/src/psd_activator.c | 22 +- .../pubsub_discovery/src/pubsub_discovery_impl.c | 34 +- .../pubsub_discovery/src/pubsub_discovery_impl.h | 8 +- .../pubsub/pubsub_protocol_wire_v1/CMakeLists.txt | 43 + .../pubsub_protocol_wire_v1/gtest}/CMakeLists.txt | 13 +- .../gtest/src/PS_WP_tests.cc | 255 ++++ .../pubsub_protocol_wire_v1/gtest/src/main.cc | 21 +- .../src/ps_wire_protocol_activator.c | 68 + .../src/pubsub_wire_protocol_common.c | 72 + .../src/pubsub_wire_protocol_common.h} | 24 +- .../src/pubsub_wire_protocol_impl.c | 343 +++++ .../src/pubsub_wire_protocol_impl.h | 54 + .../pubsub_serializer_avrobin/CMakeLists.txt | 3 +- .../src/pubsub_avrobin_serializer_impl.c | 94 +- .../src/pubsub_avrobin_serializer_impl.h | 4 +- .../pubsub/pubsub_serializer_json/CMakeLists.txt | 3 +- .../src/pubsub_serializer_impl.c | 102 +- .../src/pubsub_serializer_impl.h | 4 +- bundles/pubsub/pubsub_spi/CMakeLists.txt | 11 +- bundles/pubsub/pubsub_spi/include/pubsub_admin.h | 8 +- .../pubsub/pubsub_spi/include/pubsub_constants.h | 10 +- .../pubsub/pubsub_spi/include/pubsub_endpoint.h | 112 +- .../pubsub/pubsub_spi/include/pubsub_interceptor.h | 47 + .../include/pubsub_interceptors_handler.h | 39 + .../pubsub/pubsub_spi/include/pubsub_protocol.h | 195 +++ .../pubsub/pubsub_spi/include/pubsub_serializer.h | 10 +- bundles/pubsub/pubsub_spi/include/pubsub_utils.h | 171 --- bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 42 +- ...ubsub_utils_match.c => pubsub_endpoint_match.c} | 113 +- .../pubsub_spi/src/pubsub_interceptors_handler.c | 210 +++ .../pubsub/pubsub_topology_manager/CMakeLists.txt | 3 +- .../pubsub_topology_manager/src/pstm_activator.c | 21 +- .../src/pubsub_topology_manager.c | 144 +- .../src/pubsub_topology_manager.h | 11 +- .../{pubsub_spi => pubsub_utils}/CMakeLists.txt | 23 +- bundles/pubsub/pubsub_utils/include/pubsub_utils.h | 71 + .../pubsub/pubsub_utils/include/pubsub_utils_url.h | 53 + .../src/pubsub_utils.c | 49 +- bundles/pubsub/pubsub_utils/src/pubsub_utils_url.c | 344 +++++ bundles/pubsub/test/CMakeLists.txt | 173 ++- bundles/pubsub/test/meta_data/ping.properties | 4 +- bundles/pubsub/test/meta_data/ping2.properties | 2 +- bundles/pubsub/test/meta_data/pong2.properties | 3 +- bundles/pubsub/test/test/loopback_activator.c | 6 +- bundles/pubsub/test/test/sut_activator.c | 5 +- bundles/pubsub/test/test/sut_endpoint_activator.c | 3 +- bundles/pubsub/test/test/test_endpoint_runner.cc | 52 +- bundles/pubsub/test/test/test_runner.cc | 18 +- bundles/pubsub/test/test/tst_activator.c | 4 +- bundles/pubsub/test/test/tst_endpoint_activator.c | 6 +- bundles/remote_services/CMakeLists.txt | 23 +- bundles/remote_services/civetweb/src/civetweb.c | 2 +- .../discovery_common/include/discovery.h | 4 +- .../include/endpoint_discovery_poller.h | 4 +- .../discovery_common/src/discovery.c | 16 +- .../discovery_common/src/discovery_activator.c | 16 +- .../src/endpoint_descriptor_reader.c | 6 +- .../src/endpoint_discovery_poller.c | 14 +- .../src/endpoint_discovery_server.c | 20 +- .../discovery_configured/CMakeLists.txt | 44 +- .../discovery_configured/src/discovery_impl.c | 10 +- .../discovery_configured/src/discovery_impl.h | 2 +- .../remote_services/discovery_etcd/CMakeLists.txt | 61 +- .../discovery_etcd/src/discovery_impl.c | 21 +- .../discovery_etcd/src/discovery_impl.h | 9 +- .../discovery_etcd/src/etcd_watcher.c | 85 +- .../discovery_etcd/src/etcd_watcher.h | 7 - .../remote_services/discovery_shm/CMakeLists.txt | 53 +- .../discovery_shm/src/discovery_impl.c | 7 +- .../discovery_shm/src/discovery_shmWatcher.c | 10 +- bundles/remote_services/examples/CMakeLists.txt | 77 +- .../examples/calculator_api/CMakeLists.txt | 4 +- .../calculator_api/include/calculator_service.h | 17 +- .../org.apache.celix.calc.api.Calculator.avpr | 0 ...org.apache.celix.calc.api.Calculator.descriptor | 0 .../examples/calculator_service/CMakeLists.txt | 2 +- .../calculator_service/src/calculator_activator.c | 88 +- .../calculator_service/src/calculator_impl.c | 37 +- .../calculator_service/src/calculator_impl.h | 14 +- .../examples/calculator_shell/CMakeLists.txt | 2 +- .../examples/calculator_shell/src/add_command.c | 93 +- .../examples/calculator_shell/src/add_command.h | 10 +- .../src/calculator_shell_activator.c | 119 +- ...org.apache.celix.calc.api.Calculator.descriptor | 11 - .../examples/calculator_shell/src/sqrt_command.c | 87 +- .../examples/calculator_shell/src/sqrt_command.h | 10 +- .../examples/calculator_shell/src/sub_command.c | 94 +- .../examples/calculator_shell/src/sub_command.h | 10 +- .../examples/interceptors}/CMakeLists.txt | 14 +- .../include/first_interceptor_private.h | 41 + .../include/second_interceptor_private.h | 37 + .../examples/interceptors/src/first_interceptor.c | 69 + .../interceptors/src/rs_interceptor_activator.c | 94 ++ .../examples/interceptors/src/second_interceptor.c | 60 + .../examples/remote_example_api}/CMakeLists.txt | 16 +- .../remote_example_api/include/remote_example.h | 66 + .../org.apache.celix.RemoteExample.descriptor | 18 + .../remote_example_service}/CMakeLists.txt | 23 +- .../src/remote_example_activator.c | 62 + .../src/remote_example_impl.c | 129 ++ .../src/remote_example_impl.h | 40 + .../remote_service_admin_dfi/CMakeLists.txt | 72 +- .../{test => gtest}/CMakeLists.txt | 30 +- .../{test => gtest}/client.properties.in | 9 +- .../{test => gtest}/config.properties.in | 2 +- .../{test => gtest}/server.properties.in | 10 +- .../remote_service_admin_dfi/gtest/src/main.cc | 21 +- .../gtest/src/rsa_client_server_tests.cc | 190 +++ .../gtest/src/rsa_tests.cc | 211 +++ .../gtest/src/tst_activator.c | 320 ++++ .../{test => gtest}/src/tst_service.h | 10 +- .../src/export_registration_dfi.c | 72 +- .../src/export_registration_dfi.h | 6 +- .../src/import_registration_dfi.c | 40 +- .../src/import_registration_dfi.h | 2 +- .../src/remote_service_admin_dfi.c | 242 ++- .../test/src/rsa_client_server_tests.cpp | 133 -- .../test/src/rsa_tests.cpp | 235 --- .../test/src/tst_activator.c | 162 -- .../remote_service_admin_shm/CMakeLists.txt | 10 +- .../private/src/remote_service_admin_impl.c | 68 +- .../private/test/CMakeLists.txt | 2 +- bundles/remote_services/rsa_common/CMakeLists.txt | 2 +- .../rsa_common/src/endpoint_description.c | 2 +- .../rsa_common/src/export_registration_impl.c | 6 +- .../rsa_common/src/export_registration_impl.h | 6 +- .../rsa_common/src/import_registration_impl.c | 12 +- .../rsa_common/src/import_registration_impl.h | 6 +- .../rsa_common/src/remote_interceptors_handler.c | 206 +++ .../rsa_spi/include/remote_interceptor.h | 37 + .../rsa_spi/include/remote_interceptors_handler.h | 40 + .../topology_manager/CMakeLists.txt | 50 +- .../topology_manager/src/activator.c | 89 +- .../topology_manager/src/topology_manager.c | 205 +-- .../topology_manager/src/topology_manager.h | 8 +- .../topology_manager/tms_tst/CMakeLists.txt | 4 +- .../topology_manager/tms_tst/bundle/CMakeLists.txt | 2 +- .../tms_tst/disc_mock/CMakeLists.txt | 2 +- bundles/shell/remote_shell/CMakeLists.txt | 4 +- bundles/shell/remote_shell/src/activator.c | 14 +- .../shell/remote_shell/src/connection_listener.c | 25 +- bundles/shell/remote_shell/src/remote_shell.c | 7 +- bundles/shell/remote_shell/src/remote_shell.h | 2 +- bundles/shell/remote_shell/src/shell_mediator.c | 20 +- bundles/shell/remote_shell/src/shell_mediator.h | 7 +- bundles/shell/shell/CMakeLists.txt | 22 +- 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 | 22 +- .../shell.h} | 29 +- .../{include => deprecated_api}/shell_constants.h | 6 +- bundles/shell/shell/include/shell.h | 51 - bundles/shell/shell/src/activator.c | 270 ++-- bundles/shell/shell/src/dm_shell_list_command.c | 5 +- bundles/shell/shell/src/help_command.c | 45 +- 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 | 93 -- bundles/shell/shell/src/query_command.c | 253 ++++ .../shell/shell/src/quit_command.c | 21 +- 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 | 20 +- 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}/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 +- .../subdir/CMakeLists.txt => cmake/AddGTest.cmake | 15 +- cmake/Modules/FindFFI.cmake | 32 +- cmake/celix_project/CelixProject.cmake | 23 +- cmake/celix_project/CodeCoverage.cmake | 75 +- cmake/cmake_celix/BundlePackaging.cmake | 7 +- cmake/cmake_celix/ContainerPackaging.cmake | 9 +- cmake/cmake_celix/DockerPackaging.cmake | 76 +- documents/building/README.md | 32 +- .../getting_started/creating_a_simple_bundle.md | 6 +- documents/intro/README.md | 2 +- examples/celix-examples/dm_example/CMakeLists.txt | 4 + .../celix-examples/dm_example_cxx/CMakeLists.txt | 4 +- .../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 +- .../dm_example_cxx/phase2/src/Phase2Cmp.h | 6 +- .../dm_example_cxx/phase2/src/Phase2aActivator.cc | 4 +- .../dm_example_cxx/phase2/src/Phase2aCmp.cc | 12 +- .../dm_example_cxx/phase2/src/Phase2bActivator.cc | 4 +- .../dm_example_cxx/phase2/src/Phase2bCmp.cc | 10 +- .../log_service_example/CMakeLists.txt | 4 +- .../log_service_example/src/activator.c | 22 +- libs/dfi/CMakeLists.txt | 26 +- libs/dfi/gtest/CMakeLists.txt | 42 + .../descriptors/example1.descriptor | 0 .../descriptors/example2.descriptor | 0 .../descriptors/example3.descriptor | 0 .../descriptors/example4.descriptor | 0 .../descriptors/invalids/invalid.descriptor | 0 .../invalids/invalidMetaType.descriptor | 0 .../descriptors/invalids/invalidMethod.descriptor | 0 .../invalids/invalidMethodReturnType.descriptor | 0 .../descriptors/invalids/invalidMsgHdr.descriptor | 0 .../invalids/invalidMsgInvalidName.descriptor | 0 .../invalids/invalidMsgInvalidSection.descriptor | 0 .../invalids/invalidMsgInvalidType.descriptor | 0 .../invalids/invalidMsgInvalidVersion.descriptor | 0 .../invalids/invalidMsgMissingVersion.descriptor | 0 .../descriptors/invalids/invalidSection.descriptor | 0 .../descriptors/invalids/invalidType.descriptor | 0 .../descriptors/invalids/invalidVersion.descriptor | 0 .../descriptors/invalids/noVersion.descriptor | 0 .../descriptors/msg_example1.descriptor | 0 .../descriptors/msg_example2.descriptor | 0 .../descriptors/msg_example3.descriptor | 0 .../descriptors/msg_example4.descriptor | 0 libs/dfi/{test => gtest}/schemas/complex.avdl | 0 libs/dfi/{test => gtest}/schemas/complex.avpr | 0 libs/dfi/{test => gtest}/schemas/invalid1.avpr | 0 libs/dfi/{test => gtest}/schemas/invalid2.avpr | 0 libs/dfi/{test => gtest}/schemas/simple.avdl | 0 libs/dfi/{test => gtest}/schemas/simple.avpr | 0 libs/dfi/{test => gtest}/schemas/simple_min.avpr | 0 .../src}/avro_descriptor_translator_tests.cpp | 20 +- .../src}/avrobin_serialization_tests.cpp | 190 +-- .../src}/dyn_avpr_function_tests.cpp | 217 +-- .../src}/dyn_avpr_interface_tests.cpp | 44 +- libs/dfi/{test => gtest/src}/dyn_avpr_tests.cpp | 203 +-- libs/dfi/{test => gtest/src}/dyn_closure_tests.cpp | 45 +- .../src/dyn_example_functions.c} | 39 +- .../src/dyn_example_functions.h} | 47 +- libs/dfi/gtest/src/dyn_function_tests.cpp | 287 ++++ .../{test => gtest/src}/dyn_interface_tests.cpp | 68 +- libs/dfi/{test => gtest/src}/dyn_message_tests.cpp | 111 +- libs/dfi/{test => gtest/src}/dyn_type_tests.cpp | 83 +- .../{test => gtest/src}/json_rpc_avpr_tests.cpp | 73 +- libs/dfi/{test => gtest/src}/json_rpc_tests.cpp | 107 +- .../{test => gtest/src}/json_serializer_tests.cpp | 375 ++--- libs/dfi/include/avrobin_serializer.h | 11 + libs/dfi/include/dfi_log_util.h | 22 +- libs/dfi/include/dyn_common.h | 10 +- libs/dfi/include/dyn_function.h | 19 + libs/dfi/include/dyn_function_common.h | 8 + libs/dfi/include/dyn_interface.h | 8 + libs/dfi/include/dyn_interface_common.h | 8 + libs/dfi/include/dyn_message.h | 8 + libs/dfi/include/dyn_type.h | 35 +- libs/dfi/include/dyn_type_common.h | 8 + libs/dfi/include/json_rpc.h | 8 + libs/dfi/include/json_serializer.h | 8 + libs/dfi/src/avrobin_serializer.c | 161 +- libs/dfi/src/dyn_function.c | 13 +- libs/dfi/src/dyn_type.c | 92 +- libs/dfi/src/json_rpc.c | 101 +- libs/dfi/src/json_serializer.c | 16 +- libs/dfi/test/dyn_function_tests.cpp | 276 ---- libs/dfi/test/run_tests.cpp | 25 - libs/etcdlib/api/etcd.h | 30 +- libs/framework/CMakeLists.txt | 297 +--- libs/framework/{tst => gtest}/CMakeLists.txt | 23 +- libs/framework/{tst => gtest}/config.properties.in | 0 .../{tst => gtest}/framework1.properties.in | 0 .../{tst => gtest}/framework2.properties.in | 0 .../src}/bundle_context_bundles_tests.cpp | 258 ++-- .../src}/bundle_context_services_test.cpp | 382 +++-- libs/framework/{tst => gtest/src}/dm_tests.cpp | 38 +- .../src}/multiple_frameworks_test.cpp | 25 +- libs/framework/{tst => gtest/src}/nop_activator.c | 0 .../src/run_tests.cpp} | 9 +- .../{tst => gtest/src}/single_framework_test.cpp | 41 +- .../framework/{tst => gtest}/subdir/CMakeLists.txt | 0 libs/framework/{tst => gtest}/subdir/src/foo.c | 0 libs/framework/include/bundle.h | 28 +- libs/framework/include/bundle_context.h | 4 +- libs/framework/include/celix/dm/Component.h | 38 +- libs/framework/include/celix/dm/Component_Impl.h | 52 +- .../framework/include/celix/dm/ServiceDependency.h | 47 +- .../include/celix/dm/ServiceDependency_Impl.h | 144 +- libs/framework/include/celix/dm/types.h | 2 +- libs/framework/include/celix_bundle.h | 59 + libs/framework/include/celix_bundle_activator.h | 4 +- libs/framework/include/celix_bundle_context.h | 41 +- libs/framework/include/celix_constants.h | 7 + libs/framework/include/celix_dm_component.h | 2 + libs/framework/include/celix_framework.h | 67 + libs/framework/include/celix_log.h | 42 +- libs/framework/include/celix_types.h | 2 + libs/framework/include/framework.h | 4 +- libs/framework/include/framework_event.h | 2 +- libs/framework/include/service_reference.h | 3 + libs/framework/include/service_registration.h | 4 + libs/framework/include/service_registry.h | 52 +- libs/framework/include/service_tracker.h | 13 +- .../integration-test/test_bundle1/src/activator.c | 79 - .../integration-test/test_launcher/src/launcher.c | 95 -- libs/framework/private/mock/attribute_mock.c | 60 - libs/framework/private/mock/bundle_archive_mock.c | 165 --- libs/framework/private/mock/bundle_cache_mock.c | 67 - libs/framework/private/mock/bundle_context_mock.c | 373 ----- libs/framework/private/mock/bundle_mock.c | 301 ---- libs/framework/private/mock/bundle_revision_mock.c | 80 - libs/framework/private/mock/capability_mock.c | 68 - libs/framework/private/mock/celix_log_mock.c | 100 -- .../private/mock/dm_dependency_manager_mock.c | 41 - libs/framework/private/mock/filter_mock.c | 55 - libs/framework/private/mock/framework_mock.c | 350 ----- libs/framework/private/mock/manifest_mock.c | 80 - libs/framework/private/mock/manifest_parser_mock.c | 82 -- libs/framework/private/mock/module_mock.c | 155 -- libs/framework/private/mock/properties_mock.c | 74 - libs/framework/private/mock/requirement_mock.c | 66 - libs/framework/private/mock/resolver_mock.c | 51 - .../private/mock/service_reference_mock.c | 186 --- .../private/mock/service_registration_mock.c | 159 -- .../framework/private/mock/service_registry_mock.c | 197 --- .../private/mock/service_tracker_customizer_mock.c | 87 -- libs/framework/private/mock/version_mock.c | 112 -- libs/framework/private/mock/version_range_mock.c | 69 - libs/framework/private/mock/wire_mock.c | 75 - libs/framework/private/resources-test/NOTE | 24 - libs/framework/private/resources-test/manifest.txt | 4 - .../private/resources-test/manifest_sections.txt | 17 - libs/framework/private/test/attribute_test.cpp | 121 -- .../framework/private/test/bundle_archive_test.cpp | 313 ---- libs/framework/private/test/bundle_cache_test.cpp | 159 -- .../framework/private/test/bundle_context_test.cpp | 617 -------- .../private/test/bundle_revision_test.cpp | 158 -- libs/framework/private/test/bundle_test.cpp | 1007 ------------- libs/framework/private/test/capability_test.cpp | 163 -- .../private/test/celix_errorcodes_test.cpp | 87 -- libs/framework/private/test/framework_test.c | 149 -- libs/framework/private/test/framework_test.cpp | 112 -- .../private/test/manifest_parser_test.cpp | 255 ---- libs/framework/private/test/manifest_test.cpp | 215 --- libs/framework/private/test/module_test.cpp | 397 ----- libs/framework/private/test/requirement_test.cpp | 179 --- libs/framework/private/test/resolver_test.cpp | 353 ----- .../private/test/service_reference_test.cpp | 798 ---------- .../private/test/service_registration_test.cpp | 415 ------ .../private/test/service_registry_test.cpp | 1118 -------------- .../test/service_tracker_customizer_test.cpp | 171 --- .../private/test/service_tracker_test.cpp | 1075 -------------- libs/framework/private/test/wire_test.cpp | 100 -- libs/framework/src/attribute.c | 9 +- libs/framework/src/bundle.c | 170 ++- libs/framework/src/bundle_archive.c | 48 +- libs/framework/src/bundle_cache.c | 10 +- libs/framework/src/bundle_context.c | 175 +-- libs/framework/src/bundle_context_private.h | 4 +- libs/framework/src/bundle_revision.c | 19 +- libs/framework/src/capability.c | 2 +- libs/framework/src/celix_errorcodes.c | 21 +- libs/framework/src/celix_framework_factory.c | 2 +- libs/framework/src/celix_log.c | 163 +- libs/framework/src/dm_component_impl.c | 60 +- libs/framework/src/framework.c | 1068 ++++++-------- libs/framework/src/framework_private.h | 15 +- libs/framework/src/manifest.c | 10 +- libs/framework/src/manifest_parser.c | 2 +- libs/framework/src/registry_callback_private.h | 1 - libs/framework/src/requirement.c | 4 +- libs/framework/src/resolver.c | 8 +- libs/framework/src/service_reference.c | 20 +- libs/framework/src/service_registration.c | 36 +- libs/framework/src/service_registration_private.h | 8 +- libs/framework/src/service_registry.c | 548 +++++-- libs/framework/src/service_registry_private.h | 40 +- libs/framework/src/service_tracker.c | 355 ++--- libs/framework/src/service_tracker_customizer.c | 2 +- libs/framework/src/service_tracker_private.h | 10 +- libs/framework/src/wire.c | 2 +- libs/framework/tst/run_tests.cpp | 25 - libs/utils/CMakeLists.txt | 44 +- .../tst/subdir => utils/gtest}/CMakeLists.txt | 12 +- libs/utils/gtest/src/LogUtilsTestSuite.cc | 76 + libs/utils/include/celix_array_list.h | 4 + libs/utils/include/celix_errno.h | 14 +- .../include/celix_log_constants.h} | 19 +- .../include/celix_log_level.h} | 30 +- libs/utils/include/celix_log_utils.h | 106 ++ libs/utils/include/celix_properties.h | 4 +- libs/utils/include/celix_utils.h | 77 + libs/utils/include/celix_utils_api.h | 3 +- libs/utils/include/hash_map.h | 2 + libs/utils/include/memstream/open_memstream.h | 2 + libs/utils/include/utils.h | 10 +- libs/utils/include/version.h | 7 - libs/utils/include/version_range.h | 26 +- libs/utils/private/test/array_list_test.cpp | 1 + libs/utils/private/test/celix_threads_test.cpp | 30 +- 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 | 7 + libs/utils/private/test/thread_pool_test.cpp | 119 -- libs/utils/private/test/utils_test.cpp | 79 +- libs/utils/private/test/version_range_test.cpp | 429 ++++-- libs/utils/private/test/version_test.cpp | 11 +- libs/utils/src/array_list.c | 21 + libs/utils/src/celix_log_utils.c | 164 +++ libs/utils/src/celix_threads.c | 4 +- libs/utils/src/filter.c | 28 +- libs/utils/src/hash_map.c | 15 +- libs/utils/src/ip_utils.c | 2 +- libs/utils/src/properties.c | 21 +- libs/utils/src/thpool.c | 535 ------- libs/utils/src/utils.c | 110 +- libs/utils/src/version.c | 8 +- libs/utils/src/version_range.c | 76 + .../bundles/config_admin/CMakeLists.txt | 4 +- .../config_admin/config_admin_tst/CMakeLists.txt | 2 +- .../private/src/event_admin_activator.c | 2 - .../event_admin/private/src/event_admin_impl.c | 22 +- .../event_admin/private/src/event_impl.c | 6 +- .../private/src/event_handler_activator.c | 3 +- .../event_handler/private/src/event_handler_impl.c | 14 +- .../private/src/event_publisher_impl.c | 12 +- .../src/pubsub_nanomsg_topic_receiver.cc | 2 +- 571 files changed, 18194 insertions(+), 22267 deletions(-)
