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 2018/01/30 19:30:38 UTC

[54/54] [abbrv] celix git commit: Merge branch 'feature/CELIX-417-cmake-refactor' into develop

Merge branch 'feature/CELIX-417-cmake-refactor' into develop


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/398da49c
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/398da49c
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/398da49c

Branch: refs/heads/develop
Commit: 398da49c70dbdeb8ec0cfc70de3ebbea2730e39c
Parents: e78ecc5 481e798
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Tue Jan 30 20:38:20 2018 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Tue Jan 30 20:38:20 2018 +0100

----------------------------------------------------------------------
 .travis.yml                                     |    6 +-
 CMakeLists.txt                                  |   52 +-
 cmake/CMakeCelix.cmake                          |   32 -
 cmake/CelixConfig.cmake                         |   72 +
 cmake/CelixConfigVersion.cmake.in               |   28 +
 cmake/FindCELIX.cmake                           |  125 -
 cmake/FindCUnit.cmake                           |   65 -
 cmake/FindCZMQ.cmake                            |   42 -
 cmake/FindCppUTest.cmake                        |   54 -
 cmake/FindFFI.cmake                             |   57 -
 cmake/FindJansson.cmake                         |   42 -
 cmake/FindSlp.cmake                             |   42 -
 cmake/FindSyslog.cmake                          |   26 -
 cmake/FindUUID.cmake                            |   37 -
 cmake/FindZMQ.cmake                             |   42 -
 cmake/Modules/FindCUnit.cmake                   |   65 +
 cmake/Modules/FindCZMQ.cmake                    |   42 +
 cmake/Modules/FindCppUTest.cmake                |   54 +
 cmake/Modules/FindFFI.cmake                     |   57 +
 cmake/Modules/FindJansson.cmake                 |   42 +
 cmake/Modules/FindSlp.cmake                     |   42 +
 cmake/Modules/FindSyslog.cmake                  |   26 +
 cmake/Modules/FindUUID.cmake                    |   37 +
 cmake/Modules/FindZMQ.cmake                     |   42 +
 cmake/UseDoxygen.cmake                          |  170 -
 cmake/celix_project/ApacheRat.cmake             |   30 +
 cmake/celix_project/CelixProject.cmake          |   80 +
 cmake/celix_project/CodeCoverage.cmake          |  126 +
 cmake/cmake_celix/ApacheRat.cmake               |   30 -
 cmake/cmake_celix/BuildOptions.cmake            |   24 -
 cmake/cmake_celix/BundlePackaging.cmake         |  176 +-
 cmake/cmake_celix/CodeCoverage.cmake            |  126 -
 cmake/cmake_celix/Dependencies.cmake            |   69 -
 cmake/cmake_celix/DeployPackaging.cmake         |  184 +-
 cmake/cmake_celix/DockerPackaging.cmake         |  101 +-
 cmake/cmake_celix/Runtimes.cmake                |    6 +-
 cmake/cmake_celix/UseCelix.cmake                |   25 +
 cmake/cmake_celix/main.c.in                     |   24 -
 config_admin/CMakeLists.txt                     |    7 +-
 config_admin/config_admin_tst/CMakeLists.txt    |    2 +-
 .../example_test/CMakeLists.txt                 |    2 +-
 .../example_test2/CMakeLists.txt                |    2 +-
 config_admin/example/CMakeLists.txt             |    2 -
 config_admin/service/CMakeLists.txt             |    3 -
 dependency_manager/CMakeLists.txt               |   97 +-
 dependency_manager/api/dm_activator.h           |   65 +
 dependency_manager/api/dm_component.h           |  158 +
 dependency_manager/api/dm_dependency_manager.h  |   79 +
 dependency_manager/api/dm_info.h                |   81 +
 dependency_manager/api/dm_service_dependency.h  |  171 +
 .../private/include/dm_component_impl.h         |   48 -
 .../private/include/dm_dependency.h             |   41 -
 .../include/dm_dependency_manager_impl.h        |   45 -
 dependency_manager/private/include/dm_event.h   |   72 -
 .../include/dm_service_dependency_impl.h        |  104 -
 .../private/include/dm_shell_list_command.h     |   42 -
 dependency_manager/private/src/dm_activator.c   |  119 -
 .../private/src/dm_component_impl.c             | 1451 ----
 .../private/src/dm_dependency_manager_impl.c    |  129 -
 dependency_manager/private/src/dm_event.c       |  105 -
 .../private/src/dm_service_dependency.c         |  811 --
 .../private/src/dm_shell_activator.c            |   94 -
 .../private/src/dm_shell_list_command.c         |  126 -
 .../public/include/dm_activator.h               |   65 -
 .../public/include/dm_component.h               |  158 -
 .../public/include/dm_dependency_manager.h      |   79 -
 dependency_manager/public/include/dm_info.h     |   81 -
 .../public/include/dm_service_dependency.h      |  171 -
 dependency_manager/readme.md                    |   18 +-
 dependency_manager/src/dm_activator.c           |  119 +
 dependency_manager/src/dm_component_impl.c      | 1451 ++++
 dependency_manager/src/dm_component_impl.h      |   48 +
 dependency_manager/src/dm_dependency.h          |   41 +
 .../src/dm_dependency_manager_impl.c            |  129 +
 .../src/dm_dependency_manager_impl.h            |   45 +
 dependency_manager/src/dm_event.c               |  105 +
 dependency_manager/src/dm_event.h               |   72 +
 dependency_manager/src/dm_service_dependency.c  |  811 ++
 .../src/dm_service_dependency_impl.h            |  104 +
 dependency_manager/src/dm_shell_activator.c     |   94 +
 dependency_manager/src/dm_shell_list_command.c  |  126 +
 dependency_manager/src/dm_shell_list_command.h  |   42 +
 dependency_manager_cxx/CMakeLists.txt           |   48 +-
 dependency_manager_cxx/readme.md                |    6 +
 deployment_admin/CMakeLists.txt                 |   59 +-
 deployment_admin/README.md                      |   20 +-
 deployment_admin/api/resource_processor.h       |   54 +
 .../private/include/deployment_admin.h          |   57 -
 .../private/include/deployment_package.h        |   76 -
 deployment_admin/private/include/ioapi.h        |  200 -
 deployment_admin/private/include/log.h          |   44 -
 deployment_admin/private/include/log_event.h    |   43 -
 deployment_admin/private/include/log_store.h    |   45 -
 deployment_admin/private/include/log_sync.h     |   36 -
 deployment_admin/private/include/miniunz.h      |   34 -
 deployment_admin/private/include/unzip.h        |  437 -
 deployment_admin/private/src/deployment_admin.c |  809 --
 .../private/src/deployment_admin_activator.c    |   78 -
 .../private/src/deployment_package.c            |  219 -
 deployment_admin/private/src/ioapi.c            |  235 -
 deployment_admin/private/src/log.c              |   73 -
 deployment_admin/private/src/log_store.c        |   94 -
 deployment_admin/private/src/log_sync.c         |  209 -
 deployment_admin/private/src/miniunz.c          |  402 -
 deployment_admin/private/src/unzip.c            | 2128 -----
 .../public/include/resource_processor.h         |   54 -
 deployment_admin/src/deployment_admin.c         |  809 ++
 deployment_admin/src/deployment_admin.h         |   57 +
 .../src/deployment_admin_activator.c            |   78 +
 deployment_admin/src/deployment_package.c       |  219 +
 deployment_admin/src/deployment_package.h       |   76 +
 deployment_admin/src/ioapi.c                    |  235 +
 deployment_admin/src/ioapi.h                    |  200 +
 deployment_admin/src/log.c                      |   73 +
 deployment_admin/src/log.h                      |   44 +
 deployment_admin/src/log_event.h                |   43 +
 deployment_admin/src/log_store.c                |   94 +
 deployment_admin/src/log_store.h                |   45 +
 deployment_admin/src/log_sync.c                 |  209 +
 deployment_admin/src/log_sync.h                 |   36 +
 deployment_admin/src/miniunz.c                  |  402 +
 deployment_admin/src/miniunz.h                  |   34 +
 deployment_admin/src/unzip.c                    | 2128 +++++
 deployment_admin/src/unzip.h                    |  437 +
 device_access/README.md                         |   11 +-
 device_access/device_access/CMakeLists.txt      |   42 +-
 device_access/device_access/include/device.h    |   47 +
 device_access/device_access/include/driver.h    |   45 +
 .../device_access/include/driver_locator.h      |   46 +
 .../device_access/include/driver_selector.h     |   41 +
 device_access/device_access/include/match.h     |   38 +
 .../private/include/device_manager.h            |   56 -
 .../private/include/driver_attributes.h         |   46 -
 .../private/include/driver_loader.h             |   48 -
 .../private/include/driver_matcher.h            |   42 -
 .../device_access/private/src/activator.c       |  194 -
 .../device_access/private/src/device_manager.c  |  570 --
 .../private/src/driver_attributes.c             |  169 -
 .../device_access/private/src/driver_loader.c   |  185 -
 .../device_access/private/src/driver_matcher.c  |  274 -
 .../device_access/public/include/device.h       |   47 -
 .../device_access/public/include/driver.h       |   45 -
 .../public/include/driver_locator.h             |   46 -
 .../public/include/driver_selector.h            |   41 -
 .../device_access/public/include/match.h        |   38 -
 device_access/device_access/src/activator.c     |  194 +
 .../device_access/src/device_manager.c          |  570 ++
 .../device_access/src/device_manager.h          |   56 +
 .../device_access/src/driver_attributes.c       |  169 +
 .../device_access/src/driver_attributes.h       |   46 +
 device_access/device_access/src/driver_loader.c |  185 +
 device_access/device_access/src/driver_loader.h |   48 +
 .../device_access/src/driver_matcher.c          |  274 +
 .../device_access/src/driver_matcher.h          |   42 +
 device_access/driver_locator/CMakeLists.txt     |   14 +-
 .../private/include/driver_locator_private.h    |   39 -
 .../driver_locator/private/src/activator.c      |   89 -
 .../driver_locator/private/src/driver_locator.c |   91 -
 device_access/driver_locator/src/activator.c    |   89 +
 .../driver_locator/src/driver_locator.c         |   91 +
 .../driver_locator/src/driver_locator_private.h |   39 +
 device_access/example/CMakeLists.txt            |    2 +-
 .../example/base_driver/CMakeLists.txt          |   15 +-
 .../base_driver/include/base_driver_device.h    |   44 +
 .../private/include/base_driver_private.h       |   41 -
 .../example/base_driver/private/src/activator.c |  140 -
 .../base_driver/private/src/base_driver.c       |  111 -
 .../public/include/base_driver_device.h         |   44 -
 .../example/base_driver/src/activator.c         |  140 +
 .../example/base_driver/src/base_driver.c       |  111 +
 .../base_driver/src/base_driver_private.h       |   41 +
 .../example/consuming_driver/CMakeLists.txt     |   12 +-
 .../private/include/consuming_driver_private.h  |   43 -
 .../consuming_driver/private/src/activator.c    |  104 -
 .../private/src/consuming_driver.c              |  125 -
 .../example/consuming_driver/src/activator.c    |  104 +
 .../consuming_driver/src/consuming_driver.c     |  125 +
 .../src/consuming_driver_private.h              |   43 +
 .../example/refining_driver/CMakeLists.txt      |   15 +-
 .../include/refining_driver_device.h            |   45 +
 .../private/include/refining_driver_private.h   |   58 -
 .../refining_driver/private/src/activator.c     |  104 -
 .../private/src/refining_driver.c               |  281 -
 .../public/include/refining_driver_device.h     |   45 -
 .../example/refining_driver/src/activator.c     |  104 +
 .../refining_driver/src/refining_driver.c       |  281 +
 .../src/refining_driver_private.h               |   58 +
 dfi/CMakeLists.txt                              |   93 +-
 dfi/include/dfi_log_util.h                      |   63 +
 dfi/include/dyn_common.h                        |   47 +
 dfi/include/dyn_function.h                      |   60 +
 dfi/include/dyn_interface.h                     |   66 +
 dfi/include/dyn_message.h                       |   56 +
 dfi/include/dyn_type.h                          |  155 +
 dfi/include/json_rpc.h                          |   37 +
 dfi/include/json_serializer.h                   |   37 +
 dfi/private/src/dyn_common.c                    |  151 -
 dfi/private/src/dyn_function.c                  |  331 -
 dfi/private/src/dyn_interface.c                 |  444 -
 dfi/private/src/dyn_message.c                   |  358 -
 dfi/private/src/dyn_type.c                      | 1160 ---
 dfi/private/src/json_rpc.c                      |  341 -
 dfi/private/src/json_serializer.c               |  484 --
 .../test/avro_descriptor_translator_tests.cpp   |  180 -
 .../test/descriptors/example1.descriptor        |   13 -
 .../test/descriptors/example2.descriptor        |    9 -
 .../test/descriptors/example3.descriptor        |   11 -
 .../test/descriptors/example4.descriptor        |    8 -
 .../descriptors/invalids/invalid.descriptor     |   13 -
 .../invalids/invalidMetaType.descriptor         |    8 -
 .../invalids/invalidMethod.descriptor           |    8 -
 .../invalids/invalidMethodReturnType.descriptor |    8 -
 .../invalids/invalidMsgHdr.descriptor           |    9 -
 .../invalids/invalidMsgInvalidName.descriptor   |    9 -
 .../invalidMsgInvalidSection.descriptor         |   10 -
 .../invalids/invalidMsgInvalidType.descriptor   |    9 -
 .../invalidMsgInvalidVersion.descriptor         |   10 -
 .../invalidMsgMissingVersion.descriptor         |   10 -
 .../invalids/invalidSection.descriptor          |    6 -
 .../descriptors/invalids/invalidType.descriptor |   10 -
 .../invalids/invalidVersion.descriptor          |    9 -
 .../descriptors/invalids/noVersion.descriptor   |   12 -
 .../test/descriptors/msg_example1.descriptor    |   10 -
 .../test/descriptors/msg_example2.descriptor    |   12 -
 .../test/descriptors/msg_example3.descriptor    |   10 -
 .../test/descriptors/msg_example4.descriptor    |   10 -
 dfi/private/test/dyn_closure_tests.cpp          |  162 -
 dfi/private/test/dyn_function_tests.cpp         |  274 -
 dfi/private/test/dyn_interface_tests.cpp        |  207 -
 dfi/private/test/dyn_message_tests.cpp          |  253 -
 dfi/private/test/dyn_type_tests.cpp             |  297 -
 dfi/private/test/json_rpc_tests.cpp             |  433 -
 dfi/private/test/json_serializer_tests.cpp      |  558 --
 dfi/private/test/run_tests.cpp                  |   24 -
 dfi/private/test/schemas/complex.avdl           |   30 -
 dfi/private/test/schemas/complex.avpr           |   55 -
 dfi/private/test/schemas/invalid1.avpr          |   47 -
 dfi/private/test/schemas/invalid2.avpr          |   49 -
 dfi/private/test/schemas/simple.avdl            |   24 -
 dfi/private/test/schemas/simple.avpr            |   51 -
 dfi/private/test/schemas/simple_min.avpr        |   19 -
 dfi/public/include/dfi_log_util.h               |   63 -
 dfi/public/include/dyn_common.h                 |   47 -
 dfi/public/include/dyn_function.h               |   60 -
 dfi/public/include/dyn_interface.h              |   66 -
 dfi/public/include/dyn_message.h                |   56 -
 dfi/public/include/dyn_type.h                   |  155 -
 dfi/public/include/json_rpc.h                   |   37 -
 dfi/public/include/json_serializer.h            |   37 -
 dfi/src/dyn_common.c                            |  151 +
 dfi/src/dyn_function.c                          |  331 +
 dfi/src/dyn_interface.c                         |  444 +
 dfi/src/dyn_message.c                           |  358 +
 dfi/src/dyn_type.c                              | 1160 +++
 dfi/src/json_rpc.c                              |  341 +
 dfi/src/json_serializer.c                       |  484 ++
 dfi/test/avro_descriptor_translator_tests.cpp   |  180 +
 dfi/test/descriptors/example1.descriptor        |   13 +
 dfi/test/descriptors/example2.descriptor        |    9 +
 dfi/test/descriptors/example3.descriptor        |   11 +
 dfi/test/descriptors/example4.descriptor        |    8 +
 .../descriptors/invalids/invalid.descriptor     |   13 +
 .../invalids/invalidMetaType.descriptor         |    8 +
 .../invalids/invalidMethod.descriptor           |    8 +
 .../invalids/invalidMethodReturnType.descriptor |    8 +
 .../invalids/invalidMsgHdr.descriptor           |    9 +
 .../invalids/invalidMsgInvalidName.descriptor   |    9 +
 .../invalidMsgInvalidSection.descriptor         |   10 +
 .../invalids/invalidMsgInvalidType.descriptor   |    9 +
 .../invalidMsgInvalidVersion.descriptor         |   10 +
 .../invalidMsgMissingVersion.descriptor         |   10 +
 .../invalids/invalidSection.descriptor          |    6 +
 .../descriptors/invalids/invalidType.descriptor |   10 +
 .../invalids/invalidVersion.descriptor          |    9 +
 .../descriptors/invalids/noVersion.descriptor   |   12 +
 dfi/test/descriptors/msg_example1.descriptor    |   10 +
 dfi/test/descriptors/msg_example2.descriptor    |   12 +
 dfi/test/descriptors/msg_example3.descriptor    |   10 +
 dfi/test/descriptors/msg_example4.descriptor    |   10 +
 dfi/test/dyn_closure_tests.cpp                  |  162 +
 dfi/test/dyn_function_tests.cpp                 |  274 +
 dfi/test/dyn_interface_tests.cpp                |  207 +
 dfi/test/dyn_message_tests.cpp                  |  253 +
 dfi/test/dyn_type_tests.cpp                     |  297 +
 dfi/test/json_rpc_tests.cpp                     |  433 +
 dfi/test/json_serializer_tests.cpp              |  558 ++
 dfi/test/run_tests.cpp                          |   24 +
 dfi/test/schemas/complex.avdl                   |   30 +
 dfi/test/schemas/complex.avpr                   |   55 +
 dfi/test/schemas/invalid1.avpr                  |   47 +
 dfi/test/schemas/invalid2.avpr                  |   49 +
 dfi/test/schemas/simple.avdl                    |   24 +
 dfi/test/schemas/simple.avpr                    |   51 +
 dfi/test/schemas/simple_min.avpr                |   19 +
 doap/doap_Celix.rdf                             |    2 +-
 etcdlib/CMakeLists.txt                          |   30 +-
 etcdlib/api/etcd.h                              |  110 +
 etcdlib/private/src/etcd.c                      |  487 --
 etcdlib/public/include/etcd.h                   |  110 -
 etcdlib/src/etcd.c                              |  487 ++
 event_admin/event_admin/CMakeLists.txt          |    2 +-
 event_admin/event_handler/CMakeLists.txt        |    2 +-
 event_admin/event_publisher/CMakeLists.txt      |    2 +-
 examples/CMakeLists.txt                         |    8 +-
 examples/dm_example/CMakeLists.txt              |   40 +-
 examples/dm_example/api/CMakeLists.txt          |   19 +
 examples/dm_example/api/include/phase1.h        |   44 +
 examples/dm_example/api/include/phase2.h        |   41 +
 examples/dm_example/phase1/CMakeLists.txt       |   21 +-
 .../phase1/private/include/phase1_cmp.h         |   44 -
 .../phase1/private/src/phase1_activator.c       |   86 -
 .../dm_example/phase1/private/src/phase1_cmp.c  |  110 -
 .../dm_example/phase1/src/phase1_activator.c    |   86 +
 examples/dm_example/phase1/src/phase1_cmp.c     |  110 +
 examples/dm_example/phase1/src/phase1_cmp.h     |   44 +
 examples/dm_example/phase2a/CMakeLists.txt      |   19 +-
 .../phase2a/private/include/phase2a_cmp.h       |   46 -
 .../phase2a/private/src/phase2a_activator.c     |   95 -
 .../phase2a/private/src/phase2a_cmp.c           |  116 -
 .../dm_example/phase2a/src/phase2a_activator.c  |   95 +
 examples/dm_example/phase2a/src/phase2a_cmp.c   |  116 +
 examples/dm_example/phase2a/src/phase2a_cmp.h   |   46 +
 examples/dm_example/phase2b/CMakeLists.txt      |   21 +-
 .../phase2b/private/include/phase2b_cmp.h       |   46 -
 .../phase2b/private/src/phase2b_activator.c     |   95 -
 .../phase2b/private/src/phase2b_cmp.c           |  115 -
 .../dm_example/phase2b/src/phase2b_activator.c  |   95 +
 examples/dm_example/phase2b/src/phase2b_cmp.c   |  115 +
 examples/dm_example/phase2b/src/phase2b_cmp.h   |   46 +
 examples/dm_example/phase3/CMakeLists.txt       |   21 +-
 .../phase3/private/include/phase3_cmp.h         |   45 -
 .../phase3/private/src/phase3_activator.c       |   84 -
 .../dm_example/phase3/private/src/phase3_cmp.c  |  116 -
 .../dm_example/phase3/src/phase3_activator.c    |   84 +
 examples/dm_example/phase3/src/phase3_cmp.c     |  116 +
 examples/dm_example/phase3/src/phase3_cmp.h     |   45 +
 examples/dm_example/services/phase1.h           |   44 -
 examples/dm_example/services/phase2.h           |   41 -
 examples/dm_example_cxx/CMakeLists.txt          |   76 +-
 examples/dm_example_cxx/api/CMakeLists.txt      |   19 +
 examples/dm_example_cxx/api/IName.h             |   39 -
 examples/dm_example_cxx/api/IPhase1.h           |   33 -
 examples/dm_example_cxx/api/IPhase2.h           |   33 -
 examples/dm_example_cxx/api/include/IName.h     |   39 +
 examples/dm_example_cxx/api/include/IPhase1.h   |   33 +
 examples/dm_example_cxx/api/include/IPhase2.h   |   33 +
 examples/dm_example_cxx/phase1/CMakeLists.txt   |   17 +-
 .../phase1/include/Phase1Activator.h            |   36 -
 .../dm_example_cxx/phase1/include/Phase1Cmp.h   |   44 -
 .../dm_example_cxx/phase1/src/Phase1Activator.h |   36 +
 examples/dm_example_cxx/phase1/src/Phase1Cmp.h  |   44 +
 examples/dm_example_cxx/phase2/CMakeLists.txt   |   51 +
 .../phase2/include/Phase2Activator.h            |   34 -
 .../dm_example_cxx/phase2/include/Phase2Cmp.h   |   56 -
 .../dm_example_cxx/phase2/src/Phase2Activator.h |   34 +
 examples/dm_example_cxx/phase2/src/Phase2Cmp.h  |   56 +
 .../phase2/src/Phase2aActivator.cc              |   57 +
 .../dm_example_cxx/phase2/src/Phase2aCmp.cc     |   45 +
 .../phase2/src/Phase2bActivator.cc              |   50 +
 .../dm_example_cxx/phase2/src/Phase2bCmp.cc     |   45 +
 examples/dm_example_cxx/phase2a/CMakeLists.txt  |   42 -
 .../phase2a/src/Phase2aActivator.cc             |   57 -
 .../dm_example_cxx/phase2a/src/Phase2aCmp.cc    |   45 -
 examples/dm_example_cxx/phase2b/CMakeLists.txt  |   43 -
 .../phase2b/src/Phase2bActivator.cc             |   50 -
 .../dm_example_cxx/phase2b/src/Phase2bCmp.cc    |   45 -
 examples/dm_example_cxx/phase3/CMakeLists.txt   |   17 +-
 .../phase3/include/Phase3Activator.h            |   33 -
 .../phase3/include/Phase3BaseActivator.h        |   35 -
 .../dm_example_cxx/phase3/include/Phase3Cmp.h   |   50 -
 .../dm_example_cxx/phase3/src/Phase3Activator.h |   33 +
 .../phase3/src/Phase3BaseActivator.h            |   35 +
 examples/dm_example_cxx/phase3/src/Phase3Cmp.h  |   50 +
 .../phase3_locking/CMakeLists.txt               |   16 +-
 .../include/Phase3LockingActivator.h            |   33 -
 .../phase3_locking/include/Phase3LockingCmp.h   |   50 -
 .../phase3_locking/src/Phase3LockingActivator.h |   33 +
 .../phase3_locking/src/Phase3LockingCmp.h       |   50 +
 examples/embedding/CMakeLists.txt               |    3 +-
 examples/hello_world/CMakeLists.txt             |    8 +-
 examples/hello_world_test/CMakeLists.txt        |   12 +-
 examples/log_service_example/CMakeLists.txt     |   13 +-
 .../log_service_example/private/src/activator.c |   85 -
 examples/log_service_example/src/activator.c    |   85 +
 examples/mongoose/CMakeLists.txt                |    4 +-
 examples/service_hook_example/CMakeLists.txt    |   25 +-
 .../private/src/activator.c                     |  137 -
 examples/service_hook_example/src/activator.c   |  137 +
 examples/services_example_c/CMakeLists.txt      |    4 +-
 examples/services_example_c/bar/CMakeLists.txt  |    6 +-
 examples/services_example_c/foo1/CMakeLists.txt |    6 +-
 examples/services_example_c/foo2/CMakeLists.txt |    6 +-
 examples/services_example_cxx/CMakeLists.txt    |    4 +-
 .../services_example_cxx/bar/CMakeLists.txt     |    6 +-
 .../services_example_cxx/baz/CMakeLists.txt     |    6 +-
 .../services_example_cxx/foo/CMakeLists.txt     |    6 +-
 examples/whiteboard/CMakeLists.txt              |   24 -
 examples/whiteboard/publisherA/CMakeLists.txt   |   23 -
 .../publisherA/private/src/activator.c          |   83 -
 .../publisherA/private/src/publisher.c          |   33 -
 examples/whiteboard/publisherB/CMakeLists.txt   |   22 -
 .../publisherB/private/src/activator.c          |   77 -
 .../publisherB/private/src/publisher.c          |   33 -
 .../private/include/publisher_private.h         |   38 -
 .../publisherService/public/include/publisher.h |   42 -
 examples/whiteboard/tracker/CMakeLists.txt      |   21 -
 .../whiteboard/tracker/private/src/activator.c  |  126 -
 .../whiteboard/tracker_depman/CMakeLists.txt    |   36 -
 .../tracker_depman/private/include/tracker.h    |   63 -
 .../private/src/dependency_activator.c          |  116 -
 .../tracker_depman/private/src/tracker.c        |  142 -
 framework/CMakeLists.txt                        |  626 +-
 framework/include/archive.h                     |   58 +
 framework/include/bundle.h                      |  139 +
 framework/include/bundle_activator.h            |  126 +
 framework/include/bundle_archive.h              |   93 +
 framework/include/bundle_context.h              |  175 +
 framework/include/bundle_event.h                |   63 +
 framework/include/bundle_listener.h             |   57 +
 framework/include/bundle_revision.h             |  142 +
 framework/include/bundle_state.h                |   49 +
 framework/include/capability.h                  |   54 +
 framework/include/celix_launcher.h              |   57 +
 framework/include/celix_log.h                   |   85 +
 framework/include/constants.h                   |   67 +
 framework/include/filter.h                      |   55 +
 framework/include/framework.h                   |   57 +
 framework/include/framework_event.h             |   71 +
 framework/include/framework_exports.h           |   65 +
 framework/include/framework_listener.h          |   55 +
 framework/include/listener_hook_service.h       |   60 +
 framework/include/manifest.h                    |   67 +
 framework/include/module.h                      |   94 +
 framework/include/requirement.h                 |   53 +
 framework/include/service_event.h               |   68 +
 framework/include/service_factory.h             |   60 +
 framework/include/service_listener.h            |   55 +
 framework/include/service_reference.h           |   72 +
 framework/include/service_registration.h        |   58 +
 framework/include/service_registry.h            |  103 +
 framework/include/service_tracker.h             |   72 +
 framework/include/service_tracker_customizer.h  |   78 +
 framework/include/wire.h                        |  120 +
 framework/private/include/attribute.h           |   39 -
 framework/private/include/attribute_private.h   |   39 -
 framework/private/include/bundle_cache.h        |  115 -
 .../private/include/bundle_cache_private.h      |   39 -
 .../private/include/bundle_context_private.h    |   43 -
 framework/private/include/bundle_private.h      |   48 -
 .../private/include/bundle_revision_private.h   |   42 -
 framework/private/include/capability_private.h  |   41 -
 framework/private/include/filter_private.h      |   57 -
 framework/private/include/framework_private.h   |  145 -
 framework/private/include/ioapi.h               |  200 -
 framework/private/include/iowin32.h             |   28 -
 .../private/include/listener_hook_info_impl.h   |   34 -
 framework/private/include/manifest_parser.h     |   45 -
 .../private/include/registry_callback_private.h |   42 -
 framework/private/include/requirement_private.h |   40 -
 framework/private/include/resolver.h            |   45 -
 .../private/include/service_reference_private.h |   69 -
 .../include/service_registration_private.h      |   71 -
 .../private/include/service_registry_private.h  |   67 -
 .../service_tracker_customizer_private.h        |   49 -
 .../private/include/service_tracker_private.h   |   52 -
 framework/private/include/unzip.h               |  437 -
 framework/private/src/attribute.c               |   71 -
 framework/private/src/bundle.c                  |  695 --
 framework/private/src/bundle_archive.c          |  792 --
 framework/private/src/bundle_cache.c            |  218 -
 framework/private/src/bundle_context.c          |  384 -
 framework/private/src/bundle_revision.c         |  153 -
 framework/private/src/capability.c              |  100 -
 framework/private/src/celix_errorcodes.c        |   64 -
 framework/private/src/celix_launcher.c          |  316 -
 framework/private/src/celix_log.c               |   83 -
 framework/private/src/filter.c                  |  687 --
 framework/private/src/framework.c               | 2620 ------
 framework/private/src/ioapi.c                   |  235 -
 framework/private/src/iowin32.c                 |  389 -
 framework/private/src/manifest.c                |  271 -
 framework/private/src/manifest_parser.c         |  490 --
 framework/private/src/miniunz.c                 |  382 -
 framework/private/src/module.c                  |  281 -
 framework/private/src/requirement.c             |  114 -
 framework/private/src/resolver.c                |  495 --
 framework/private/src/service_reference.c       |  378 -
 framework/private/src/service_registration.c    |  291 -
 framework/private/src/service_registry.c        |  800 --
 framework/private/src/service_tracker.c         |  449 -
 .../private/src/service_tracker_customizer.c    |  107 -
 framework/private/src/unzip.c                   | 2128 -----
 framework/private/src/wire.c                    |   87 -
 framework/public/include/archive.h              |   58 -
 framework/public/include/bundle.h               |  139 -
 framework/public/include/bundle_activator.h     |  126 -
 framework/public/include/bundle_archive.h       |   93 -
 framework/public/include/bundle_context.h       |  159 -
 framework/public/include/bundle_event.h         |   63 -
 framework/public/include/bundle_listener.h      |   57 -
 framework/public/include/bundle_revision.h      |  142 -
 framework/public/include/bundle_state.h         |   49 -
 framework/public/include/capability.h           |   54 -
 framework/public/include/celix_launcher.h       |   57 -
 framework/public/include/celix_log.h            |   85 -
 framework/public/include/constants.h            |   67 -
 framework/public/include/filter.h               |   55 -
 framework/public/include/framework.h            |   57 -
 framework/public/include/framework_event.h      |   71 -
 framework/public/include/framework_exports.h    |   65 -
 framework/public/include/framework_listener.h   |   55 -
 .../public/include/listener_hook_service.h      |   60 -
 framework/public/include/manifest.h             |   67 -
 framework/public/include/module.h               |   94 -
 framework/public/include/requirement.h          |   53 -
 framework/public/include/service_event.h        |   68 -
 framework/public/include/service_factory.h      |   60 -
 framework/public/include/service_listener.h     |   55 -
 framework/public/include/service_reference.h    |   72 -
 framework/public/include/service_registration.h |   58 -
 framework/public/include/service_registry.h     |  103 -
 framework/public/include/service_tracker.h      |   72 -
 .../public/include/service_tracker_customizer.h |   78 -
 framework/public/include/wire.h                 |  120 -
 framework/src/attribute.c                       |   71 +
 framework/src/attribute.h                       |   39 +
 framework/src/attribute_private.h               |   39 +
 framework/src/bundle.c                          |  695 ++
 framework/src/bundle_archive.c                  |  792 ++
 framework/src/bundle_cache.c                    |  218 +
 framework/src/bundle_cache.h                    |  115 +
 framework/src/bundle_cache_private.h            |   39 +
 framework/src/bundle_context.c                  |  384 +
 framework/src/bundle_context_private.h          |   43 +
 framework/src/bundle_private.h                  |   48 +
 framework/src/bundle_revision.c                 |  153 +
 framework/src/bundle_revision_private.h         |   42 +
 framework/src/capability.c                      |  100 +
 framework/src/capability_private.h              |   41 +
 framework/src/celix_errorcodes.c                |   64 +
 framework/src/celix_launcher.c                  |  317 +
 framework/src/celix_log.c                       |   83 +
 framework/src/filter.c                          |  687 ++
 framework/src/filter_private.h                  |   57 +
 framework/src/framework.c                       | 2620 ++++++
 framework/src/framework_private.h               |  145 +
 framework/src/ioapi.c                           |  235 +
 framework/src/ioapi.h                           |  200 +
 framework/src/iowin32.c                         |  389 +
 framework/src/iowin32.h                         |   28 +
 framework/src/listener_hook_info_impl.h         |   34 +
 framework/src/manifest.c                        |  271 +
 framework/src/manifest_parser.c                 |  490 ++
 framework/src/manifest_parser.h                 |   45 +
 framework/src/miniunz.c                         |  382 +
 framework/src/module.c                          |  281 +
 framework/src/registry_callback_private.h       |   42 +
 framework/src/requirement.c                     |  114 +
 framework/src/requirement_private.h             |   40 +
 framework/src/resolver.c                        |  495 ++
 framework/src/resolver.h                        |   45 +
 framework/src/service_reference.c               |  378 +
 framework/src/service_reference_private.h       |   69 +
 framework/src/service_registration.c            |  291 +
 framework/src/service_registration_private.h    |   71 +
 framework/src/service_registry.c                |  800 ++
 framework/src/service_registry_private.h        |   67 +
 framework/src/service_tracker.c                 |  449 +
 framework/src/service_tracker_customizer.c      |  107 +
 .../src/service_tracker_customizer_private.h    |   49 +
 framework/src/service_tracker_private.h         |   52 +
 framework/src/unzip.c                           | 2128 +++++
 framework/src/unzip.h                           |  437 +
 framework/src/wire.c                            |   87 +
 framework/tst/CMakeLists.txt                    |   12 +-
 launcher/CMakeLists.txt                         |   33 +-
 launcher/private/src/celix_test_runner.cpp      |   73 -
 launcher/private/src/main.c                     |   24 -
 launcher/src/celix_test_runner.cpp              |   73 +
 launcher/src/main.c                             |   24 +
 log_service/CMakeLists.txt                      |   60 +-
 log_service/README.md                           |   30 +-
 log_service/include/log_entry.h                 |   55 +
 log_service/include/log_listener.h              |   43 +
 log_service/include/log_reader_service.h        |   50 +
 log_service/include/log_service.h               |   58 +
 log_service/loghelper_include/log_helper.h      |   36 +
 log_service/private/include/log.h               |   48 -
 log_service/private/include/log_factory.h       |   40 -
 .../private/include/log_reader_service_impl.h   |   43 -
 log_service/private/include/log_service_impl.h  |   39 -
 log_service/private/src/log.c                   |  375 -
 log_service/private/src/log_entry.c             |   94 -
 log_service/private/src/log_factory.c           |  100 -
 .../private/src/log_reader_service_impl.c       |   82 -
 log_service/private/src/log_service_activator.c |  198 -
 log_service/private/src/log_service_impl.c      |   96 -
 log_service/public/include/log_entry.h          |   55 -
 log_service/public/include/log_helper.h         |   35 -
 log_service/public/include/log_listener.h       |   43 -
 log_service/public/include/log_reader_service.h |   50 -
 log_service/public/include/log_service.h        |   58 -
 log_service/public/src/log_helper.c             |  211 -
 log_service/src/log.c                           |  375 +
 log_service/src/log.h                           |   48 +
 log_service/src/log_entry.c                     |   94 +
 log_service/src/log_factory.c                   |  100 +
 log_service/src/log_factory.h                   |   40 +
 log_service/src/log_helper.c                    |  211 +
 log_service/src/log_reader_service_impl.c       |   82 +
 log_service/src/log_reader_service_impl.h       |   43 +
 log_service/src/log_service_activator.c         |  198 +
 log_service/src/log_service_impl.c              |   96 +
 log_service/src/log_service_impl.h              |   39 +
 log_writer/CMakeLists.txt                       |    7 +-
 log_writer/README.md                            |   27 +-
 log_writer/log_writer/CMakeLists.txt            |   24 +
 log_writer/log_writer/include/log_writer.h      |   53 +
 .../log_writer/private/include/log_writer.h     |   54 -
 log_writer/log_writer/private/src/log_writer.c  |  122 -
 .../private/src/log_writer_activator.c          |   57 -
 log_writer/log_writer/src/log_writer.c          |  122 +
 .../log_writer/src/log_writer_activator.c       |   57 +
 log_writer/log_writer_stdout/CMakeLists.txt     |   18 +-
 .../private/src/log_writer_stdout.c             |   49 -
 .../log_writer_stdout/src/log_writer_stdout.c   |   49 +
 log_writer/log_writer_syslog/CMakeLists.txt     |   16 +-
 pubsub/CMakeLists.txt                           |   33 +-
 pubsub/api/pubsub/publisher.h                   |   88 -
 pubsub/api/pubsub/subscriber.h                  |   75 -
 pubsub/deploy/CMakeLists.txt                    |  239 -
 pubsub/examples/CMakeLists.txt                  |  213 +
 .../examples/mp_pubsub/publisher/CMakeLists.txt |   11 +-
 .../private/include/mp_publisher_private.h      |    2 +-
 .../publisher/private/src/mp_pub_activator.c    |   50 +-
 .../publisher/private/src/mp_publisher.c        |    1 -
 .../mp_pubsub/subscriber/CMakeLists.txt         |   15 +-
 .../private/include/mp_subscriber_private.h     |    3 +-
 .../subscriber/private/src/mp_sub_activator.c   |   43 +-
 pubsub/examples/pubsub/publisher/CMakeLists.txt |   21 +-
 .../private/include/pubsub_publisher_private.h  |    2 +-
 .../publisher/private/src/ps_pub_activator.c    |   69 +-
 .../publisher/private/src/pubsub_publisher.c    |    1 -
 .../examples/pubsub/publisher2/CMakeLists.txt   |   23 +-
 .../examples/pubsub/subscriber/CMakeLists.txt   |   25 +-
 .../private/include/pubsub_subscriber_private.h |    3 +-
 .../subscriber/private/src/ps_sub_activator.c   |   49 +-
 pubsub/mock/CMakeLists.txt                      |   21 +-
 pubsub/pubsub_admin_udp_mc/CMakeLists.txt       |   39 +-
 .../private/include/large_udp.h                 |   45 -
 .../private/include/pubsub_admin_impl.h         |   93 -
 .../private/include/topic_publication.h         |   57 -
 .../private/include/topic_subscription.h        |   60 -
 .../pubsub_admin_udp_mc/private/src/large_udp.c |  372 -
 .../private/src/psa_activator.c                 |  141 -
 .../private/src/pubsub_admin_impl.c             | 1039 ---
 .../private/src/topic_publication.c             |  437 -
 .../private/src/topic_subscription.c            |  635 --
 pubsub/pubsub_admin_udp_mc/src/large_udp.c      |  372 +
 pubsub/pubsub_admin_udp_mc/src/large_udp.h      |   45 +
 pubsub/pubsub_admin_udp_mc/src/psa_activator.c  |  141 +
 .../pubsub_admin_udp_mc/src/pubsub_admin_impl.c | 1039 +++
 .../pubsub_admin_udp_mc/src/pubsub_admin_impl.h |   93 +
 .../pubsub_admin_udp_mc/src/topic_publication.c |  437 +
 .../pubsub_admin_udp_mc/src/topic_publication.h |   57 +
 .../src/topic_subscription.c                    |  635 ++
 .../src/topic_subscription.h                    |   60 +
 pubsub/pubsub_admin_zmq/CMakeLists.txt          |   51 +-
 .../private/include/pubsub_admin_impl.h         |  109 -
 .../private/include/topic_publication.h         |   49 -
 .../private/include/topic_subscription.h        |   60 -
 .../private/include/zmq_crypto.h                |   41 -
 .../private/src/psa_activator.c                 |  142 -
 .../private/src/pubsub_admin_impl.c             | 1040 ---
 .../private/src/topic_publication.c             |  630 --
 .../private/src/topic_subscription.c            |  732 --
 .../pubsub_admin_zmq/private/src/zmq_crypto.c   |  281 -
 pubsub/pubsub_admin_zmq/src/psa_activator.c     |  142 +
 pubsub/pubsub_admin_zmq/src/pubsub_admin_impl.c | 1040 +++
 pubsub/pubsub_admin_zmq/src/pubsub_admin_impl.h |  109 +
 pubsub/pubsub_admin_zmq/src/topic_publication.c |  630 ++
 pubsub/pubsub_admin_zmq/src/topic_publication.h |   49 +
 .../pubsub_admin_zmq/src/topic_subscription.c   |  732 ++
 .../pubsub_admin_zmq/src/topic_subscription.h   |   60 +
 pubsub/pubsub_admin_zmq/src/zmq_crypto.c        |  281 +
 pubsub/pubsub_admin_zmq/src/zmq_crypto.h        |   41 +
 pubsub/pubsub_api/CMakeLists.txt                |   32 +
 pubsub/pubsub_api/include/pubsub/publisher.h    |   88 +
 pubsub/pubsub_api/include/pubsub/subscriber.h   |   75 +
 .../include/publisher_endpoint_announce.h       |   36 -
 .../pubsub_common/public/include/pubsub_admin.h |   72 -
 .../public/include/pubsub_admin_match.h         |   40 -
 .../public/include/pubsub_common.h              |   52 -
 .../public/include/pubsub_endpoint.h            |   58 -
 .../public/include/pubsub_serializer.h          |   66 -
 .../public/include/pubsub_topic_info.descriptor |   10 -
 .../pubsub_common/public/include/pubsub_utils.h |   39 -
 .../public/src/pubsub_admin_match.c             |  320 -
 .../pubsub_common/public/src/pubsub_endpoint.c  |  254 -
 pubsub/pubsub_common/public/src/pubsub_utils.c  |  170 -
 pubsub/pubsub_discovery/CMakeLists.txt          |   34 +-
 .../private/include/etcd_common.h               |   28 -
 .../private/include/etcd_watcher.h              |   38 -
 .../private/include/etcd_writer.h               |   39 -
 .../private/include/pubsub_discovery_impl.h     |   72 -
 .../pubsub_discovery/private/src/etcd_common.c  |   82 -
 .../pubsub_discovery/private/src/etcd_watcher.c |  290 -
 .../pubsub_discovery/private/src/etcd_writer.c  |  189 -
 .../private/src/psd_activator.c                 |  171 -
 .../private/src/pubsub_discovery_impl.c         |  457 -
 .../public/include/pubsub_discovery.h           |   26 -
 pubsub/pubsub_discovery/src/etcd_common.c       |   82 +
 pubsub/pubsub_discovery/src/etcd_common.h       |   28 +
 pubsub/pubsub_discovery/src/etcd_watcher.c      |  290 +
 pubsub/pubsub_discovery/src/etcd_watcher.h      |   38 +
 pubsub/pubsub_discovery/src/etcd_writer.c       |  189 +
 pubsub/pubsub_discovery/src/etcd_writer.h       |   39 +
 pubsub/pubsub_discovery/src/psd_activator.c     |  171 +
 pubsub/pubsub_discovery/src/pubsub_discovery.h  |   26 +
 .../src/pubsub_discovery_impl.c                 |  457 +
 .../src/pubsub_discovery_impl.h                 |   72 +
 pubsub/pubsub_serializer_json/CMakeLists.txt    |   31 +-
 .../private/include/pubsub_serializer_impl.h    |   55 -
 .../private/src/ps_activator.c                  |  107 -
 .../private/src/pubsub_serializer_impl.c        |  295 -
 .../pubsub_serializer_json/src/ps_activator.c   |  107 +
 .../src/pubsub_serializer_impl.c                |  295 +
 .../src/pubsub_serializer_impl.h                |   55 +
 pubsub/pubsub_spi/CMakeLists.txt                |   36 +
 .../include/publisher_endpoint_announce.h       |   36 +
 pubsub/pubsub_spi/include/pubsub_admin.h        |   72 +
 pubsub/pubsub_spi/include/pubsub_admin_match.h  |   40 +
 pubsub/pubsub_spi/include/pubsub_common.h       |   52 +
 pubsub/pubsub_spi/include/pubsub_endpoint.h     |   58 +
 pubsub/pubsub_spi/include/pubsub_serializer.h   |   66 +
 .../include/pubsub_topic_info.descriptor        |   10 +
 pubsub/pubsub_spi/include/pubsub_utils.h        |   39 +
 pubsub/pubsub_spi/src/pubsub_admin_match.c      |  320 +
 pubsub/pubsub_spi/src/pubsub_endpoint.c         |  254 +
 pubsub/pubsub_spi/src/pubsub_utils.c            |  170 +
 pubsub/pubsub_topology_manager/CMakeLists.txt   |   29 +-
 .../private/include/pubsub_topology_manager.h   |   83 -
 .../private/src/pstm_activator.c                |  246 -
 .../private/src/pubsub_topology_manager.c       |  723 --
 .../src/pstm_activator.c                        |  244 +
 .../src/pubsub_topology_manager.c               |  721 ++
 .../src/pubsub_topology_manager.h               |   82 +
 pubsub/test/CMakeLists.txt                      |   14 +-
 remote_services/CMakeLists.txt                  |   26 +-
 remote_services/civetweb/CMakeLists.txt         |   26 +
 remote_services/civetweb/include/civetweb.h     |  657 ++
 remote_services/civetweb/src/civetweb.c         | 7907 ++++++++++++++++++
 remote_services/civetweb/src/md5.inl            |  461 +
 .../discovery/private/include/discovery.h       |   67 -
 .../include/endpoint_descriptor_common.h        |   61 -
 .../include/endpoint_descriptor_reader.h        |   42 -
 .../include/endpoint_descriptor_writer.h        |   39 -
 .../private/include/endpoint_discovery_poller.h |   56 -
 .../private/include/endpoint_discovery_server.h |   81 -
 remote_services/discovery/private/src/desc.xml  |   41 -
 .../discovery/private/src/discovery.c           |  233 -
 .../discovery/private/src/discovery_activator.c |  186 -
 .../private/src/endpoint_descriptor_reader.c    |  387 -
 .../private/src/endpoint_descriptor_writer.c    |  233 -
 .../private/src/endpoint_discovery_poller.c     |  403 -
 .../private/src/endpoint_discovery_server.c     |  450 -
 remote_services/discovery_common/CMakeLists.txt |   39 +
 .../discovery_common/include/discovery.h        |   88 +
 .../discovery_common/include/discovery_type.h   |   27 +
 .../include/endpoint_descriptor_common.h        |   61 +
 .../include/endpoint_descriptor_reader.h        |   42 +
 .../include/endpoint_descriptor_writer.h        |   39 +
 .../include/endpoint_discovery_poller.h         |   57 +
 .../include/endpoint_discovery_server.h         |   88 +
 remote_services/discovery_common/src/desc.xml   |   41 +
 .../discovery_common/src/discovery.c            |  233 +
 .../discovery_common/src/discovery_activator.c  |  186 +
 .../src/endpoint_descriptor_reader.c            |  293 +
 .../src/endpoint_descriptor_writer.c            |  196 +
 .../src/endpoint_discovery_poller.c             |  402 +
 .../src/endpoint_discovery_server.c             |  454 +
 .../discovery_configured/CMakeLists.txt         |   64 +-
 .../private/include/discovery_impl.h            |   62 -
 .../discovery_configured/private/src/desc.xml   |   41 -
 .../private/src/discovery_impl.c                |  123 -
 .../discovery_configured/src/desc.xml           |   41 +
 .../discovery_configured/src/discovery_impl.c   |  123 +
 .../discovery_configured/src/discovery_impl.h   |   62 +
 remote_services/discovery_etcd/CMakeLists.txt   |   48 +-
 .../private/include/discovery_impl.h            |   66 -
 .../private/include/etcd_watcher.h              |   40 -
 .../discovery_etcd/private/src/discovery_impl.c |  183 -
 .../discovery_etcd/private/src/etcd_watcher.c   |  397 -
 .../discovery_etcd/src/discovery_impl.c         |  193 +
 .../discovery_etcd/src/discovery_impl.h         |   54 +
 .../discovery_etcd/src/etcd_watcher.c           |  397 +
 .../discovery_etcd/src/etcd_watcher.h           |   41 +
 remote_services/discovery_shm/CMakeLists.txt    |   46 +-
 .../private/include/discovery_impl.h            |   66 -
 .../private/include/discovery_shm.h             |   56 -
 .../private/include/discovery_shmWatcher.h      |   40 -
 .../discovery_shm/private/src/discovery_impl.c  |  163 -
 .../discovery_shm/private/src/discovery_shm.c   |  284 -
 .../private/src/discovery_shmWatcher.c          |  246 -
 .../discovery_shm/src/discovery_impl.c          |  169 +
 .../discovery_shm/src/discovery_impl.h          |   53 +
 .../discovery_shm/src/discovery_shm.c           |  284 +
 .../discovery_shm/src/discovery_shm.h           |   56 +
 .../discovery_shm/src/discovery_shmWatcher.c    |  255 +
 .../discovery_shm/src/discovery_shmWatcher.h    |   41 +
 remote_services/examples/CMakeLists.txt         |  100 +-
 .../examples/calculator_api/CMakeLists.txt      |   22 +
 .../calculator_api/include/calculator_service.h |   56 +
 ...apache.celix.calc.api.Calculator2.descriptor |   11 +
 .../examples/calculator_endpoint/CMakeLists.txt |   35 -
 .../private/include/calculator_endpoint_impl.h  |   46 -
 .../private/src/calculator_endpoint_activator.c |   96 -
 .../private/src/calculator_endpoint_impl.c      |  184 -
 .../calculator_endpoint2/CMakeLists.txt         |   35 -
 .../private/include/calculator_endpoint_impl.h  |   46 -
 .../private/src/calculator_endpoint_activator.c |   96 -
 .../private/src/calculator_endpoint_impl.c      |  184 -
 .../examples/calculator_proxy/CMakeLists.txt    |   37 -
 .../private/include/calculator_proxy_impl.h     |   59 -
 .../private/src/calculator_proxy_activator.c    |  124 -
 .../private/src/calculator_proxy_impl.c         |  173 -
 .../examples/calculator_proxy2/CMakeLists.txt   |   37 -
 .../private/include/calculator_proxy_impl.h     |   59 -
 .../private/src/calculator_proxy_activator.c    |  124 -
 .../private/src/calculator_proxy_impl.c         |  173 -
 .../examples/calculator_service/CMakeLists.txt  |   24 +-
 .../private/include/calculator_impl.h           |   43 -
 .../private/src/calculator_activator.c          |  110 -
 .../private/src/calculator_impl.c               |   79 -
 .../public/include/calculator_service.h         |   56 -
 ...apache.celix.calc.api.Calculator2.descriptor |   11 -
 .../src/calculator_activator.c                  |  110 +
 .../calculator_service/src/calculator_impl.c    |   79 +
 .../calculator_service/src/calculator_impl.h    |   43 +
 .../examples/calculator_shell/CMakeLists.txt    |   29 +-
 .../private/include/add_command.h               |   32 -
 ...apache.celix.calc.api.Calculator2.descriptor |   11 -
 .../private/include/sqrt_command.h              |   32 -
 .../private/include/sub_command.h               |   32 -
 .../calculator_shell/private/src/add_command.c  |  101 -
 .../private/src/calculator_shell_activator.c    |  125 -
 .../calculator_shell/private/src/sqrt_command.c |   96 -
 .../calculator_shell/private/src/sub_command.c  |   99 -
 .../examples/calculator_shell/src/add_command.c |  101 +
 .../examples/calculator_shell/src/add_command.h |   32 +
 .../src/calculator_shell_activator.c            |  125 +
 ...apache.celix.calc.api.Calculator2.descriptor |   11 +
 .../calculator_shell/src/sqrt_command.c         |   96 +
 .../calculator_shell/src/sqrt_command.h         |   32 +
 .../examples/calculator_shell/src/sub_command.c |   99 +
 .../examples/calculator_shell/src/sub_command.h |   32 +
 .../remote_service_admin/CMakeLists.txt         |   46 -
 remote_services/remote_service_admin/README.md  |   28 -
 .../private/include/export_registration_impl.h  |   61 -
 .../private/include/import_registration_impl.h  |   81 -
 .../private/include/remote_service_admin_impl.h |   49 -
 .../private/src/endpoint_description.c          |   89 -
 .../private/src/export_registration_impl.c      |  257 -
 .../private/src/import_registration_impl.c      |  274 -
 .../private/src/remote_proxy_factory_impl.c     |  252 -
 .../public/include/endpoint_description.h       |   50 -
 .../public/include/endpoint_listener.h          |   49 -
 .../public/include/export_registration.h        |   22 -
 .../public/include/import_registration.h        |   22 -
 .../public/include/remote_constants.h           |   38 -
 .../public/include/remote_endpoint.h            |   44 -
 .../public/include/remote_endpoint_impl.h       |   38 -
 .../public/include/remote_proxy.h               |   76 -
 .../public/include/remote_service_admin.h       |   73 -
 .../remote_service_admin_dfi/CMakeLists.txt     |   32 +-
 .../remote_service_admin_dfi/rsa/CMakeLists.txt |   48 -
 .../rsa/private/include/dfi_utils.h             |   30 -
 .../private/include/export_registration_dfi.h   |   38 -
 .../private/include/import_registration_dfi.h   |   44 -
 .../private/include/remote_service_admin_dfi.h  |   57 -
 .../rsa/private/src/dfi_utils.c                 |   98 -
 .../rsa/private/src/export_registration_dfi.c   |  251 -
 .../rsa/private/src/import_registration_dfi.c   |  402 -
 .../src/remote_service_admin_activator.c        |  124 -
 .../rsa/private/src/remote_service_admin_dfi.c  |  775 --
 .../rsa_tst/CMakeLists.txt                      |   57 -
 .../rsa_tst/bundle/CMakeLists.txt               |   37 -
 .../rsa_tst/bundle/tst_activator.c              |  153 -
 .../rsa_tst/bundle/tst_service.h                |   32 -
 .../rsa_tst/client.properties.in                |    8 -
 .../rsa_tst/config.properties.in                |   20 -
 .../rsa_tst/rsa_client_server_tests.cpp         |  133 -
 .../rsa_tst/rsa_tests.cpp                       |  234 -
 .../rsa_tst/run_tests.cpp                       |   25 -
 .../rsa_tst/server.properties.in                |   23 -
 .../remote_service_admin_dfi/src/dfi_utils.c    |  108 +
 .../remote_service_admin_dfi/src/dfi_utils.h    |   30 +
 .../src/export_registration_dfi.c               |  251 +
 .../src/export_registration_dfi.h               |   38 +
 .../src/import_registration_dfi.c               |  402 +
 .../src/import_registration_dfi.h               |   44 +
 .../src/remote_service_admin_activator.c        |  124 +
 .../src/remote_service_admin_dfi.c              |  771 ++
 .../src/remote_service_admin_dfi.h              |   57 +
 .../test/CMakeLists.txt                         |   60 +
 .../test/client.properties.in                   |    8 +
 .../test/config.properties.in                   |   20 +
 .../test/server.properties.in                   |   23 +
 .../test/src/rsa_client_server_tests.cpp        |  133 +
 .../test/src/rsa_tests.cpp                      |  234 +
 .../test/src/run_tests.cpp                      |   25 +
 .../test/src/tst_activator.c                    |  162 +
 .../test/src/tst_service.h                      |   32 +
 .../remote_service_admin_http/CMakeLists.txt    |   55 -
 .../include/remote_service_admin_http_impl.h    |   52 -
 .../src/remote_service_admin_activator.c        |  123 -
 .../private/src/remote_service_admin_impl.c     |  822 --
 .../private/test/CMakeLists.txt                 |   58 -
 .../private/test/client.properties.in           |   26 -
 .../private/test/rsa_client_server_tests.cpp    |  495 --
 .../private/test/run_tests.cpp                  |   24 -
 .../private/test/server.properties.in           |   25 -
 .../remote_services_api/CMakeLists.txt          |   28 +
 remote_services/remote_services_api/README.md   |   11 +
 .../include/remote_constants.h                  |   31 +
 remote_services/rsa_common/CMakeLists.txt       |   30 +
 .../rsa_common/src/endpoint_description.c       |   89 +
 .../rsa_common/src/export_registration_impl.c   |  257 +
 .../rsa_common/src/export_registration_impl.h   |   61 +
 .../rsa_common/src/import_registration_impl.c   |  274 +
 .../rsa_common/src/import_registration_impl.h   |   81 +
 .../rsa_common/src/remote_proxy_factory_impl.c  |  252 +
 .../rsa_common/src/remote_service_admin_impl.h  |   49 +
 remote_services/rsa_spi/CMakeLists.txt          |   29 +
 remote_services/rsa_spi/README.md               |   11 +
 .../rsa_spi/include/endpoint_description.h      |   50 +
 .../rsa_spi/include/endpoint_listener.h         |   49 +
 .../rsa_spi/include/export_registration.h       |   22 +
 .../rsa_spi/include/import_registration.h       |   22 +
 .../rsa_spi/include/remote_constants.h          |   38 +
 .../rsa_spi/include/remote_endpoint.h           |   44 +
 .../rsa_spi/include/remote_endpoint_impl.h      |   38 +
 remote_services/rsa_spi/include/remote_proxy.h  |   76 +
 .../rsa_spi/include/remote_service_admin.h      |   73 +
 remote_services/topology_manager/CMakeLists.txt |   32 +-
 .../topology_manager/include/tm_scope.h         |   46 +
 .../topology_manager/private/include/scope.h    |  150 -
 .../private/include/topology_manager.h          |   65 -
 .../topology_manager/private/src/activator.c    |  289 -
 .../topology_manager/private/src/scope.c        |  326 -
 .../private/src/topology_manager.c              |  985 ---
 .../topology_manager/public/include/tm_scope.h  |   46 -
 .../topology_manager/src/activator.c            |  289 +
 remote_services/topology_manager/src/scope.c    |  326 +
 remote_services/topology_manager/src/scope.h    |  150 +
 .../topology_manager/src/topology_manager.c     |  985 +++
 .../topology_manager/src/topology_manager.h     |   66 +
 .../topology_manager/tms_tst/CMakeLists.txt     |   24 +-
 .../tms_tst/bundle/CMakeLists.txt               |    2 +-
 .../tms_tst/disc_mock/CMakeLists.txt            |   15 +-
 .../tms_tst/disc_mock/disc_mock_activator.c     |    1 -
 .../utils/private/include/civetweb.h            |  657 --
 remote_services/utils/private/src/civetweb.c    | 7907 ------------------
 remote_services/utils/private/src/md5.inl       |  461 -
 remote_shell/CMakeLists.txt                     |   28 +-
 .../private/include/connection_listener.h       |   42 -
 remote_shell/private/include/remote_shell.h     |   50 -
 remote_shell/private/include/shell_mediator.h   |   54 -
 remote_shell/private/src/activator.c            |  153 -
 remote_shell/private/src/connection_listener.c  |  221 -
 remote_shell/private/src/remote_shell.c         |  242 -
 remote_shell/private/src/shell_mediator.c       |  139 -
 remote_shell/src/activator.c                    |  153 +
 remote_shell/src/connection_listener.c          |  221 +
 remote_shell/src/connection_listener.h          |   42 +
 remote_shell/src/remote_shell.c                 |  242 +
 remote_shell/src/remote_shell.h                 |   50 +
 remote_shell/src/shell_mediator.c               |  139 +
 remote_shell/src/shell_mediator.h               |   54 +
 shell/CMakeLists.txt                            |   55 +-
 shell/README.md                                 |   12 +-
 shell/include/command.h                         |   57 +
 shell/include/shell.h                           |   51 +
 shell/include/shell_constants.h                 |   27 +
 shell/private/include/shell_private.h           |   51 -
 shell/private/include/std_commands.h            |   44 -
 shell/private/src/activator.c                   |  269 -
 shell/private/src/help_command.c                |  112 -
 shell/private/src/inspect_command.c             |  277 -
 shell/private/src/install_command.c             |   76 -
 shell/private/src/lb_command.c                  |  205 -
 shell/private/src/log_command.c                 |   94 -
 shell/private/src/shell.c                       |  305 -
 shell/private/src/start_command.c               |   84 -
 shell/private/src/stop_command.c                |   82 -
 shell/private/src/uninstall_command.c           |   58 -
 shell/private/src/update_command.c              |  117 -
 shell/public/include/command.h                  |   57 -
 shell/public/include/shell.h                    |   51 -
 shell/public/include/shell_constants.h          |   27 -
 shell/src/activator.c                           |  269 +
 shell/src/help_command.c                        |  112 +
 shell/src/inspect_command.c                     |  277 +
 shell/src/install_command.c                     |   76 +
 shell/src/lb_command.c                          |  205 +
 shell/src/log_command.c                         |   94 +
 shell/src/shell.c                               |  305 +
 shell/src/shell_private.h                       |   51 +
 shell/src/start_command.c                       |   84 +
 shell/src/std_commands.h                        |   44 +
 shell/src/stop_command.c                        |   82 +
 shell/src/uninstall_command.c                   |   58 +
 shell/src/update_command.c                      |  117 +
 shell_bonjour/CMakeLists.txt                    |   26 +-
 shell_tui/CMakeLists.txt                        |   16 +-
 shell_tui/README.md                             |    5 +
 utils/CMakeLists.txt                            |  186 +-
 utils/include/array_list.h                      |   99 +
 utils/include/celix_errno.h                     |  119 +
 utils/include/celix_threads.h                   |  135 +
 utils/include/celixbool.h                       |   61 +
 utils/include/exports.h                         |   49 +
 utils/include/hash_map.h                        |  161 +
 utils/include/linked_list.h                     |   91 +
 utils/include/linked_list_iterator.h            |   66 +
 utils/include/memstream/README.md               |   49 +
 utils/include/memstream/fmemopen.h              |   52 +
 utils/include/memstream/open_memstream.h        |   15 +
 utils/include/properties.h                      |   68 +
 utils/include/thpool.h                          |  168 +
 utils/include/utils.h                           |   61 +
 utils/include/version.h                         |  186 +
 utils/include/version_range.h                   |  160 +
 utils/private/include/array_list_private.h      |   52 -
 utils/private/include/hash_map_private.h        |   74 -
 utils/private/include/linked_list_private.h     |   44 -
 utils/private/include/version_private.h         |   41 -
 utils/private/include/version_range_private.h   |   41 -
 utils/private/src/array_list.c                  |  337 -
 utils/private/src/celix_threads.c               |  184 -
 utils/private/src/hash_map.c                    |  607 --
 utils/private/src/linked_list.c                 |  268 -
 utils/private/src/linked_list_iterator.c        |  153 -
 utils/private/src/memstream/fmemopen.c          |   76 -
 utils/private/src/memstream/open_memstream.c    |  130 -
 utils/private/src/properties.c                  |  330 -
 utils/private/src/thpool.c                      |  535 --
 utils/private/src/utils.c                       |  141 -
 utils/private/src/version.c                     |  264 -
 utils/private/src/version_range.c               |  233 -
 utils/public/include/array_list.h               |   99 -
 utils/public/include/celix_errno.h              |  119 -
 utils/public/include/celix_threads.h            |  135 -
 utils/public/include/celixbool.h                |   61 -
 utils/public/include/exports.h                  |   49 -
 utils/public/include/hash_map.h                 |  161 -
 utils/public/include/linked_list.h              |   91 -
 utils/public/include/linked_list_iterator.h     |   66 -
 utils/public/include/memstream/README.md        |   49 -
 utils/public/include/memstream/fmemopen.h       |   52 -
 utils/public/include/memstream/open_memstream.h |   15 -
 utils/public/include/properties.h               |   68 -
 utils/public/include/thpool.h                   |  168 -
 utils/public/include/utils.h                    |   61 -
 utils/public/include/version.h                  |  186 -
 utils/public/include/version_range.h            |  160 -
 utils/src/array_list.c                          |  337 +
 utils/src/array_list_private.h                  |   52 +
 utils/src/celix_threads.c                       |  184 +
 utils/src/hash_map.c                            |  607 ++
 utils/src/hash_map_private.h                    |   74 +
 utils/src/linked_list.c                         |  268 +
 utils/src/linked_list_iterator.c                |  153 +
 utils/src/linked_list_private.h                 |   44 +
 utils/src/memstream/fmemopen.c                  |   76 +
 utils/src/memstream/open_memstream.c            |  130 +
 utils/src/properties.c                          |  330 +
 utils/src/thpool.c                              |  535 ++
 utils/src/utils.c                               |  141 +
 utils/src/version.c                             |  264 +
 utils/src/version_private.h                     |   41 +
 utils/src/version_range.c                       |  233 +
 utils/src/version_range_private.h               |   41 +
 1083 files changed, 81386 insertions(+), 85767 deletions(-)
----------------------------------------------------------------------