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 2020/02/10 19:29:22 UTC
[celix] branch develop updated (f8ec1c7 -> 4200088)
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git.
from f8ec1c7 Merge pull request #151 from apache/feature/#121_update_travis
add 59f5783 gh-144: Adds initial impl for the query command.
add 436c737 gh-144: Adds missing files.
add b331248 gh-144: Adds test for bundle info calls and query shell and fixes some issues.
add 6a49edb gh-144: Adds missing file
add 7417f01 gh-144: Removes incorrect deprecated attribute
add 707c5a9 gh-144: Fixes cmake configuration for osx
add c837064 Merge branch 'develop' into feature/query_command
add 487248a Fixes framework.c
add ba8773e #144: Refactoring for updated celix_shell/shell_command api
add fc72865 #144: Adds support for commands with namespace (e.g. celix::lb instead of lb)
add 5d4d80f #144: Adds some missing include files
new 4200088 Merge pull request #150 from apache/feature/query_command
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 8 +-
.../pubsub/pubsub_admin_tcp/src/psa_activator.c | 12 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 2 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 2 +-
bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 2 +-
.../pubsub/pubsub_admin_udp_mc/src/psa_activator.c | 12 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c | 5 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h | 2 +-
.../pubsub_admin_websocket/src/psa_activator.c | 12 +-
.../src/pubsub_websocket_admin.c | 5 +-
.../src/pubsub_websocket_admin.h | 2 +-
.../pubsub/pubsub_admin_zmq/src/psa_activator.c | 12 +-
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 2 +-
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.h | 2 +-
.../pubsub/pubsub_discovery/src/psd_activator.c | 12 +-
.../pubsub_discovery/src/pubsub_discovery_impl.c | 4 +-
.../pubsub_discovery/src/pubsub_discovery_impl.h | 2 +-
.../pubsub_topology_manager/src/pstm_activator.c | 10 +-
.../src/pubsub_topology_manager.c | 16 +-
.../src/pubsub_topology_manager.h | 4 +-
.../examples/calculator_shell/src/add_command.c | 1 -
.../src/calculator_shell_activator.c | 33 +-
bundles/shell/remote_shell/src/shell_mediator.c | 9 +-
bundles/shell/remote_shell/src/shell_mediator.h | 4 +-
bundles/shell/shell/CMakeLists.txt | 21 +-
bundles/shell/shell/api/celix_shell.h | 65 +++
bundles/shell/shell/api/celix_shell_command.h | 67 ++++
.../shell/api/celix_shell_constants.h} | 10 +-
.../shell/{include => deprecated_api}/command.h | 17 +-
.../match.h => shell/shell/deprecated_api/shell.h} | 26 +-
.../{include => deprecated_api}/shell_constants.h | 6 +-
.../shell/shell/include/dm_shell_list_command.h | 42 --
bundles/shell/shell/include/shell.h | 51 ---
bundles/shell/shell/src/activator.c | 269 +++++++------
bundles/shell/shell/src/dm_shell_list_command.c | 5 +-
bundles/shell/shell/src/help_command.c | 40 +-
bundles/shell/shell/src/inspect_command.c | 277 -------------
bundles/shell/shell/src/install_command.c | 20 +-
bundles/shell/shell/src/lb_command.c | 56 ++-
bundles/shell/shell/src/log_command.c | 7 +-
bundles/shell/shell/src/query_command.c | 253 ++++++++++++
.../shell/shell/src/quit_command.c | 21 +-
bundles/shell/shell/src/shell.c | 434 ++++++++++-----------
bundles/shell/shell/src/shell_private.h | 77 +++-
bundles/shell/shell/src/start_command.c | 10 +-
bundles/shell/shell/src/std_commands.h | 21 +-
bundles/shell/shell/src/stop_command.c | 10 +-
bundles/shell/shell/src/uninstall_command.c | 11 +-
bundles/shell/shell/src/update_command.c | 22 +-
.../shell/shell/test}/CMakeLists.txt | 33 +-
.../shell/shell/test/src}/run_tests.cpp | 0
bundles/shell/shell/test/src/shell_tests.cpp | 195 +++++++++
.../shell/shell_tui/private/include/shell_tui.h | 4 +-
bundles/shell/shell_tui/private/src/activator.c | 43 +-
bundles/shell/shell_tui/private/src/shell_tui.c | 18 +-
.../shell_wui/src/shell_wui_bundle_activator.c | 8 +-
.../dm_example_cxx/phase1/src/Phase1Activator.cc | 36 +-
.../dm_example_cxx/phase1/src/Phase1Activator.h | 8 +-
.../dm_example_cxx/phase1/src/Phase1Cmp.cc | 2 +-
.../dm_example_cxx/phase1/src/Phase1Cmp.h | 2 +-
libs/framework/CMakeLists.txt | 4 +
libs/framework/include/celix_bundle.h | 59 +++
libs/framework/include/celix_bundle_context.h | 10 +
libs/framework/include/celix_dm_component.h | 2 +
libs/framework/include/service_registration.h | 4 +
libs/framework/include/service_registry.h | 31 +-
libs/framework/include/service_tracker.h | 10 +-
libs/framework/private/mock/bundle_context_mock.c | 2 +-
libs/framework/private/mock/bundle_mock.c | 26 ++
.../private/mock/service_registration_mock.c | 5 +
.../framework/private/mock/service_registry_mock.c | 25 ++
.../private/mock/service_tracker_customizer_mock.c | 3 -
libs/framework/private/mock/service_tracker_stub.c | 3 +-
libs/framework/src/bundle.c | 74 +++-
libs/framework/src/bundle_context.c | 24 +-
libs/framework/src/bundle_context_private.h | 4 +-
libs/framework/src/dm_component_impl.c | 60 +--
libs/framework/src/framework.c | 8 +
libs/framework/src/service_registration.c | 17 +-
libs/framework/src/service_registry.c | 56 +++
libs/framework/src/service_tracker.c | 48 ++-
libs/framework/src/service_tracker_private.h | 10 +-
.../test/bundle_context_bundles_tests.cpp | 37 +-
libs/utils/include/celix_errno.h | 7 -
libs/utils/include/celix_utils.h | 53 +++
libs/utils/include/celix_utils_api.h | 1 +
libs/utils/include/memstream/open_memstream.h | 2 +
libs/utils/private/test/array_list_test.cpp | 1 +
libs/utils/private/test/celix_threads_test.cpp | 1 +
libs/utils/private/test/filter_test.cpp | 1 +
libs/utils/private/test/hash_map_test.cpp | 1 +
libs/utils/private/test/ip_utils_test.cpp | 1 +
libs/utils/private/test/linked_list_test.cpp | 1 +
libs/utils/private/test/properties_test.cpp | 1 +
libs/utils/private/test/thread_pool_test.cpp | 1 +
libs/utils/private/test/utils_test.cpp | 79 +++-
libs/utils/private/test/version_range_test.cpp | 1 +
libs/utils/private/test/version_test.cpp | 1 +
libs/utils/src/filter.c | 28 +-
libs/utils/src/utils.c | 75 +++-
100 files changed, 1969 insertions(+), 1170 deletions(-)
create mode 100644 bundles/shell/shell/api/celix_shell.h
create mode 100644 bundles/shell/shell/api/celix_shell_command.h
copy bundles/{remote_services/discovery_common/include/discovery_type.h => shell/shell/api/celix_shell_constants.h} (77%)
rename bundles/shell/shell/{include => deprecated_api}/command.h (81%)
copy bundles/{device_access/device_access/include/match.h => shell/shell/deprecated_api/shell.h} (65%)
rename bundles/shell/shell/{include => deprecated_api}/shell_constants.h (81%)
delete mode 100644 bundles/shell/shell/include/dm_shell_list_command.h
delete mode 100644 bundles/shell/shell/include/shell.h
delete mode 100644 bundles/shell/shell/src/inspect_command.c
create mode 100644 bundles/shell/shell/src/query_command.c
copy libs/dfi/include/avrobin_serializer.h => bundles/shell/shell/src/quit_command.c (56%)
copy {examples/celix-examples/services_example_cxx => bundles/shell/shell/test}/CMakeLists.txt (50%)
copy {libs/framework/test => bundles/shell/shell/test/src}/run_tests.cpp (100%)
create mode 100644 bundles/shell/shell/test/src/shell_tests.cpp
create mode 100644 libs/utils/include/celix_utils.h
[celix] 01/01: Merge pull request #150 from
apache/feature/query_command
Posted by pn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 4200088165dafc610a51ef2400f22138b57cac08
Merge: f8ec1c7 5d4d80f
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Mon Feb 10 20:29:15 2020 +0100
Merge pull request #150 from apache/feature/query_command
Feature/query command
CMakeLists.txt | 8 +-
.../pubsub/pubsub_admin_tcp/src/psa_activator.c | 12 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 2 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 2 +-
bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 2 +-
.../pubsub/pubsub_admin_udp_mc/src/psa_activator.c | 12 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c | 5 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h | 2 +-
.../pubsub_admin_websocket/src/psa_activator.c | 12 +-
.../src/pubsub_websocket_admin.c | 5 +-
.../src/pubsub_websocket_admin.h | 2 +-
.../pubsub/pubsub_admin_zmq/src/psa_activator.c | 12 +-
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 2 +-
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.h | 2 +-
.../pubsub/pubsub_discovery/src/psd_activator.c | 12 +-
.../pubsub_discovery/src/pubsub_discovery_impl.c | 4 +-
.../pubsub_discovery/src/pubsub_discovery_impl.h | 2 +-
.../pubsub_topology_manager/src/pstm_activator.c | 10 +-
.../src/pubsub_topology_manager.c | 16 +-
.../src/pubsub_topology_manager.h | 4 +-
.../examples/calculator_shell/src/add_command.c | 1 -
.../src/calculator_shell_activator.c | 33 +-
bundles/shell/remote_shell/src/shell_mediator.c | 9 +-
bundles/shell/remote_shell/src/shell_mediator.h | 4 +-
bundles/shell/shell/CMakeLists.txt | 21 +-
bundles/shell/shell/api/celix_shell.h | 65 +++
bundles/shell/shell/api/celix_shell_command.h | 67 ++++
.../celix_shell_constants.h} | 26 +-
.../shell/{include => deprecated_api}/command.h | 17 +-
.../shell.h} | 29 +-
.../{include => deprecated_api}/shell_constants.h | 6 +-
bundles/shell/shell/include/shell.h | 51 ---
bundles/shell/shell/src/activator.c | 269 +++++++------
bundles/shell/shell/src/dm_shell_list_command.c | 5 +-
bundles/shell/shell/src/help_command.c | 40 +-
bundles/shell/shell/src/inspect_command.c | 277 -------------
bundles/shell/shell/src/install_command.c | 20 +-
bundles/shell/shell/src/lb_command.c | 56 ++-
bundles/shell/shell/src/log_command.c | 7 +-
bundles/shell/shell/src/query_command.c | 253 ++++++++++++
bundles/shell/shell/src/quit_command.c | 26 ++
bundles/shell/shell/src/shell.c | 434 ++++++++++-----------
bundles/shell/shell/src/shell_private.h | 77 +++-
bundles/shell/shell/src/start_command.c | 10 +-
bundles/shell/shell/src/std_commands.h | 21 +-
bundles/shell/shell/src/stop_command.c | 10 +-
bundles/shell/shell/src/uninstall_command.c | 11 +-
bundles/shell/shell/src/update_command.c | 22 +-
bundles/shell/shell/test/CMakeLists.txt | 36 ++
.../shell_constants.h => test/src/run_tests.cpp} | 12 +-
bundles/shell/shell/test/src/shell_tests.cpp | 195 +++++++++
.../shell/shell_tui/private/include/shell_tui.h | 4 +-
bundles/shell/shell_tui/private/src/activator.c | 43 +-
bundles/shell/shell_tui/private/src/shell_tui.c | 18 +-
.../shell_wui/src/shell_wui_bundle_activator.c | 8 +-
.../dm_example_cxx/phase1/src/Phase1Activator.cc | 36 +-
.../dm_example_cxx/phase1/src/Phase1Activator.h | 8 +-
.../dm_example_cxx/phase1/src/Phase1Cmp.cc | 2 +-
.../dm_example_cxx/phase1/src/Phase1Cmp.h | 2 +-
libs/framework/CMakeLists.txt | 4 +
libs/framework/include/celix_bundle.h | 59 +++
libs/framework/include/celix_bundle_context.h | 10 +
libs/framework/include/celix_dm_component.h | 2 +
libs/framework/include/service_registration.h | 4 +
libs/framework/include/service_registry.h | 31 +-
libs/framework/include/service_tracker.h | 10 +-
libs/framework/private/mock/bundle_context_mock.c | 2 +-
libs/framework/private/mock/bundle_mock.c | 26 ++
.../private/mock/service_registration_mock.c | 5 +
.../framework/private/mock/service_registry_mock.c | 25 ++
.../private/mock/service_tracker_customizer_mock.c | 3 -
libs/framework/private/mock/service_tracker_stub.c | 3 +-
libs/framework/src/bundle.c | 74 +++-
libs/framework/src/bundle_context.c | 24 +-
libs/framework/src/bundle_context_private.h | 4 +-
libs/framework/src/dm_component_impl.c | 60 +--
libs/framework/src/framework.c | 8 +
libs/framework/src/service_registration.c | 17 +-
libs/framework/src/service_registry.c | 56 +++
libs/framework/src/service_tracker.c | 48 ++-
libs/framework/src/service_tracker_private.h | 10 +-
.../test/bundle_context_bundles_tests.cpp | 37 +-
libs/utils/include/celix_errno.h | 7 -
libs/utils/include/celix_utils.h | 53 +++
libs/utils/include/celix_utils_api.h | 1 +
libs/utils/include/memstream/open_memstream.h | 2 +
libs/utils/private/test/array_list_test.cpp | 1 +
libs/utils/private/test/celix_threads_test.cpp | 1 +
libs/utils/private/test/filter_test.cpp | 1 +
libs/utils/private/test/hash_map_test.cpp | 1 +
libs/utils/private/test/ip_utils_test.cpp | 1 +
libs/utils/private/test/linked_list_test.cpp | 1 +
libs/utils/private/test/properties_test.cpp | 1 +
libs/utils/private/test/thread_pool_test.cpp | 1 +
libs/utils/private/test/utils_test.cpp | 79 +++-
libs/utils/private/test/version_range_test.cpp | 1 +
libs/utils/private/test/version_test.cpp | 1 +
libs/utils/src/filter.c | 28 +-
libs/utils/src/utils.c | 75 +++-
99 files changed, 2015 insertions(+), 1121 deletions(-)