CELIX-269: Merge branch 'develop' into depman
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/d040f001 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/d040f001 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/d040f001 Branch: refs/heads/feature/CELIX-269_depman Commit: d040f001a4a23e03d314556c806c6864a730afce Parents: 0ad3a1f c58615d Author: Pepijn Noltes <pepijnnol...@gmail.com> Authored: Thu Oct 29 16:24:13 2015 +0100 Committer: Pepijn Noltes <pepijnnol...@gmail.com> Committed: Thu Oct 29 16:24:13 2015 +0100 ---------------------------------------------------------------------- .gitignore | 3 + .travis.yml | 45 +- CMakeLists.txt | 15 +- LICENSE | 26 +- README.md | 2 +- cmake/CMakeCelix.cmake | 2 +- cmake/FindCppUTest.cmake | 34 +- cmake/FindFFI.cmake | 57 + cmake/cmake_celix/CodeCoverage.cmake | 48 +- cmake/cmake_celix/Test.cmake | 52 - deployment_admin/CMakeLists.txt | 2 +- .../private/include/deployment_admin.h | 4 +- deployment_admin/private/src/deployment_admin.c | 253 ++-- .../private/src/deployment_admin_activator.c | 2 +- .../private/src/deployment_package.c | 19 +- deployment_admin/private/src/log.c | 2 +- framework/CMakeLists.txt | 62 +- framework/private/include/framework_private.h | 2 + framework/private/src/bundle_cache.c | 5 +- framework/private/src/celix_launcher.c | 190 +++ framework/private/src/celix_log.c | 5 +- framework/private/src/framework.c | 173 +-- framework/private/src/properties.c | 13 +- framework/private/src/service_registration.c | 7 +- framework/private/src/service_registry.c | 2 +- framework/public/include/celix_launcher.h | 41 + framework/public/include/properties.h | 3 + framework/tst/CMakeLists.txt | 30 + framework/tst/config.properties.in | 2 + framework/tst/framework1.properties.in | 3 + framework/tst/framework2.properties.in | 3 + framework/tst/multiple_frameworks_test.cpp | 89 ++ framework/tst/run_tests.cpp | 9 + framework/tst/single_framework_test.cpp | 69 ++ launcher/CMakeLists.txt | 10 +- launcher/private/src/launcher.c | 204 ---- launcher/private/src/main.c | 88 ++ log_service/private/src/log_factory.c | 2 +- remote_services/CMakeLists.txt | 11 +- .../private/src/endpoint_discovery_poller.c | 5 +- .../public/include/endpoint_listener.h | 48 - .../examples/calculator_service/CMakeLists.txt | 5 +- .../public/include/calculator_service.h | 6 +- ...apache.celix.calc.api.Calculator2.descriptor | 11 + .../examples/calculator_shell/CMakeLists.txt | 4 + .../calculator_shell/private/src/add_command.c | 2 +- .../calculator_shell/private/src/sqrt_command.c | 2 +- .../calculator_shell/private/src/sub_command.c | 2 +- remote_services/examples/deploy.cmake | 4 +- .../remote_service_admin/CMakeLists.txt | 8 +- .../private/include/export_registration_impl.h | 3 - .../private/include/remote_service_admin_impl.h | 17 - .../private/src/export_registration_impl.c | 22 +- .../private/src/import_registration_impl.c | 17 + .../public/include/endpoint_listener.h | 48 + .../public/include/export_registration.h | 22 + .../public/include/import_registration.h | 22 + .../public/include/remote_constants.h | 38 + .../public/include/remote_service_admin.h | 6 +- .../remote_service_admin_dfi/CMakeLists.txt | 31 + .../dynamic_function_interface/CMakeLists.txt | 22 + .../dynamic_function_interface/dfi_log_util.h | 48 + .../dynamic_function_interface/dyn_common.c | 136 +++ .../dynamic_function_interface/dyn_common.h | 32 + .../dynamic_function_interface/dyn_function.c | 320 +++++ .../dynamic_function_interface/dyn_function.h | 46 + .../dynamic_function_interface/dyn_interface.c | 416 +++++++ .../dynamic_function_interface/dyn_interface.h | 48 + .../dynamic_function_interface/dyn_type.c | 1129 ++++++++++++++++++ .../dynamic_function_interface/dyn_type.h | 142 +++ .../dynamic_function_interface/json_rpc.c | 318 +++++ .../dynamic_function_interface/json_rpc.h | 22 + .../json_serializer.c | 452 +++++++ .../json_serializer.h | 22 + .../memstream/README.md | 49 + .../memstream/fmemopen.c | 78 ++ .../memstream/fmemopen.h | 52 + .../memstream/open_memstream.c | 130 ++ .../memstream/open_memstream.h | 15 + .../CMakeLists.txt | 27 + .../avro_descriptor_translator_tests.cpp | 164 +++ .../descriptors/example1.descriptor | 13 + .../descriptors/example2.descriptor | 9 + .../descriptors/example3.descriptor | 11 + .../descriptors/example4.descriptor | 8 + .../dyn_closure_tests.cpp | 146 +++ .../dyn_function_tests.cpp | 237 ++++ .../dyn_interface_tests.cpp | 103 ++ .../dyn_type_tests.cpp | 281 +++++ .../json_rpc_tests.cpp | 413 +++++++ .../json_serializer_tests.cpp | 493 ++++++++ .../run_tests.cpp | 9 + .../schemas/complex.avdl | 11 + .../schemas/complex.avpr | 36 + .../schemas/invalid1.avpr | 29 + .../schemas/invalid2.avpr | 31 + .../schemas/simple.avdl | 6 + .../schemas/simple.avpr | 33 + .../schemas/simple_min.avpr | 1 + .../remote_service_admin_dfi/rsa/CMakeLists.txt | 47 + .../private/include/export_registration_dfi.h | 21 + .../private/include/import_registration_dfi.h | 26 + .../private/include/remote_service_admin_dfi.h | 56 + .../rsa/private/src/export_registration_dfi.c | 222 ++++ .../rsa/private/src/import_registration_dfi.c | 355 ++++++ .../src/remote_service_admin_activator.c | 124 ++ .../rsa/private/src/remote_service_admin_dfi.c | 737 ++++++++++++ .../rsa_tst/CMakeLists.txt | 45 + .../rsa_tst/bundle/CMakeLists.txt | 24 + .../rsa_tst/bundle/tst_activator.c | 137 +++ .../rsa_tst/bundle/tst_service.h | 17 + .../rsa_tst/client.properties.in | 8 + .../rsa_tst/config.properties.in | 3 + .../rsa_tst/rsa_client_server_tests.cpp | 114 ++ .../rsa_tst/rsa_tests.cpp | 201 ++++ .../rsa_tst/run_tests.cpp | 9 + .../rsa_tst/server.properties.in | 7 + .../remote_service_admin_http/CMakeLists.txt | 6 + .../private/src/remote_service_admin_impl.c | 129 +- .../private/test/CMakeLists.txt | 46 + .../private/test/client.properties.in | 9 + .../private/test/rsa_client_server_tests.cpp | 112 ++ .../private/test/run_tests.cpp | 9 + .../private/test/server.properties.in | 8 + .../private/src/remote_service_admin_impl.c | 26 +- .../private/include/topology_manager.h | 2 + .../topology_manager/private/src/activator.c | 2 +- .../private/src/topology_manager.c | 151 +-- .../utils/public/include/remote_constants.h | 38 - shell/private/src/inspect_command.c | 5 +- utils/CMakeLists.txt | 30 +- utils/private/test/celix_threads_test.cpp | 7 +- 132 files changed, 9359 insertions(+), 824 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/d040f001/CMakeLists.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/d040f001/framework/private/src/service_registry.c ----------------------------------------------------------------------
