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 2016/01/25 19:01:19 UTC
[03/51] celix git commit: Merge branch 'config_admin' into develop
Merge branch 'config_admin' into develop
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/3779c353
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/3779c353
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/3779c353
Branch: refs/heads/feature/CELIX-335_deploy_refactoring
Commit: 3779c353d8be9de7fa828697ca328457017da14a
Parents: e9ed019 d3c9418
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Wed Jan 6 15:33:33 2016 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Wed Jan 6 15:33:33 2016 +0100
----------------------------------------------------------------------
CMakeLists.txt | 1 +
config_admin/CMakeLists.txt | 25 +-
config_admin/config_admin_tst/CMakeLists.txt | 51 +++
.../config_admin_tst/config.properties.in | 20 +
.../config_admin_tst/config_admin_test.cpp | 404 +++++++++++++++++++
.../example_test/CMakeLists.txt | 32 ++
.../example_test/META-INF/MANIFEST.MF | 5 +
.../include/example_managed_service_impl.h | 67 +++
.../example_test/private/src/activator.c | 205 ++++++++++
.../private/src/example_managed_service_impl.c | 97 +++++
.../example_test2/CMakeLists.txt | 32 ++
.../example_test2/META-INF/MANIFEST.MF | 5 +
.../include/example2_managed_service_impl.h | 65 +++
.../example_test2/private/src/activator.c | 225 +++++++++++
.../private/src/example_managed_service_impl.c | 103 +++++
config_admin/examples/CMakeLists.txt | 21 -
.../examples/example_test/CMakeLists.txt | 32 --
.../examples/example_test/META-INF/MANIFEST.MF | 5 -
.../include/example_managed_service_impl.h | 53 ---
.../example_test/private/src/activator.c | 188 ---------
.../private/src/example_managed_service_impl.c | 94 -----
.../examples/example_test2/CMakeLists.txt | 21 -
.../bundle_configuring/CMakeLists.txt | 30 --
.../bundle_configuring/META-INF/MANIFEST.MF | 5 -
.../bundle_configuring/private/src/activator.c | 94 -----
.../bundle_managed_service/CMakeLists.txt | 32 --
.../bundle_managed_service/META-INF/MANIFEST.MF | 5 -
.../include/example_managed_service_impl.h | 55 ---
.../private/src/activator.c | 120 ------
.../private/src/example_managed_service_impl.c | 95 -----
config_admin/readme.md | 29 ++
.../include/configuration_admin_factory.h | 2 +-
.../private/include/configuration_impl.h | 36 +-
.../private/include/configuration_store.h | 1 +
.../private/include/managed_service_tracker.h | 9 +-
.../private/include/updated_thread_pool.h | 8 +-
config_admin/service/private/src/activator.c | 10 +-
.../private/src/configuration_admin_factory.c | 25 +-
.../private/src/configuration_admin_impl.c | 13 +-
.../service/private/src/configuration_impl.c | 313 ++++++++------
.../service/private/src/configuration_store.c | 78 ++--
.../service/private/src/managed_service_impl.c | 5 +
.../private/src/managed_service_tracker.c | 166 ++++----
.../service/private/src/updated_thread_pool.c | 41 +-
.../service/public/include/configuration.h | 27 +-
.../service/public/include/managed_service.h | 2 +-
dfi/CMakeLists.txt | 2 +-
framework/private/src/service_registry.c | 4 +-
48 files changed, 1795 insertions(+), 1163 deletions(-)
----------------------------------------------------------------------