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/05/27 18:37:34 UTC

[51/51] [partial] celix git commit: CELIX-424: Cleans up the directory structure. Moves all libraries to the libs subdir and all bundles to the bundles subdir

CELIX-424: Cleans up the directory structure. Moves all libraries to the libs subdir and all bundles to the bundles subdir


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

Branch: refs/heads/develop
Commit: 3bce889bc7b38b6d5d274107249c878fc959f955
Parents: d44047d
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Sun May 27 20:35:31 2018 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Sun May 27 20:35:31 2018 +0200

----------------------------------------------------------------------
 CMakeLists.txt                                  |   28 +-
 bundles/CMakeLists.txt                          |   25 +
 bundles/config_admin/CMakeLists.txt             |   61 +
 .../config_admin_tst/CMakeLists.txt             |   47 +
 .../config_admin_tst/config.properties.in       |   20 +
 .../config_admin_tst/config_admin_test.cpp      |  404 +
 .../example_test/CMakeLists.txt                 |   31 +
 .../example_test/META-INF/MANIFEST.MF           |    5 +
 .../include/example_managed_service_impl.h      |   68 +
 .../example_test/private/src/activator.c        |  207 +
 .../private/src/example_managed_service_impl.c  |  103 +
 .../example_test2/CMakeLists.txt                |   30 +
 .../example_test2/META-INF/MANIFEST.MF          |    5 +
 .../include/example2_managed_service_impl.h     |   66 +
 .../example_test2/private/src/activator.c       |  227 +
 .../private/src/example_managed_service_impl.c  |  108 +
 bundles/config_admin/example/CMakeLists.txt     |   25 +
 .../example/private/include/example.h           |   18 +
 .../example/private/src/bundle_activator.c      |   75 +
 .../config_admin/example/private/src/example.c  |   59 +
 bundles/config_admin/readme.md                  |   54 +
 bundles/config_admin/service/CMakeLists.txt     |   36 +
 .../config_admin/service/META-INF/MANIFEST.MF   |    6 +
 .../include/configuration_admin_factory.h       |   65 +
 .../private/include/configuration_admin_impl.h  |   68 +
 .../private/include/configuration_impl.h        |   72 +
 .../private/include/configuration_store.h       |   65 +
 .../service/private/include/framework_patch.h   |   39 +
 .../private/include/managed_service_tracker.h   |   60 +
 .../private/include/updated_thread_pool.h       |   52 +
 .../service/private/src/activator.c             |  136 +
 .../private/src/configuration_admin_factory.c   |  211 +
 .../private/src/configuration_admin_impl.c      |  208 +
 .../service/private/src/configuration_impl.c    |  683 ++
 .../service/private/src/configuration_store.c   |  417 +
 .../service/private/src/managed_service_impl.c  |   55 +
 .../private/src/managed_service_tracker.c       |  598 ++
 .../service/private/src/updated_thread_pool.c   |  146 +
 .../service/public/include/configuration.h      |   80 +
 .../public/include/configuration_admin.h        |   64 +
 .../public/include/configuration_event.h        |   57 +
 .../public/include/configuration_listener.h     |   57 +
 .../public/include/configuration_plugin.h       |   62 +
 .../service/public/include/managed_service.h    |   54 +
 bundles/deployment_admin/CMakeLists.txt         |   72 +
 bundles/deployment_admin/README.md              |   41 +
 .../deployment_admin/api/resource_processor.h   |   54 +
 bundles/deployment_admin/src/deployment_admin.c |  809 ++
 bundles/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 +
 bundles/deployment_admin/src/ioapi.c            |  235 +
 bundles/deployment_admin/src/ioapi.h            |  200 +
 bundles/deployment_admin/src/log.c              |   73 +
 bundles/deployment_admin/src/log.h              |   44 +
 bundles/deployment_admin/src/log_event.h        |   43 +
 bundles/deployment_admin/src/log_store.c        |   94 +
 bundles/deployment_admin/src/log_store.h        |   45 +
 bundles/deployment_admin/src/log_sync.c         |  209 +
 bundles/deployment_admin/src/log_sync.h         |   36 +
 bundles/deployment_admin/src/miniunz.c          |  402 +
 bundles/deployment_admin/src/miniunz.h          |   34 +
 bundles/deployment_admin/src/unzip.c            | 2128 +++++
 bundles/deployment_admin/src/unzip.h            |  437 +
 bundles/device_access/CMakeLists.txt            |   25 +
 bundles/device_access/README.md                 |   34 +
 .../device_access/device_access/CMakeLists.txt  |   50 +
 .../device_access/include/device.h              |   47 +
 .../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 +
 .../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/src/driver_loader.c           |  185 +
 .../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 |   32 +
 .../driver_locator/src/activator.c              |   89 +
 .../driver_locator/src/driver_locator.c         |   91 +
 .../driver_locator/src/driver_locator_private.h |   39 +
 bundles/device_access/example/CMakeLists.txt    |   32 +
 .../example/base_driver/CMakeLists.txt          |   28 +
 .../example/base_driver/README.txt              |   23 +
 .../base_driver/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     |   29 +
 .../example/consuming_driver/README.txt         |   23 +
 .../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      |   29 +
 .../example/refining_driver/README.txt          |   22 +
 .../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 +
 bundles/event_admin/CMakeLists.txt              |   43 +
 bundles/event_admin/event_admin/CMakeLists.txt  |   39 +
 .../private/include/event_admin_impl.h          |  169 +
 .../private/src/event_admin_activator.c         |  136 +
 .../event_admin/private/src/event_admin_impl.c  |  212 +
 .../event_admin/private/src/event_impl.c        |  136 +
 .../event_admin/public/include/event_admin.h    |   70 +
 .../public/include/event_constants.h            |   60 +
 .../event_admin/public/include/event_handler.h  |   48 +
 .../event_admin/event_handler/CMakeLists.txt    |   35 +
 .../private/include/event_handler_impl.h        |   57 +
 .../private/src/event_handler_activator.c       |  104 +
 .../private/src/event_handler_impl.c            |  111 +
 .../event_admin/event_publisher/CMakeLists.txt  |   34 +
 .../private/include/event_publisher_impl.h      |   83 +
 .../private/src/event_publisher_activator.c     |   86 +
 .../private/src/event_publisher_impl.c          |  141 +
 bundles/log_service/CMakeLists.txt              |   59 +
 bundles/log_service/README.md                   |   19 +
 bundles/log_service/include/log_entry.h         |   55 +
 bundles/log_service/include/log_listener.h      |   43 +
 .../log_service/include/log_reader_service.h    |   50 +
 bundles/log_service/include/log_service.h       |   58 +
 .../log_service/loghelper_include/log_helper.h  |   36 +
 bundles/log_service/src/log.c                   |  375 +
 bundles/log_service/src/log.h                   |   48 +
 bundles/log_service/src/log_entry.c             |   94 +
 bundles/log_service/src/log_factory.c           |  100 +
 bundles/log_service/src/log_factory.h           |   40 +
 bundles/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 +
 bundles/log_service/src/log_service_activator.c |  198 +
 bundles/log_service/src/log_service_impl.c      |   96 +
 bundles/log_service/src/log_service_impl.h      |   39 +
 bundles/log_writer/CMakeLists.txt               |   24 +
 bundles/log_writer/README.md                    |   13 +
 bundles/log_writer/log_writer/CMakeLists.txt    |   24 +
 .../log_writer/log_writer/include/log_writer.h  |   53 +
 bundles/log_writer/log_writer/src/log_writer.c  |  122 +
 .../log_writer/src/log_writer_activator.c       |   57 +
 .../log_writer/log_writer_stdout/CMakeLists.txt |   41 +
 .../log_writer_stdout/src/log_writer_stdout.c   |   49 +
 .../log_writer/log_writer_syslog/CMakeLists.txt |   44 +
 .../private/src/log_writer_syslog.c             |   68 +
 bundles/pubsub/CMakeLists.txt                   |   46 +
 bundles/pubsub/README.md                        |   93 +
 bundles/pubsub/examples/CMakeLists.txt          |  247 +
 bundles/pubsub/examples/keys/README.md          |   36 +
 .../examples/keys/publisher/private/.gitkeep    |   14 +
 .../examples/keys/publisher/public/.gitkeep     |   16 +
 .../examples/keys/subscriber/private/.gitkeep   |   16 +
 .../examples/keys/subscriber/public/.gitkeep    |   16 +
 .../pubsub/examples/mp_pubsub/CMakeLists.txt    |   23 +
 .../examples/mp_pubsub/common/include/ew.h      |   53 +
 .../examples/mp_pubsub/common/include/ide.h     |   49 +
 .../mp_pubsub/common/include/kinematics.h       |   55 +
 .../mp_pubsub/msg_descriptors/msg_ew.descriptor |    9 +
 .../msg_descriptors/msg_ide.descriptor          |    9 +
 .../msg_descriptors/msg_kinematics.descriptor   |   10 +
 .../examples/mp_pubsub/publisher/CMakeLists.txt |   43 +
 .../private/include/mp_publisher_private.h      |   58 +
 .../publisher/private/src/mp_pub_activator.c    |  144 +
 .../publisher/private/src/mp_publisher.c        |  160 +
 .../mp_pubsub/subscriber/CMakeLists.txt         |   43 +
 .../private/include/mp_subscriber_private.h     |   50 +
 .../subscriber/private/src/mp_sub_activator.c   |  108 +
 .../subscriber/private/src/mp_subscriber.c      |  119 +
 bundles/pubsub/examples/pubsub/CMakeLists.txt   |   24 +
 .../pubsub/examples/pubsub/common/include/poi.h |   55 +
 .../pubsub/msg_descriptors/msg_poi1.descriptor  |   10 +
 .../pubsub/msg_descriptors/msg_poi2.descriptor  |   10 +
 .../pubsub/msg_descriptors/poi1.properties      |   35 +
 .../pubsub/msg_descriptors/poi2.properties      |   35 +
 .../examples/pubsub/publisher/CMakeLists.txt    |   49 +
 .../private/include/pubsub_publisher_private.h  |   60 +
 .../publisher/private/src/ps_pub_activator.c    |  147 +
 .../publisher/private/src/pubsub_publisher.c    |  172 +
 .../examples/pubsub/publisher2/CMakeLists.txt   |   51 +
 .../examples/pubsub/subscriber/CMakeLists.txt   |   50 +
 .../private/include/pubsub_subscriber_private.h |   51 +
 .../subscriber/private/src/ps_sub_activator.c   |  114 +
 .../subscriber/private/src/pubsub_subscriber.c  |   64 +
 bundles/pubsub/keygen/CMakeLists.txt            |   34 +
 bundles/pubsub/keygen/ed_file.c                 |  309 +
 bundles/pubsub/keygen/makecert.c                |   55 +
 bundles/pubsub/mock/CMakeLists.txt              |   41 +
 bundles/pubsub/mock/api/pubsub/publisher_mock.h |   43 +
 bundles/pubsub/mock/src/publisher_mock.cc       |   68 +
 bundles/pubsub/mock/tst/pubsubmock_test.cc      |   77 +
 bundles/pubsub/mock/tst/run_tests.cc            |   25 +
 .../pubsub/pubsub_admin_udp_mc/CMakeLists.txt   |   41 +
 bundles/pubsub/pubsub_admin_udp_mc/README.md    |   79 +
 .../pubsub/pubsub_admin_udp_mc/src/large_udp.c  |  372 +
 .../pubsub/pubsub_admin_udp_mc/src/large_udp.h  |   45 +
 .../pubsub_admin_udp_mc/src/psa_activator.c     |  141 +
 .../pubsub_admin_udp_mc/src/pubsub_admin_impl.c | 1160 +++
 .../pubsub_admin_udp_mc/src/pubsub_admin_impl.h |   97 +
 .../src/pubsub_psa_udpmc_constants.h            |   39 +
 .../pubsub_admin_udp_mc/src/topic_publication.c |  453 +
 .../pubsub_admin_udp_mc/src/topic_publication.h |   57 +
 .../src/topic_subscription.c                    |  635 ++
 .../src/topic_subscription.h                    |   60 +
 bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt  |   60 +
 .../pubsub/pubsub_admin_zmq/src/psa_activator.c |  186 +
 .../pubsub_admin_zmq/src/pubsub_admin_impl.c    | 1183 +++
 .../pubsub_admin_zmq/src/pubsub_admin_impl.h    |  113 +
 .../src/pubsub_psa_zmq_constants.h              |   48 +
 .../pubsub_admin_zmq/src/topic_publication.c    |  640 ++
 .../pubsub_admin_zmq/src/topic_publication.h    |   49 +
 .../pubsub_admin_zmq/src/topic_subscription.c   |  761 ++
 .../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 +
 bundles/pubsub/pubsub_api/CMakeLists.txt        |   32 +
 .../pubsub_api/include/pubsub/publisher.h       |   87 +
 .../pubsub_api/include/pubsub/subscriber.h      |   74 +
 bundles/pubsub/pubsub_discovery/CMakeLists.txt  |   40 +
 .../pubsub/pubsub_discovery/src/etcd_common.c   |   82 +
 .../pubsub/pubsub_discovery/src/etcd_common.h   |   28 +
 .../pubsub/pubsub_discovery/src/etcd_watcher.c  |  322 +
 .../pubsub/pubsub_discovery/src/etcd_watcher.h  |   38 +
 .../pubsub/pubsub_discovery/src/etcd_writer.c   |  217 +
 .../pubsub/pubsub_discovery/src/etcd_writer.h   |   39 +
 .../pubsub/pubsub_discovery/src/psd_activator.c |  170 +
 .../pubsub_discovery/src/pubsub_discovery.h     |   26 +
 .../src/pubsub_discovery_impl.c                 |  530 ++
 .../src/pubsub_discovery_impl.h                 |   77 +
 .../pubsub_serializer_json/CMakeLists.txt       |   38 +
 .../pubsub_serializer_json/src/ps_activator.c   |  108 +
 .../src/pubsub_serializer_impl.c                |  295 +
 .../src/pubsub_serializer_impl.h                |   55 +
 bundles/pubsub/pubsub_spi/CMakeLists.txt        |   36 +
 .../include/publisher_endpoint_announce.h       |   40 +
 .../pubsub/pubsub_spi/include/pubsub_admin.h    |   70 +
 .../pubsub_spi/include/pubsub_admin_match.h     |   47 +
 .../pubsub/pubsub_spi/include/pubsub_common.h   |   52 +
 .../pubsub_spi/include/pubsub_constants.h       |   30 +
 .../pubsub/pubsub_spi/include/pubsub_endpoint.h |   81 +
 .../pubsub_spi/include/pubsub_serializer.h      |   64 +
 .../include/pubsub_topic_info.descriptor        |   10 +
 .../pubsub/pubsub_spi/include/pubsub_utils.h    |   45 +
 .../pubsub/pubsub_spi/src/pubsub_admin_match.c  |  169 +
 bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c |  370 +
 bundles/pubsub/pubsub_spi/src/pubsub_utils.c    |  137 +
 .../pubsub_topology_manager/CMakeLists.txt      |   36 +
 .../src/pstm_activator.c                        |  244 +
 .../src/pubsub_topology_manager.c               |  784 ++
 .../src/pubsub_topology_manager.h               |   92 +
 bundles/pubsub/test/CMakeLists.txt              |  137 +
 .../pubsub/test/msg_descriptors/msg.descriptor  |    9 +
 .../pubsub/test/msg_descriptors/sync.descriptor |    9 +
 bundles/pubsub/test/test/msg.h                  |   31 +
 bundles/pubsub/test/test/sut_activator.c        |  115 +
 bundles/pubsub/test/test/sync.h                 |   29 +
 bundles/pubsub/test/test/tst_activator.cpp      |  221 +
 bundles/remote_services/CMakeLists.txt          |   40 +
 bundles/remote_services/README.md               |  166 +
 bundles/remote_services/civetweb/CMakeLists.txt |   26 +
 .../remote_services/civetweb/include/civetweb.h |  657 ++
 bundles/remote_services/civetweb/src/civetweb.c | 7907 ++++++++++++++++++
 bundles/remote_services/civetweb/src/md5.inl    |  461 +
 .../discovery_common/CMakeLists.txt             |   41 +
 .../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 +
 .../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         |   41 +
 .../discovery_configured/src/desc.xml           |   41 +
 .../discovery_configured/src/discovery_impl.c   |  123 +
 .../discovery_configured/src/discovery_impl.h   |   62 +
 .../discovery_etcd/CMakeLists.txt               |   50 +
 .../remote_services/discovery_etcd/README.md    |   29 +
 .../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 +
 .../discovery_shm/CMakeLists.txt                |   47 +
 .../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 +
 bundles/remote_services/examples/CMakeLists.txt |   62 +
 .../examples/calculator_api/CMakeLists.txt      |   22 +
 .../calculator_api/include/calculator_service.h |   56 +
 ...apache.celix.calc.api.Calculator2.descriptor |   11 +
 .../examples/calculator_service/CMakeLists.txt  |   29 +
 .../src/calculator_activator.c                  |  110 +
 .../calculator_service/src/calculator_impl.c    |   79 +
 .../calculator_service/src/calculator_impl.h    |   43 +
 .../examples/calculator_shell/CMakeLists.txt    |   36 +
 .../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_dfi/CMakeLists.txt     |   55 +
 .../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_shm/CMakeLists.txt     |   56 +
 .../include/remote_service_admin_shm_impl.h     |   92 +
 .../src/remote_service_admin_activator.c        |  123 +
 .../private/src/remote_service_admin_impl.c     |  924 ++
 .../private/test/CMakeLists.txt                 |   58 +
 .../private/test/client.properties.in           |   25 +
 .../private/test/rsa_client_server_tests.cpp    |  496 ++
 .../private/test/run_tests.cpp                  |   24 +
 .../private/test/server.properties.in           |   25 +
 .../public/include/remote_service_admin_shm.h   |   35 +
 .../remote_services_api/CMakeLists.txt          |   28 +
 .../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 +
 bundles/remote_services/rsa_spi/CMakeLists.txt  |   29 +
 bundles/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 +
 .../rsa_spi/include/remote_proxy.h              |   76 +
 .../rsa_spi/include/remote_service_admin.h      |   73 +
 .../topology_manager/CMakeLists.txt             |   47 +
 .../remote_services/topology_manager/README.md  |   23 +
 .../topology_manager/include/tm_scope.h         |   46 +
 .../topology_manager/src/activator.c            |  289 +
 .../topology_manager/src/scope.c                |  326 +
 .../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     |   75 +
 .../tms_tst/bundle/CMakeLists.txt               |   35 +
 .../org.apache.celix.test.MyBundle.descriptor   |    9 +
 .../tms_tst/bundle/tst_activator.c              |  141 +
 .../tms_tst/bundle/tst_service.h                |   32 +
 .../tms_tst/disc_mock/CMakeLists.txt            |   28 +
 .../tms_tst/disc_mock/disc_mock_activator.c     |  149 +
 .../tms_tst/disc_mock/disc_mock_service.c       |   61 +
 .../tms_tst/disc_mock/disc_mock_service.h       |   56 +
 .../topology_manager/tms_tst/run_tests.cpp      |   24 +
 .../topology_manager/tms_tst/scope.json         |   15 +
 .../topology_manager/tms_tst/scope2.json        |   22 +
 .../topology_manager/tms_tst/scope3.json        |   28 +
 .../topology_manager/tms_tst/scope4.json        |   21 +
 .../topology_manager/tms_tst/tms_tests.cpp      |  736 ++
 bundles/shell/CMakeLists.txt                    |   21 +
 bundles/shell/remote_shell/CMakeLists.txt       |   44 +
 bundles/shell/remote_shell/README.md            |   27 +
 bundles/shell/remote_shell/src/activator.c      |  153 +
 .../remote_shell/src/connection_listener.c      |  221 +
 .../remote_shell/src/connection_listener.h      |   42 +
 bundles/shell/remote_shell/src/remote_shell.c   |  242 +
 bundles/shell/remote_shell/src/remote_shell.h   |   50 +
 bundles/shell/remote_shell/src/shell_mediator.c |  139 +
 bundles/shell/remote_shell/src/shell_mediator.h |   54 +
 bundles/shell/shell/CMakeLists.txt              |   56 +
 bundles/shell/shell/README.md                   |   51 +
 bundles/shell/shell/include/command.h           |   58 +
 .../shell/shell/include/dm_shell_list_command.h |   42 +
 bundles/shell/shell/include/shell.h             |   51 +
 bundles/shell/shell/include/shell_constants.h   |   27 +
 bundles/shell/shell/src/activator.c             |  273 +
 bundles/shell/shell/src/dm_shell_list_command.c |  192 +
 bundles/shell/shell/src/help_command.c          |  112 +
 bundles/shell/shell/src/inspect_command.c       |  277 +
 bundles/shell/shell/src/install_command.c       |   76 +
 bundles/shell/shell/src/lb_command.c            |  205 +
 bundles/shell/shell/src/log_command.c           |   94 +
 bundles/shell/shell/src/shell.c                 |  305 +
 bundles/shell/shell/src/shell_private.h         |   51 +
 bundles/shell/shell/src/start_command.c         |   84 +
 bundles/shell/shell/src/std_commands.h          |   46 +
 bundles/shell/shell/src/stop_command.c          |   82 +
 bundles/shell/shell/src/uninstall_command.c     |   58 +
 bundles/shell/shell/src/update_command.c        |  117 +
 bundles/shell/shell_bonjour/CMakeLists.txt      |   51 +
 .../private/include/bonjour_shell.h             |   43 +
 .../shell/shell_bonjour/private/src/activator.c |  110 +
 .../shell_bonjour/private/src/bonjour_shell.c   |  445 +
 bundles/shell/shell_tui/CMakeLists.txt          |   40 +
 bundles/shell/shell_tui/README.md               |   34 +
 .../shell/shell_tui/private/include/history.h   |   39 +
 .../shell/shell_tui/private/include/shell_tui.h |   44 +
 bundles/shell/shell_tui/private/src/activator.c |  133 +
 bundles/shell/shell_tui/private/src/history.c   |   80 +
 bundles/shell/shell_tui/private/src/shell_tui.c |  464 +
 config_admin/CMakeLists.txt                     |   61 -
 config_admin/config_admin_tst/CMakeLists.txt    |   47 -
 .../config_admin_tst/config.properties.in       |   20 -
 .../config_admin_tst/config_admin_test.cpp      |  404 -
 .../example_test/CMakeLists.txt                 |   31 -
 .../example_test/META-INF/MANIFEST.MF           |    5 -
 .../include/example_managed_service_impl.h      |   68 -
 .../example_test/private/src/activator.c        |  207 -
 .../private/src/example_managed_service_impl.c  |  103 -
 .../example_test2/CMakeLists.txt                |   30 -
 .../example_test2/META-INF/MANIFEST.MF          |    5 -
 .../include/example2_managed_service_impl.h     |   66 -
 .../example_test2/private/src/activator.c       |  227 -
 .../private/src/example_managed_service_impl.c  |  108 -
 config_admin/example/CMakeLists.txt             |   25 -
 config_admin/example/private/include/example.h  |   18 -
 .../example/private/src/bundle_activator.c      |   75 -
 config_admin/example/private/src/example.c      |   59 -
 config_admin/readme.md                          |   54 -
 config_admin/service/CMakeLists.txt             |   36 -
 config_admin/service/META-INF/MANIFEST.MF       |    6 -
 .../include/configuration_admin_factory.h       |   65 -
 .../private/include/configuration_admin_impl.h  |   68 -
 .../private/include/configuration_impl.h        |   72 -
 .../private/include/configuration_store.h       |   65 -
 .../service/private/include/framework_patch.h   |   39 -
 .../private/include/managed_service_tracker.h   |   60 -
 .../private/include/updated_thread_pool.h       |   52 -
 config_admin/service/private/src/activator.c    |  136 -
 .../private/src/configuration_admin_factory.c   |  211 -
 .../private/src/configuration_admin_impl.c      |  208 -
 .../service/private/src/configuration_impl.c    |  683 --
 .../service/private/src/configuration_store.c   |  417 -
 .../service/private/src/managed_service_impl.c  |   55 -
 .../private/src/managed_service_tracker.c       |  598 --
 .../service/private/src/updated_thread_pool.c   |  146 -
 .../service/public/include/configuration.h      |   80 -
 .../public/include/configuration_admin.h        |   64 -
 .../public/include/configuration_event.h        |   57 -
 .../public/include/configuration_listener.h     |   57 -
 .../public/include/configuration_plugin.h       |   62 -
 .../service/public/include/managed_service.h    |   54 -
 dependency_manager/CMakeLists.txt               |   51 -
 dependency_manager/api/dm_activator.h           |   63 -
 dependency_manager/doc-images/statediagram.png  |  Bin 7895 -> 0 bytes
 dependency_manager/readme.md                    |  153 -
 dependency_manager/src/dm_activator.c           |   41 -
 dependency_manager/todo.md                      |    7 -
 dependency_manager_cxx/CMakeLists.txt           |   35 -
 dependency_manager_cxx/readme.md                |   84 -
 dependency_manager_cxx/src/dm_activator.cc      |   91 -
 dependency_manager_cxx/todo.md                  |    9 -
 deployment_admin/CMakeLists.txt                 |   72 -
 deployment_admin/README.md                      |   41 -
 deployment_admin/api/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/CMakeLists.txt                    |   25 -
 device_access/README.md                         |   34 -
 device_access/device_access/CMakeLists.txt      |   50 -
 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 -
 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     |   32 -
 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            |   32 -
 .../example/base_driver/CMakeLists.txt          |   28 -
 device_access/example/base_driver/README.txt    |   23 -
 .../base_driver/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     |   29 -
 .../example/consuming_driver/README.txt         |   23 -
 .../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      |   29 -
 .../example/refining_driver/README.txt          |   22 -
 .../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                              |   83 -
 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/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 -
 .../getting_started/using_services_with_c.md    |    2 +-
 .../getting_started/using_services_with_cxx.md  |    4 +-
 documents/intro/readme.md                       |   10 +-
 documents/subprojects/readme.md                 |   40 +-
 etcdlib/CMakeLists.txt                          |   88 -
 etcdlib/README.md                               |   88 -
 etcdlib/api/etcd.h                              |  110 -
 etcdlib/cmake/FindJansson.cmake                 |   42 -
 etcdlib/src/etcd.c                              |  546 --
 etcdlib/test/etcdlib_test.c                     |  116 -
 event_admin/CMakeLists.txt                      |   43 -
 event_admin/event_admin/CMakeLists.txt          |   39 -
 .../private/include/event_admin_impl.h          |  169 -
 .../private/src/event_admin_activator.c         |  136 -
 .../event_admin/private/src/event_admin_impl.c  |  212 -
 .../event_admin/private/src/event_impl.c        |  136 -
 .../event_admin/public/include/event_admin.h    |   70 -
 .../public/include/event_constants.h            |   60 -
 .../event_admin/public/include/event_handler.h  |   48 -
 event_admin/event_handler/CMakeLists.txt        |   35 -
 .../private/include/event_handler_impl.h        |   57 -
 .../private/src/event_handler_activator.c       |  104 -
 .../private/src/event_handler_impl.c            |  111 -
 event_admin/event_publisher/CMakeLists.txt      |   34 -
 .../private/include/event_publisher_impl.h      |   83 -
 .../private/src/event_publisher_activator.c     |   86 -
 .../private/src/event_publisher_impl.c          |  141 -
 framework/CMakeLists.txt                        |  357 -
 framework/include/archive.h                     |   58 -
 framework/include/bundle.h                      |  140 -
 framework/include/bundle_activator.h            |  127 -
 framework/include/bundle_archive.h              |   93 -
 framework/include/bundle_context.h              |  171 -
 framework/include/bundle_event.h                |   65 -
 framework/include/bundle_listener.h             |   49 -
 framework/include/bundle_revision.h             |  142 -
 framework/include/bundle_state.h                |   50 -
 framework/include/capability.h                  |   54 -
 framework/include/celix/dm/Component.h          |  234 -
 framework/include/celix/dm/Component_Impl.h     |  320 -
 framework/include/celix/dm/DependencyManager.h  |  150 -
 .../include/celix/dm/DependencyManager_Impl.h   |   47 -
 framework/include/celix/dm/DmActivator.h        |   97 -
 framework/include/celix/dm/Properties.h         |   30 -
 framework/include/celix/dm/ServiceDependency.h  |  326 -
 .../include/celix/dm/ServiceDependency_Impl.h   |  449 -
 framework/include/celix/dm/types.h              |   90 -
 framework/include/celix_api.h                   |   52 -
 framework/include/celix_bundle.h                |   62 -
 framework/include/celix_bundle_context.h        |  740 --
 framework/include/celix_framework.h             |   58 -
 framework/include/celix_framework_factory.h     |   41 -
 framework/include/celix_launcher.h              |  116 -
 framework/include/celix_log.h                   |   85 -
 framework/include/celix_service_factory.h       |   44 -
 framework/include/celix_types.h                 |   53 -
 framework/include/constants.h                   |   79 -
 framework/include/dm_activator.h                |   67 -
 framework/include/dm_component.h                |  158 -
 framework/include/dm_dependency_manager.h       |   83 -
 framework/include/dm_info.h                     |   76 -
 framework/include/dm_service_dependency.h       |  172 -
 framework/include/framework.h                   |   65 -
 framework/include/framework_event.h             |   71 -
 framework/include/framework_exports.h           |   65 -
 framework/include/framework_listener.h          |   55 -
 framework/include/listener_hook_service.h       |   59 -
 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             |   44 -
 framework/include/service_listener.h            |   55 -
 framework/include/service_reference.h           |   75 -
 framework/include/service_registration.h        |   57 -
 framework/include/service_registry.h            |  115 -
 framework/include/service_tracker.h             |  142 -
 framework/include/service_tracker_customizer.h  |   78 -
 framework/include/wire.h                        |  120 -
 .../private/integration-test/CMakeLists.txt     |   19 -
 .../test_bundle1/CMakeLists.txt                 |   20 -
 .../test_bundle1/src/activator.c                |   78 -
 .../test_launcher/CMakeLists.txt                |   22 -
 .../test_launcher/src/launcher.c                |   94 -
 framework/private/mock/attribute_mock.c         |   59 -
 framework/private/mock/bundle_archive_mock.c    |  164 -
 framework/private/mock/bundle_cache_mock.c      |   66 -
 framework/private/mock/bundle_context_mock.c    |  363 -
 framework/private/mock/bundle_mock.c            |  294 -
 framework/private/mock/bundle_revision_mock.c   |   79 -
 framework/private/mock/capability_mock.c        |   67 -
 framework/private/mock/celix_log_mock.c         |   99 -
 .../private/mock/dm_dependency_manager_mock.c   |   41 -
 framework/private/mock/filter_mock.c            |   54 -
 framework/private/mock/framework_mock.c         |  346 -
 framework/private/mock/manifest_mock.c          |   79 -
 framework/private/mock/manifest_parser_mock.c   |   74 -
 framework/private/mock/miniunz_mock.c           |   38 -
 framework/private/mock/module_mock.c            |  147 -
 framework/private/mock/properties_mock.c        |   73 -
 framework/private/mock/requirement_mock.c       |   65 -
 framework/private/mock/resolver_mock.c          |   50 -
 framework/private/mock/service_reference_mock.c |  185 -
 .../private/mock/service_registration_mock.c    |  164 -
 framework/private/mock/service_registry_mock.c  |  184 -
 .../mock/service_tracker_customizer_mock.c      |   86 -
 framework/private/mock/version_mock.c           |  111 -
 framework/private/mock/version_range_mock.c     |   68 -
 framework/private/mock/wire_mock.c              |   74 -
 framework/private/resources-test/NOTE           |   24 -
 framework/private/resources-test/manifest.txt   |    4 -
 .../resources-test/manifest_sections.txt        |   17 -
 framework/private/test/attribute_test.cpp       |  120 -
 framework/private/test/bundle_archive_test.cpp  |  312 -
 framework/private/test/bundle_cache_test.cpp    |  160 -
 framework/private/test/bundle_context_test.cpp  |  620 --
 framework/private/test/bundle_revision_test.cpp |  157 -
 framework/private/test/bundle_test.cpp          | 1053 ---
 framework/private/test/capability_test.cpp      |  162 -
 .../private/test/celix_errorcodes_test.cpp      |   87 -
 framework/private/test/filter_test.cpp          |  574 --
 framework/private/test/framework_test.c         |  148 -
 framework/private/test/framework_test.cpp       |  111 -
 framework/private/test/manifest_parser_test.cpp |  254 -
 framework/private/test/manifest_test.cpp        |  214 -
 framework/private/test/module_test.cpp          |  396 -
 framework/private/test/requirement_test.cpp     |  178 -
 framework/private/test/resolver_test.cpp        |  352 -
 .../private/test/service_reference_test.cpp     |  796 --
 .../private/test/service_registration_test.cpp  |  420 -
 .../private/test/service_registry_test.cpp      | 1112 ---
 .../test/service_tracker_customizer_test.cpp    |  171 -
 framework/private/test/service_tracker_test.cpp | 1074 ---
 framework/private/test/wire_test.cpp            |   99 -
 framework/src/attribute.c                       |   71 -
 framework/src/attribute.h                       |   39 -
 framework/src/attribute_private.h               |   39 -
 framework/src/bundle.c                          |  725 --
 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                  |  958 ---
 framework/src/bundle_context_private.h          |   69 -
 framework/src/bundle_private.h                  |   43 -
 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_framework_factory.c         |   40 -
 framework/src/celix_launcher.c                  |  229 -
 framework/src/celix_log.c                       |   83 -
 framework/src/dm_component_impl.c               | 1451 ----
 framework/src/dm_component_impl.h               |   48 -
 framework/src/dm_dependency.h                   |   41 -
 framework/src/dm_dependency_manager_impl.c      |  139 -
 framework/src/dm_dependency_manager_impl.h      |   45 -
 framework/src/dm_event.c                        |  105 -
 framework/src/dm_event.h                        |   72 -
 framework/src/dm_service_dependency.c           |  811 --
 framework/src/dm_service_dependency_impl.h      |  104 -
 framework/src/framework.c                       | 2795 -------
 framework/src/framework_private.h               |  164 -
 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               |  383 -
 framework/src/service_reference_private.h       |   69 -
 framework/src/service_registration.c            |  314 -
 framework/src/service_registration_private.h    |   87 -
 framework/src/service_registry.c                |  817 --
 framework/src/service_registry_private.h        |   67 -
 framework/src/service_tracker.c                 |  743 --
 framework/src/service_tracker_customizer.c      |  107 -
 .../src/service_tracker_customizer_private.h    |   49 -
 framework/src/service_tracker_private.h         |   78 -
 framework/src/unzip.c                           | 2128 -----
 framework/src/unzip.h                           |  437 -
 framework/src/wire.c                            |   87 -
 framework/tst/CMakeLists.txt                    |   39 -
 framework/tst/bundle_context_bundles_tests.cpp  |  235 -
 framework/tst/bundle_context_services_test.cpp  |  692 --
 framework/tst/config.properties.in              |   20 -
 framework/tst/framework1.properties.in          |   21 -
 framework/tst/framework2.properties.in          |   21 -
 framework/tst/multiple_frameworks_test.cpp      |  103 -
 framework/tst/run_tests.cpp                     |   24 -
 framework/tst/single_framework_test.cpp         |  132 -
 launcher/CMakeLists.txt                         |   39 -
 launcher/README.md                              |   50 -
 launcher/src/main.c                             |   24 -
 libs/CMakeLists.txt                             |   31 +
 libs/dependency_manager/CMakeLists.txt          |   51 +
 libs/dependency_manager/api/dm_activator.h      |   63 +
 .../doc-images/statediagram.png                 |  Bin 0 -> 7895 bytes
 libs/dependency_manager/readme.md               |  153 +
 libs/dependency_manager/src/dm_activator.c      |   41 +
 libs/dependency_manager/todo.md                 |    7 +
 libs/dependency_manager_cxx/CMakeLists.txt      |   35 +
 libs/dependency_manager_cxx/readme.md           |   84 +
 libs/dependency_manager_cxx/src/dm_activator.cc |   91 +
 libs/dependency_manager_cxx/todo.md             |    9 +
 libs/dfi/CMakeLists.txt                         |   77 +
 libs/dfi/include/dfi_log_util.h                 |   63 +
 libs/dfi/include/dyn_common.h                   |   47 +
 libs/dfi/include/dyn_function.h                 |   60 +
 libs/dfi/include/dyn_interface.h                |   66 +
 libs/dfi/include/dyn_message.h                  |   56 +
 libs/dfi/include/dyn_type.h                     |  155 +
 libs/dfi/include/json_rpc.h                     |   37 +
 libs/dfi/include/json_serializer.h              |   37 +
 libs/dfi/src/dyn_common.c                       |  151 +
 libs/dfi/src/dyn_function.c                     |  331 +
 libs/dfi/src/dyn_interface.c                    |  444 +
 libs/dfi/src/dyn_message.c                      |  358 +
 libs/dfi/src/dyn_type.c                         | 1160 +++
 libs/dfi/src/json_rpc.c                         |  341 +
 libs/dfi/src/json_serializer.c                  |  484 ++
 .../test/avro_descriptor_translator_tests.cpp   |  180 +
 libs/dfi/test/descriptors/example1.descriptor   |   13 +
 libs/dfi/test/descriptors/example2.descriptor   |    9 +
 libs/dfi/test/descriptors/example3.descriptor   |   11 +
 libs/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 +
 .../test/descriptors/msg_example1.descriptor    |   10 +
 .../test/descriptors/msg_example2.descriptor    |   12 +
 .../test/descriptors/msg_example3.descriptor    |   10 +
 .../test/descriptors/msg_example4.descriptor    |   10 +
 libs/dfi/test/dyn_closure_tests.cpp             |  162 +
 libs/dfi/test/dyn_function_tests.cpp            |  274 +
 libs/dfi/test/dyn_interface_tests.cpp           |  207 +
 libs/dfi/test/dyn_message_tests.cpp             |  253 +
 libs/dfi/test/dyn_type_tests.cpp                |  297 +
 libs/dfi/test/json_rpc_tests.cpp                |  433 +
 libs/dfi/test/json_serializer_tests.cpp         |  558 ++
 libs/dfi/test/run_tests.cpp                     |   24 +
 libs/dfi/test/schemas/complex.avdl              |   30 +
 libs/dfi/test/schemas/complex.avpr              |   55 +
 libs/dfi/test/schemas/invalid1.avpr             |   47 +
 libs/dfi/test/schemas/invalid2.avpr             |   49 +
 libs/dfi/test/schemas/simple.avdl               |   24 +
 libs/dfi/test/schemas/simple.avpr               |   51 +
 libs/dfi/test/schemas/simple_min.avpr           |   19 +
 libs/etcdlib/CMakeLists.txt                     |   88 +
 libs/etcdlib/README.md                          |   88 +
 libs/etcdlib/api/etcd.h                         |  110 +
 libs/etcdlib/cmake/FindJansson.cmake            |   42 +
 libs/etcdlib/src/etcd.c                         |  546 ++
 libs/etcdlib/test/etcdlib_test.c                |  116 +
 libs/framework/CMakeLists.txt                   |  357 +
 libs/framework/include/archive.h                |   58 +
 libs/framework/include/bundle.h                 |  140 +
 libs/framework/include/bundle_activator.h       |  127 +
 libs/framework/include/bundle_archive.h         |   93 +
 libs/framework/include/bundle_context.h         |  171 +
 libs/framework/include/bundle_event.h           |   65 +
 libs/framework/include/bundle_listener.h        |   49 +
 libs/framework/include/bundle_revision.h        |  142 +
 libs/framework/include/bundle_state.h           |   50 +
 libs/framework/include/capability.h             |   54 +
 libs/framework/include/celix/dm/Component.h     |  234 +
 .../framework/include/celix/dm/Component_Impl.h |  320 +
 .../include/celix/dm/DependencyManager.h        |  150 +
 .../include/celix/dm/DependencyManager_Impl.h   |   47 +
 libs/framework/include/celix/dm/DmActivator.h   |   97 +
 libs/framework/include/celix/dm/Properties.h    |   30 +
 .../include/celix/dm/ServiceDependency.h        |  326 +
 .../include/celix/dm/ServiceDependency_Impl.h   |  449 +
 libs/framework/include/celix/dm/types.h         |   90 +
 libs/framework/include/celix_api.h              |   52 +
 libs/framework/include/celix_bundle.h           |   62 +
 libs/framework/include/celix_bundle_context.h   |  735 ++
 libs/framework/include/celix_framework.h        |   58 +
 .../framework/include/celix_framework_factory.h |   41 +
 libs/framework/include/celix_launcher.h         |  116 +
 libs/framework/include/celix_log.h              |   85 +
 libs/framework/include/celix_service_factory.h  |   44 +
 libs/framework/include/celix_types.h            |   53 +
 libs/framework/include/constants.h              |   79 +
 libs/framework/include/dm_activator.h           |   67 +
 libs/framework/include/dm_component.h           |  158 +
 libs/framework/include/dm_dependency_manager.h  |   83 +
 libs/framework/include/dm_info.h                |   76 +
 libs/framework/include/dm_service_dependency.h  |  172 +
 libs/framework/include/framework.h              |   65 +
 libs/framework/include/framework_event.h        |   71 +
 libs/framework/include/framework_exports.h      |   65 +
 libs/framework/include/framework_listener.h     |   55 +
 libs/framework/include/listener_hook_service.h  |   59 +
 libs/framework/include/manifest.h               |   67 +
 libs/framework/include/module.h                 |   94 +
 libs/framework/include/requirement.h            |   53 +
 libs/framework/include/service_event.h          |   68 +
 libs/framework/include/service_factory.h        |   44 +
 libs/framework/include/service_listener.h       |   55 +
 libs/framework/include/service_reference.h      |   75 +
 libs/framework/include/service_registration.h   |   57 +
 libs/framework/include/service_registry.h       |  115 +
 libs/framework/include/service_tracker.h        |  142 +
 .../include/service_tracker_customizer.h        |   78 +
 libs/framework/include/wire.h                   |  120 +
 .../private/integration-test/CMakeLists.txt     |   19 +
 .../test_bundle1/CMakeLists.txt                 |   20 +
 .../test_bundle1/src/activator.c                |   78 +
 .../test_launcher/CMakeLists.txt                |   22 +
 .../test_launcher/src/launcher.c                |   94 +
 libs/framework/private/mock/attribute_mock.c    |   59 +
 .../private/mock/bundle_archive_mock.c          |  164 +
 libs/framework/private/mock/bundle_cache_mock.c |   66 +
 .../private/mock/bundle_context_mock.c          |  363 +
 libs/framework/private/mock/bundle_mock.c       |  294 +
 .../private/mock/bundle_revision_mock.c         |   79 +
 libs/framework/private/mock/capability_mock.c   |   67 +
 libs/framework/private/mock/celix_log_mock.c    |   99 +
 .../private/mock/dm_dependency_manager_mock.c   |   41 +
 libs/framework/private/mock/filter_mock.c       |   54 +
 libs/framework/private/mock/framework_mock.c    |  346 +
 libs/framework/private/mock/manifest_mock.c     |   79 +
 .../private/mock/manifest_parser_mock.c         |   74 +
 libs/framework/private/mock/miniunz_mock.c      |   38 +
 libs/framework/private/mock/module_mock.c       |  147 +
 libs/framework/private/mock/properties_mock.c   |   73 +
 libs/framework/private/mock/requirement_mock.c  |   65 +
 libs/framework/private/mock/resolver_mock.c     |   50 +
 .../private/mock/service_reference_mock.c       |  185 +
 .../private/mock/service_registration_mock.c    |  164 +
 .../private/mock/service_registry_mock.c        |  184 +
 .../mock/service_tracker_customizer_mock.c      |   86 +
 libs/framework/private/mock/version_mock.c      |  111 +
 .../framework/private/mock/version_range_mock.c |   68 +
 libs/framework/private/mock/wire_mock.c         |   74 +
 libs/framework/private/resources-test/NOTE      |   24 +
 .../private/resources-test/manifest.txt         |    4 +
 .../resources-test/manifest_sections.txt        |   17 +
 libs/framework/private/test/attribute_test.cpp  |  120 +
 .../private/test/bundle_archive_test.cpp        |  312 +
 .../private/test/bundle_cache_test.cpp          |  160 +
 .../private/test/bundle_context_test.cpp        |  620 ++
 .../private/test/bundle_revision_test.cpp       |  157 +
 libs/framework/private/test/bundle_test.cpp     | 1053 +++
 libs/framework/private/test/capability_test.cpp |  162 +
 .../private/test/celix_errorcodes_test.cpp      |   87 +
 libs/framework/private/test/filter_test.cpp     |  574 ++
 libs/framework/private/test/framework_test.c    |  148 +
 libs/framework/private/test/framework_test.cpp  |  111 +
 .../private/test/manifest_parser_test.cpp       |  254 +
 libs/framework/private/test/manifest_test.cpp   |  214 +
 libs/framework/private/test/module_test.cpp     |  396 +
 .../framework/private/test/requirement_test.cpp |  178 +
 libs/framework/private/test/resolver_test.cpp   |  352 +
 .../private/test/service_reference_test.cpp     |  796 ++
 .../private/test/service_registration_test.cpp  |  420 +
 .../private/test/service_registry_test.cpp      | 1112 +++
 .../test/service_tracker_customizer_test.cpp    |  171 +
 .../private/test/service_tracker_test.cpp       | 1074 +++
 libs/framework/private/test/wire_test.cpp       |   99 +
 libs/framework/src/attribute.c                  |   71 +
 libs/framework/src/attribute.h                  |   39 +
 libs/framework/src/attribute_private.h          |   39 +
 libs/framework/src/bundle.c                     |  725 ++
 libs/framework/src/bundle_archive.c             |  792 ++
 libs/framework/src/bundle_cache.c               |  218 +
 libs/framework/src/bundle_cache.h               |  115 +
 libs/framework/src/bundle_cache_private.h       |   39 +
 libs/framework/src/bundle_context.c             |  958 +++
 libs/framework/src/bundle_context_private.h     |   69 +
 libs/framework/src/bundle_private.h             |   43 +
 libs/framework/src/bundle_revision.c            |  153 +
 libs/framework/src/bundle_revision_private.h    |   42 +
 libs/framework/src/capability.c                 |  100 +
 libs/framework/src/capability_private.h         |   41 +
 libs/framework/src/celix_errorcodes.c           |   64 +
 libs/framework/src/celix_framework_factory.c    |   40 +
 libs/framework/src/celix_launcher.c             |  229 +
 libs/framework/src/celix_log.c                  |   83 +
 libs/framework/src/dm_component_impl.c          | 1451 ++++
 libs/framework/src/dm_component_impl.h          |   48 +
 libs/framework/src/dm_dependency.h              |   41 +
 libs/framework/src/dm_dependency_manager_impl.c |  139 +
 libs/framework/src/dm_dependency_manager_impl.h |   45 +
 libs/framework/src/dm_event.c                   |  105 +
 libs/framework/src/dm_event.h                   |   72 +
 libs/framework/src/dm_service_dependency.c      |  811 ++
 libs/framework/src/dm_service_dependency_impl.h |  104 +
 libs/framework/src/framework.c                  | 2795 +++++++
 libs/framework/src/framework_private.h          |  164 +
 libs/framework/src/ioapi.c                      |  235 +
 libs/framework/src/ioapi.h                      |  200 +
 libs/framework/src/iowin32.c                    |  389 +
 libs/framework/src/iowin32.h                    |   28 +
 libs/framework/src/listener_hook_info_impl.h    |   34 +
 libs/framework/src/manifest.c                   |  271 +
 libs/framework/src/manifest_parser.c            |  490 ++
 libs/framework/src/manifest_parser.h            |   45 +
 libs/framework/src/miniunz.c                    |  382 +
 libs/framework/src/module.c                     |  281 +
 libs/framework/src/registry_callback_private.h  |   42 +
 libs/framework/src/requirement.c                |  114 +
 libs/framework/src/requirement_private.h        |   40 +
 libs/framework/src/resolver.c                   |  495 ++
 libs/framework/src/resolver.h                   |   45 +
 libs/framework/src/service_reference.c          |  383 +
 libs/framework/src/service_reference_private.h  |   69 +
 libs/framework/src/service_registration.c       |  314 +
 .../src/service_registration_private.h          |   87 +
 libs/framework/src/service_registry.c           |  817 ++
 libs/framework/src/service_registry_private.h   |   67 +
 libs/framework/src/service_tracker.c            |  743 ++
 libs/framework/src/service_tracker_customizer.c |  107 +
 .../src/service_tracker_customizer_private.h    |   49 +
 libs/framework/src/service_tracker_private.h    |   78 +
 libs/framework/src/unzip.c                      | 2128 +++++
 libs/framework/src/unzip.h                      |  437 +
 libs/framework/src/wire.c                       |   87 +
 libs/framework/tst/CMakeLists.txt               |   39 +
 .../tst/bundle_context_bundles_tests.cpp        |  235 +
 .../tst/bundle_context_services_test.cpp        |  692 ++
 libs/framework/tst/config.properties.in         |   20 +
 libs/framework/tst/framework1.properties.in     |   21 +
 libs/framework/tst/framework2.properties.in     |   21 +
 libs/framework/tst/multiple_frameworks_test.cpp |  103 +
 libs/framework/tst/run_tests.cpp                |   24 +
 libs/framework/tst/single_framework_test.cpp    |  132 +
 libs/launcher/CMakeLists.txt                    |   39 +
 libs/launcher/README.md                         |   50 +
 libs/launcher/src/main.c                        |   24 +
 libs/utils/CMakeLists.txt                       |  119 +
 libs/utils/README.md                            |   29 +
 libs/utils/docs/thpool/Design.md                |   52 +
 libs/utils/docs/thpool/FAQ.md                   |   33 +
 libs/utils/docs/thpool/README.md                |   62 +
 libs/utils/include/array_list.h                 |  116 +
 libs/utils/include/celix_array_list.h           |   80 +
 libs/utils/include/celix_errno.h                |  119 +
 libs/utils/include/celix_filter.h               |   81 +
 libs/utils/include/celix_properties.h           |   78 +
 libs/utils/include/celix_threads.h              |  135 +
 libs/utils/include/celix_utils_api.h            |   34 +
 libs/utils/include/celixbool.h                  |   61 +
 libs/utils/include/exports.h                    |   49 +
 libs/utils/include/filter.h                     |   51 +
 libs/utils/include/hash_map.h                   |  161 +
 libs/utils/include/linked_list.h                |   91 +
 libs/utils/include/linked_list_iterator.h       |   66 +
 libs/utils/include/memstream/README.md          |   49 +
 libs/utils/include/memstream/fmemopen.h         |   52 +
 libs/utils/include/memstream/open_memstream.h   |   15 +
 libs/utils/include/properties.h                 |   72 +
 libs/utils/include/thpool.h                     |  168 +
 libs/utils/include/utils.h                      |   61 +
 libs/utils/include/version.h                    |  186 +
 libs/utils/include/version_range.h              |  160 +
 .../utils/private/resources-test/properties.txt |   26 +
 libs/utils/private/test/array_list_test.cpp     |  579 ++
 libs/utils/private/test/celix_threads_test.cpp  |  531 ++
 libs/utils/private/test/filter_test.cpp         |  537 ++
 libs/utils/private/test/hash_map_test.cpp       | 1492 ++++
 libs/utils/private/test/linked_list_test.cpp    |  794 ++
 libs/utils/private/test/properties_test.cpp     |  130 +
 libs/utils/private/test/thread_pool_test.cpp    |  118 +
 libs/utils/private/test/utils_test.cpp          |  300 +
 libs/utils/private/test/version_range_test.cpp  |  254 +
 libs/utils/private/test/version_test.cpp        |  388 +
 libs/utils/src/array_list.c                     |  460 +
 libs/utils/src/array_list_private.h             |   53 +
 libs/utils/src/celix_threads.c                  |  184 +
 libs/utils/src/filter.c                         |  724 ++
 libs/utils/src/hash_map.c                       |  607 ++
 libs/utils/src/hash_map_private.h               |   74 +
 libs/utils/src/linked_list.c                    |  268 +
 libs/utils/src/linked_list_iterator.c           |  153 +
 libs/utils/src/linked_list_private.h            |   44 +
 libs/utils/src/memstream/fmemopen.c             |   76 +
 libs/utils/src/memstream/open_memstream.c       |  130 +
 libs/utils/src/properties.c                     |  405 +
 libs/utils/src/thpool.c                         |  535 ++
 libs/utils/src/utils.c                          |  141 +
 libs/utils/src/version.c                        |  264 +
 libs/utils/src/version_private.h                |   41 +
 libs/utils/src/version_range.c                  |  233 +
 libs/utils/src/version_range_private.h          |   41 +
 log_service/CMakeLists.txt                      |   59 -
 log_service/README.md                           |   19 -
 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/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                       |   24 -
 log_writer/README.md                            |   13 -
 log_writer/log_writer/CMakeLists.txt            |   24 -
 log_writer/log_writer/include/log_writer.h      |   53 -
 log_writer/log_writer/src/log_writer.c          |  122 -
 .../log_writer/src/log_writer_activator.c       |   57 -
 log_writer/log_writer_stdout/CMakeLists.txt     |   41 -
 .../log_writer_stdout/src/log_writer_stdout.c   |   49 -
 log_writer/log_writer_syslog/CMakeLists.txt     |   44 -
 .../private/src/log_writer_syslog.c             |   68 -
 pubsub/CMakeLists.txt                           |   46 -
 pubsub/README.md                                |   93 -
 pubsub/examples/CMakeLists.txt                  |  247 -
 pubsub/examples/keys/README.md                  |   36 -
 pubsub/examples/keys/publisher/private/.gitkeep |   14 -
 pubsub/examples/keys/publisher/public/.gitkeep  |   16 -
 .../examples/keys/subscriber/private/.gitkeep   |   16 -
 pubsub/examples/keys/subscriber/public/.gitkeep |   16 -
 pubsub/examples/mp_pubsub/CMakeLists.txt        |   23 -
 pubsub/examples/mp_pubsub/common/include/ew.h   |   53 -
 pubsub/examples/mp_pubsub/common/include/ide.h  |   49 -
 .../mp_pubsub/common/include/kinematics.h       |   55 -
 .../mp_pubsub/msg_descriptors/msg_ew.descriptor |    9 -
 .../msg_descriptors/msg_ide.descriptor          |    9 -
 .../msg_descriptors/msg_kinematics.descriptor   |   10 -
 .../examples/mp_pubsub/publisher/CMakeLists.txt |   43 -
 .../private/include/mp_publisher_private.h      |   58 -
 .../publisher/private/src/mp_pub_activator.c    |  144 -
 .../publisher/private/src/mp_publisher.c        |  160 -
 .../mp_pubsub/subscriber/CMakeLists.txt         |   43 -
 .../private/include/mp_subscriber_private.h     |   50 -
 .../subscriber/private/src/mp_sub_activator.c   |  108 -
 .../subscriber/private/src/mp_subscriber.c      |  119 -
 pubsub/examples/pubsub/CMakeLists.txt           |   24 -
 pubsub/examples/pubsub/common/include/poi.h     |   55 -
 .../pubsub/msg_descriptors/msg_poi1.descriptor  |   10 -
 .../pubsub/msg_descriptors/msg_poi2.descriptor  |   10 -
 .../pubsub/msg_descriptors/poi1.properties      |   35 -
 .../pubsub/msg_descriptors/poi2.properties      |   35 -
 pubsub/examples/pubsub/publisher/CMakeLists.txt |   49 -
 .../private/include/pubsub_publisher_private.h  |   60 -
 .../publisher/private/src/ps_pub_activator.c    |  147 -
 .../publisher/private/src/pubsub_publisher.c    |  172 -
 .../examples/pubsub/publisher2/CMakeLists.txt   |   51 -
 .../examples/pubsub/subscriber/CMakeLists.txt   |   50 -
 .../private/include/pubsub_subscriber_private.h |   51 -
 .../subscriber/private/src/ps_sub_activator.c   |  114 -
 .../subscriber/private/src/pubsub_subscriber.c  |   64 -
 pubsub/keygen/CMakeLists.txt                    |   34 -
 pubsub/keygen/ed_file.c                         |  309 -
 pubsub/keygen/makecert.c                        |   55 -
 pubsub/mock/CMakeLists.txt                      |   41 -
 pubsub/mock/api/pubsub/publisher_mock.h         |   43 -
 pubsub/mock/src/publisher_mock.cc               |   68 -
 pubsub/mock/tst/pubsubmock_test.cc              |   77 -
 pubsub/mock/tst/run_tests.cc                    |   25 -
 pubsub/pubsub_admin_udp_mc/CMakeLists.txt       |   41 -
 pubsub/pubsub_admin_udp_mc/README.md            |   79 -
 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 | 1160 ---
 .../pubsub_admin_udp_mc/src/pubsub_admin_impl.h |   97 -
 .../src/pubsub_psa_udpmc_constants.h            |   39 -
 .../pubsub_admin_udp_mc/src/topic_publication.c |  453 -
 .../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          |   60 -
 pubsub/pubsub_admin_zmq/src/psa_activator.c     |  186 -
 pubsub/pubsub_admin_zmq/src/pubsub_admin_impl.c | 1183 ---
 pubsub/pubsub_admin_zmq/src/pubsub_admin_impl.h |  113 -
 .../src/pubsub_psa_zmq_constants.h              |   48 -
 pubsub/pubsub_admin_zmq/src/topic_publication.c |  640 --
 pubsub/pubsub_admin_zmq/src/topic_publication.h |   49 -
 .../pubsub_admin_zmq/src/topic_subscription.c   |  761 --
 .../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    |   87 -
 pubsub/pubsub_api/include/pubsub/subscriber.h   |   74 -
 pubsub/pubsub_discovery/CMakeLists.txt          |   40 -
 pubsub/pubsub_discovery/src/etcd_common.c       |   82 -
 pubsub/pubsub_discovery/src/etcd_common.h       |   28 -
 pubsub/pubsub_discovery/src/etcd_watcher.c      |  322 -
 pubsub/pubsub_discovery/src/etcd_watcher.h      |   38 -
 pubsub/pubsub_discovery/src/etcd_writer.c       |  217 -
 pubsub/pubsub_discovery/src/etcd_writer.h       |   39 -
 pubsub/pubsub_discovery/src/psd_activator.c     |  170 -
 pubsub/pubsub_discovery/src/pubsub_discovery.h  |   26 -
 .../src/pubsub_discovery_impl.c                 |  530 --
 .../src/pubsub_discovery_impl.h                 |   77 -
 pubsub/pubsub_serializer_json/CMakeLists.txt    |   38 -
 .../pubsub_serializer_json/src/ps_activator.c   |  108 -
 .../src/pubsub_serializer_impl.c                |  295 -
 .../src/pubsub_serializer_impl.h                |   55 -
 pubsub/pubsub_spi/CMakeLists.txt                |   36 -
 .../include/publisher_endpoint_announce.h       |   40 -
 pubsub/pubsub_spi/include/pubsub_admin.h        |   70 -
 pubsub/pubsub_spi/include/pubsub_admin_match.h  |   47 -
 pubsub/pubsub_spi/include/pubsub_common.h       |   52 -
 pubsub/pubsub_spi/include/pubsub_constants.h    |   30 -
 pubsub/pubsub_spi/include/pubsub_endpoint.h     |   81 -
 pubsub/pubsub_spi/include/pubsub_serializer.h   |   64 -
 .../include/pubsub_topic_info.descriptor        |   10 -
 pubsub/pubsub_spi/include/pubsub_utils.h        |   45 -
 pubsub/pubsub_spi/src/pubsub_admin_match.c      |  169 -
 pubsub/pubsub_spi/src/pubsub_endpoint.c         |  370 -
 pubsub/pubsub_spi/src/pubsub_utils.c            |  137 -
 pubsub/pubsub_topology_manager/CMakeLists.txt   |   36 -
 .../src/pstm_activator.c                        |  244 -
 .../src/pubsub_topology_manager.c               |  784 --
 .../src/pubsub_topology_manager.h               |   92 -
 pubsub/test/CMakeLists.txt                      |  137 -
 pubsub/test/msg_descriptors/msg.descriptor      |    9 -
 pubsub/test/msg_descriptors/sync.descriptor     |    9 -
 pubsub/test/test/msg.h                          |   31 -
 pubsub/test/test/sut_activator.c                |  115 -
 pubsub/test/test/sync.h                         |   29 -
 pubsub/test/test/tst_activator.cpp              |  221 -
 remote_services/CMakeLists.txt                  |   40 -
 remote_services/README.md                       |  166 -
 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 -
 remote_services/discovery_common/CMakeLists.txt |   41 -
 .../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         |   41 -
 .../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   |   50 -
 remote_services/discovery_etcd/README.md        |   29 -
 .../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    |   47 -
 .../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         |   62 -
 .../examples/calculator_api/CMakeLists.txt      |   22 -
 .../calculator_api/include/calculator_service.h |   56 -
 ...apache.celix.calc.api.Calculator2.descriptor |   11 -
 .../examples/calculator_service/CMakeLists.txt  |   29 -
 .../src/calculator_activator.c                  |  110 -
 .../calculator_service/src/calculator_impl.c    |   79 -
 .../calculator_service/src/calculator_impl.h    |   43 -
 .../examples/calculator_shell/CMakeLists.txt    |   36 -
 .../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_dfi/CMakeLists.txt     |   55 -
 .../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_shm/CMakeLists.txt     |   56 -
 .../include/remote_service_admin_shm_impl.h     |   92 -
 .../src/remote_service_admin_activator.c        |  123 -
 .../private/src/remote_service_admin_impl.c     |  924 --
 .../private/test/CMakeLists.txt                 |   58 -
 .../private/test/client.properties.in           |   25 -
 .../private/test/rsa_client_server_tests.cpp    |  496 --
 .../private/test/run_tests.cpp                  |   24 -
 .../private/test/server.properties.in           |   25 -
 .../public/include/remote_service_admin_shm.h   |   35 -
 .../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 |   47 -
 remote_services/topology_manager/README.md      |   23 -
 .../topology_manager/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     |   75 -
 .../tms_tst/bundle/CMakeLists.txt               |   35 -
 .../org.apache.celix.test.MyBundle.descriptor   |    9 -
 .../tms_tst/bundle/tst_activator.c              |  141 -
 .../tms_tst/bundle/tst_service.h                |   32 -
 .../tms_tst/disc_mock/CMakeLists.txt            |   28 -
 .../tms_tst/disc_mock/disc_mock_activator.c     |  149 -
 .../tms_tst/disc_mock/disc_mock_service.c       |   61 -
 .../tms_tst/disc_mock/disc_mock_service.h       |   56 -
 .../topology_manager/tms_tst/run_tests.cpp      |   24 -
 .../topology_manager/tms_tst/scope.json         |   15 -
 .../topology_manager/tms_tst/scope2.json        |   22 -
 .../topology_manager/tms_tst/scope3.json        |   28 -
 .../topology_manager/tms_tst/scope4.json        |   21 -
 .../topology_manager/tms_tst/tms_tests.cpp      |  736 --
 remote_shell/CMakeLists.txt                     |   44 -
 remote_shell/README.md                          |   27 -
 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                            |   56 -
 shell/README.md                                 |   51 -
 shell/include/command.h                         |   58 -
 shell/include/dm_shell_list_command.h           |   42 -
 shell/include/shell.h                           |   51 -
 shell/include/shell_constants.h                 |   27 -
 shell/src/activator.c                           |  273 -
 shell/src/dm_shell_list_command.c               |  192 -
 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                        |   46 -
 shell/src/stop_command.c                        |   82 -
 shell/src/uninstall_command.c                   |   58 -
 shell/src/update_command.c                      |  117 -
 shell_bonjour/CMakeLists.txt                    |   51 -
 shell_bonjour/private/include/bonjour_shell.h   |   43 -
 shell_bonjour/private/src/activator.c           |  110 -
 shell_bonjour/private/src/bonjour_shell.c       |  445 -
 shell_tui/CMakeLists.txt                        |   40 -
 shell_tui/README.md                             |   34 -
 shell_tui/private/include/history.h             |   39 -
 shell_tui/private/include/shell_tui.h           |   44 -
 shell_tui/private/src/activator.c               |  133 -
 shell_tui/private/src/history.c                 |   80 -
 shell_tui/private/src/shell_tui.c               |  464 -
 utils/CMakeLists.txt                            |  124 -
 utils/README.md                                 |   29 -
 utils/docs/thpool/Design.md                     |   52 -
 utils/docs/thpool/FAQ.md                        |   33 -
 utils/docs/thpool/README.md                     |   62 -
 utils/include/array_list.h                      |  116 -
 utils/include/celix_array_list.h                |   80 -
 utils/include/celix_errno.h                     |  119 -
 utils/include/celix_filter.h                    |   81 -
 utils/include/celix_properties.h                |   78 -
 utils/include/celix_threads.h                   |  135 -
 utils/include/celix_utils_api.h                 |   34 -
 utils/include/celixbool.h                       |   61 -
 utils/include/exports.h                         |   49 -
 utils/include/filter.h                          |   51 -
 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                      |   72 -
 utils/include/thpool.h                          |  168 -
 utils/include/utils.h                           |   61 -
 utils/include/version.h                         |  186 -
 utils/include/version_range.h                   |  160 -
 utils/private/resources-test/properties.txt     |   26 -
 utils/private/test/array_list_test.cpp          |  579 --
 utils/private/test/celix_threads_test.cpp       |  531 --
 utils/private/test/filter_test.cpp              |  537 --
 utils/private/test/hash_map_test.cpp            | 1492 ----
 utils/private/test/linked_list_test.cpp         |  794 --
 utils/private/test/properties_test.cpp          |  130 -
 utils/private/test/thread_pool_test.cpp         |  118 -
 utils/private/test/utils_test.cpp               |  300 -
 utils/private/test/version_range_test.cpp       |  254 -
 utils/private/test/version_test.cpp             |  388 -
 utils/src/array_list.c                          |  460 -
 utils/src/array_list_private.h                  |   53 -
 utils/src/celix_threads.c                       |  184 -
 utils/src/filter.c                              |  724 --
 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                          |  405 -
 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 -
 1466 files changed, 118415 insertions(+), 118376 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/3bce889b/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d534a55..06c4000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,33 +60,11 @@ endif()
 # Default bundle version
 set(DEFAULT_VERSION 1.0.0)
 
-#utils, dfi and etcdlib are standalone
-#(e.g. no dependency on celix framework
-add_subdirectory(utils)
-add_subdirectory(dfi)
-add_subdirectory(etcdlib)
-
-add_subdirectory(framework)
-
-#launcher
-add_subdirectory(launcher)
+#Libraries and Launcher
+add_subdirectory(libs)
 
 #Bundles
-add_subdirectory(config_admin)
-add_subdirectory(device_access)
-add_subdirectory(deployment_admin)
-add_subdirectory(remote_services)
-add_subdirectory(remote_shell)
-add_subdirectory(shell_bonjour)
-add_subdirectory(shell_tui)
-add_subdirectory(shell)
-add_subdirectory(log_writer)
-add_subdirectory(log_service)
-add_subdirectory(pubsub)
-
-#add_subdirectory(event_admin)# event_admin is unstable
-add_subdirectory(dependency_manager)
-add_subdirectory(dependency_manager_cxx)
+add_subdirectory(bundles)
 
 #Example as last, because some example will check if underlining options are enabled
 add_subdirectory(examples/celix-examples examples)

http://git-wip-us.apache.org/repos/asf/celix/blob/3bce889b/bundles/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bundles/CMakeLists.txt b/bundles/CMakeLists.txt
new file mode 100644
index 0000000..5ed4054
--- /dev/null
+++ b/bundles/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+add_subdirectory(config_admin)
+add_subdirectory(device_access)
+add_subdirectory(deployment_admin)
+add_subdirectory(remote_services)
+add_subdirectory(shell)
+add_subdirectory(log_writer)
+add_subdirectory(log_service)
+add_subdirectory(pubsub)
\ No newline at end of file