This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/CELIX-454-pubsub-disc in repository https://gitbox.apache.org/repos/asf/celix.git
commit d1d001e10e951e1cf4e77f945bf174cfa1eaaed6 Merge: eb450c7 392f12e Author: Pepijn Noltes <[email protected]> AuthorDate: Mon Dec 10 21:01:59 2018 +0100 Merge branch 'develop' into feature/CELIX-454-pubsub-disc bundles/log_service/loghelper_include/log_helper.h | 2 +- .../log_writer/log_writer_syslog/CMakeLists.txt | 2 +- .../discovery_common/src/discovery_activator.c | 2 +- .../discovery_etcd/src/etcd_watcher.c | 4 +- bundles/shell/shell/include/shell.h | 2 +- bundles/shell/shell/src/dm_shell_list_command.c | 115 ++--- cmake/cmake_celix/ContainerPackaging.cmake | 54 ++- cmake/cmake_celix/DockerPackaging.cmake | 2 +- documents/cmake_commands/readme.md | 10 +- examples/celix-examples/CMakeLists.txt | 2 + .../bar/private/src/bar_activator.c | 13 +- .../foo1/private/src/foo1_activator.c | 28 +- .../foo2/private/src/foo2.c | 2 +- .../foo2/private/src/foo2_activator.c | 30 +- .../celix-examples/civetweb/src/bundle_activator.c | 2 +- examples/celix-examples/dm_example/CMakeLists.txt | 1 - .../dm_example/phase1/CMakeLists.txt | 11 - .../dm_example/phase1/src/phase1_activator.c | 47 +- .../dm_example/phase1/src/phase1_cmp.c | 6 +- .../dm_example/phase1/src/phase1_cmp.h | 2 +- .../dm_example/phase2a/CMakeLists.txt | 11 - .../dm_example/phase2a/src/phase2a_activator.c | 59 +-- .../dm_example/phase2b/CMakeLists.txt | 11 - .../dm_example/phase2b/src/phase2b_activator.c | 60 +-- .../dm_example/phase3/CMakeLists.txt | 11 - .../dm_example/phase3/src/phase3_activator.c | 62 ++- .../dm_example/phase3/src/phase3_cmp.c | 2 +- .../celix-examples/dm_example_cxx/CMakeLists.txt | 1 + .../dm_example_cxx/phase1/src/Phase1Activator.cc | 8 +- .../dm_example_cxx/phase1/src/Phase1Activator.h | 1 - .../celix-examples/embedding/private/src/main.c | 8 +- .../hello_world/private/src/activator.c | 8 +- .../hello_world_test/private/src/activator.c | 8 +- .../log_service_example/src/activator.c | 8 +- .../service_hook_example/src/activator.c | 12 +- .../src/dynamic_provider_example.c | 2 +- libs/dependency_manager/src/dm_activator.c | 10 +- libs/dependency_manager_cxx/src/dm_activator.cc | 18 +- libs/framework/include/bundle.h | 76 +-- libs/framework/include/bundle_activator.h | 16 +- libs/framework/include/bundle_context.h | 54 +-- libs/framework/include/bundle_revision.h | 4 +- libs/framework/include/celix/dm/Component.h | 26 +- libs/framework/include/celix/dm/Component_Impl.h | 37 +- .../framework/include/celix/dm/DependencyManager.h | 18 +- libs/framework/include/celix/dm/DmActivator.h | 14 +- .../framework/include/celix/dm/ServiceDependency.h | 16 +- .../include/celix/dm/ServiceDependency_Impl.h | 88 ++-- libs/framework/include/celix_api.h | 3 +- libs/framework/include/celix_bundle_context.h | 2 +- libs/framework/include/celix_dependency_manager.h | 86 ++++ .../{dm_component.h => celix_dm_component.h} | 63 ++- libs/framework/include/celix_dm_info.h | 76 +++ .../include/celix_dm_service_dependency.h | 169 +++++++ libs/framework/include/celix_framework.h | 2 - libs/framework/include/celix_framework_factory.h | 2 +- libs/framework/include/celix_launcher.h | 14 +- libs/framework/include/celix_types.h | 50 +- libs/framework/include/dm_activator.h | 12 +- libs/framework/include/dm_component.h | 52 +-- libs/framework/include/dm_dependency_manager.h | 18 +- libs/framework/include/dm_info.h | 76 --- libs/framework/include/dm_service_dependency.h | 36 +- libs/framework/include/framework.h | 17 +- libs/framework/include/listener_hook_service.h | 6 +- libs/framework/include/manifest.h | 4 +- libs/framework/include/module.h | 12 +- libs/framework/include/service_reference.h | 6 +- libs/framework/include/service_registration.h | 4 +- libs/framework/include/service_registry.h | 40 +- libs/framework/include/service_tracker.h | 12 +- .../private/mock/dm_dependency_manager_mock.c | 24 +- libs/framework/src/bundle_context.c | 13 +- libs/framework/src/bundle_context_private.h | 8 +- libs/framework/src/bundle_private.h | 7 +- libs/framework/src/celix_launcher.c | 3 +- libs/framework/src/dm_component_impl.c | 423 +++++++++-------- libs/framework/src/dm_component_impl.h | 6 +- libs/framework/src/dm_dependency_manager_impl.c | 215 +++++++-- libs/framework/src/dm_dependency_manager_impl.h | 21 +- libs/framework/src/dm_service_dependency.c | 299 +++++++----- libs/framework/src/dm_service_dependency_impl.h | 63 +-- libs/framework/src/framework.c | 511 +++++++++++---------- libs/framework/src/framework_private.h | 4 +- libs/framework/src/module.c | 2 +- libs/utils/include/array_list.h | 67 ++- libs/utils/include/celix_array_list.h | 17 +- libs/utils/include/filter.h | 2 +- libs/utils/include/linked_list.h | 56 ++- libs/utils/include/properties.h | 35 +- libs/utils/private/test/filter_test.cpp | 2 +- libs/utils/src/array_list_private.h | 4 +- libs/utils/src/filter.c | 79 ++-- libs/utils/src/properties.c | 38 +- 94 files changed, 2038 insertions(+), 1609 deletions(-) diff --cc libs/framework/src/bundle_private.h index d420d98,bb55d5e..0d0f9a3 --- a/libs/framework/src/bundle_private.h +++ b/libs/framework/src/bundle_private.h @@@ -26,10 -26,8 +26,9 @@@ - struct bundle { - char *symbolicName; //present to make debugging easier - + struct celix_bundle { bundle_context_pt context; ++ char *symbolicName; //for debug struct celix_bundle_activator *activator; bundle_state_e state; void * handle;
