CELIX-237: Merge remote-tracking branch
'remotes/origin/feature/CELIX-237_rsa-ffi' into develop
Conflicts:
.travis.yml
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/093d2dfa
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/093d2dfa
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/093d2dfa
Branch: refs/heads/develop
Commit: 093d2dfa7c7f0cf83ddcb96bc3cf3817747da17f
Parents: 4ee2e7f 8689fc1
Author: Pepijn Noltes <[email protected]>
Authored: Tue Oct 13 12:20:39 2015 +0200
Committer: Pepijn Noltes <[email protected]>
Committed: Tue Oct 13 12:20:39 2015 +0200
----------------------------------------------------------------------
.gitignore | 3 +
.travis.yml | 25 +-
CMakeLists.txt | 7 +-
LICENSE | 26 +-
cmake/CMakeCelix.cmake | 2 +-
cmake/FindCppUTest.cmake | 34 +-
cmake/FindFFI.cmake | 54 +
cmake/cmake_celix/Test.cmake | 52 -
framework/CMakeLists.txt | 54 +-
framework/private/src/celix_launcher.c | 190 +++
framework/private/src/celix_log.c | 5 +-
framework/private/src/framework.c | 14 +-
framework/private/src/properties.c | 13 +-
framework/private/src/service_registration.c | 5 +-
framework/private/src/service_registry.c | 2 +-
framework/public/include/celix_launcher.h | 41 +
framework/public/include/properties.h | 3 +
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 | 3 +
.../public/include/endpoint_listener.h | 48 -
.../private/src/calculator_proxy_impl.c | 2 +-
.../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 | 6 +-
.../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 | 32 +
.../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 | 405 +++++++
.../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 | 287 +++++
.../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 +
.../dyn_closure_tests.cpp | 146 +++
.../dyn_function_tests.cpp | 236 ++++
.../dyn_interface_tests.cpp | 103 ++
.../dyn_type_tests.cpp | 281 +++++
.../json_rpc_tests.cpp | 329 +++++
.../json_serializer_tests.cpp | 435 +++++++
.../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 | 352 ++++++
.../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 | 113 ++
.../rsa_tst/rsa_tests.cpp | 201 ++++
.../rsa_tst/run_tests.cpp | 9 +
.../rsa_tst/server.properties.in | 8 +
.../private/src/remote_service_admin_impl.c | 129 +-
.../private/src/remote_service_admin_impl.c | 26 +-
.../private/src/topology_manager.c | 104 +-
.../utils/public/include/remote_constants.h | 38 -
utils/CMakeLists.txt | 4 +-
105 files changed, 8366 insertions(+), 597 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/093d2dfa/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index f742f21,3ecdf5c..0a9a4b5
--- a/.travis.yml
+++ b/.travis.yml
@@@ -2,28 -2,28 +2,35 @@@ language:
before_install:
- sudo apt-get update -qq
- - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov
-
- - sudo apt-get install -y uuid-dev libxml2-dev libffi-dev lcov
++ - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov
libffi-dev
matrix:
include:
- compiler: gcc
- compiler: clang
- before_script:
- - wget
https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true
-O /tmp/cpputest.tar.gz
- - tar -xzvf /tmp/cpputest.tar.gz -C /tmp
- - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd
/tmp/cpputest-3.7.1 && ./configure --prefix=$HOME/cpputest && make && make
install && cd -
+ before_script:
+ - git clone -b 3.7.2 --single-branch
https://github.com/cpputest/cpputest.git cpputest-build
+ - cd cpputest-build
+ - cmake . && make
+ - sudo make install
+ - cd ..
+ - git clone -b 2.7 --single-branch https://github.com/akheron/jansson.git
jansson-build
+ - cd jansson-build
+ - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . &&
make
+ - sudo make install
+ - cd ..
- mkdir build install
-
- script:
- cd build
- - cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF
-DBUILD_UTILS-TESTS=ON -DCPPUTEST_INCLUDE_DIR=$HOME/cpputest/include
-DCPPUTEST_LIBRARY=$HOME/cpputest/lib/libCppUTest.a
-DCPPUTEST_EXT_INCLUDE_DIR=$HOME/cpputest/include
-DCPPUTEST_EXT_LIBRARY=$HOME/cpputest/lib/libCppUTestExt.a
-DENABLE_CODE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install ..
- - cmake -DENABLE_TESTING=ON -DCMAKE_SKIP_BUILD_RPATH=TRUE
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DCMAKE_INSTALL_PREFIX=../install ..
++ - cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF
-DBUILD_UTILS-TESTS=ON -DCPPUTEST_INCLUDE_DIR=$HOME/cpputest/include
-DCPPUTEST_LIBRARY=$HOME/cpputest/lib/libCppUTest.a
-DCPPUTEST_EXT_INCLUDE_DIR=$HOME/cpputest/include
-DCPPUTEST_EXT_LIBRARY=$HOME/cpputest/lib/libCppUTestExt.a
-DENABLE_CODE_COVERAGE=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN DFI=ON
-DCMAKE_INSTALL_PREFIX=../install ..
+ - make all && make deploy && make install-all
+ - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework &&
make test && make coverage
+
+after_success:
+ - cd ${TRAVIS_BUILD_DIR}/build
+ - gem install coveralls-lcov
+ - lcx="lcov --output-file=coverage.info " && for i in `find . -name
"*.info.cleaned"`; do lcx+=" --add-tracefile=$i"; done && $lcx &&
coveralls-lcov --repo-token=9dpeTAjiGoQU5hgXFe0ezk65iu40oc3WY coverage.info
+ script:
+ - make all
+ - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils && make test
ARGS="-V"
http://git-wip-us.apache.org/repos/asf/celix/blob/093d2dfa/CMakeLists.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/093d2dfa/framework/private/src/framework.c
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/093d2dfa/remote_services/discovery/private/src/endpoint_discovery_poller.c
----------------------------------------------------------------------
