This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git


    from 94d06c4b Merge pull request #505 from 
apache/feature/parse_filter_attribute_types
     add 91fb6762 Move non celix prefix framework headers to include_deprecated 
dir
     add 1984a9eb Explicitly use deprecated framework headers when needed.
     add b1550ba1 Add deprecated framework header usage to cxx11/cxx14 
framework tests
     add 49761c05 Replace celix_api.h with more explicitly includes
     add 34dbb948 Merge branch 'master' into 
feature/deprecated_framework_header_without_celix_prefix
     add 80d08202 Merge remote-tracking branch 'origin/master' into 
feature/deprecated_framework_header_without_celix_prefix
     add f8d76669 Replace arrayList_get with celix_arrayList_get.
     add b0526a39 Improve error handling dfi
     add 3f24afb1 Fix wrong var names in 2 CelixProject cmake functions
     add 6ed005ab Merge branch 'master' into 
feature/deprecated_framework_header_without_celix_prefix
     new 54372224 Merge pull request #517 from 
apache/feature/deprecated_framework_header_without_celix_prefix

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:
 bundles/deployment_admin/CMakeLists.txt            |  1 +
 bundles/http_admin/http_admin/src/activator.c      |  3 +-
 bundles/http_admin/http_admin/src/http_admin.c     |  1 -
 .../http_admin/http_admin/src/websocket_admin.c    |  4 -
 .../http_admin/http_admin/src/websocket_admin.h    |  2 +-
 bundles/logging/log_helper/CMakeLists.txt          |  1 +
 bundles/logging/log_service_v2/CMakeLists.txt      |  1 +
 .../src/deprecated_log_writer_stdout_activator.c   |  2 +-
 .../examples/pubsub/publisher/CMakeLists.txt       |  1 +
 .../private/include/pubsub_publisher_private.h     |  7 +-
 .../publisher/private/src/ps_pub_activator.c       |  6 +-
 .../publisher/private/src/pubsub_publisher.c       |  3 +-
 .../pubsub/pubsub_websocket/CMakeLists.txt         |  1 +
 .../examples/pubsub/subscriber/CMakeLists.txt      |  1 +
 .../subscriber/private/src/ps_sub_activator.c      | 16 ++--
 .../pubsub/integration/gtest/loopback_activator.c  |  2 +-
 .../integration/gtest/serializer_activator.cc      |  2 +-
 bundles/pubsub/integration/gtest/sut_activator.c   |  2 +-
 .../integration/gtest/sut_endpoint_activator.c     |  2 +-
 bundles/pubsub/integration/gtest/tst_activator.c   |  2 +-
 .../integration/gtest/tst_endpoint_activator.c     |  2 +-
 bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt     |  1 +
 .../pubsub/pubsub_admin_tcp/src/psa_activator.c    |  2 +-
 .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c |  1 +
 .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h |  1 -
 bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt  |  1 +
 .../pubsub/pubsub_admin_websocket/CMakeLists.txt   |  1 +
 bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt     |  1 +
 .../pubsub/pubsub_admin_zmq/src/psa_activator.c    |  2 +-
 bundles/pubsub/pubsub_discovery/CMakeLists.txt     |  1 +
 .../pubsub_protocol_wire_v1/CMakeLists.txt         |  1 +
 .../pubsub_serializer_avrobin/CMakeLists.txt       |  1 +
 .../PubSubAvrobinSerializationProviderTestSuite.cc |  4 +-
 .../pubsub/pubsub_serializer_json/CMakeLists.txt   |  1 +
 .../src/ps_json_serializer_activator.c             |  2 +-
 .../src/pubsub_serializer_impl.c                   |  3 +-
 bundles/pubsub/pubsub_spi/CMakeLists.txt           |  1 +
 bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c    |  7 +-
 .../pubsub_topology_manager/src/pstm_activator.c   |  5 +-
 .../src/pubsub_topology_manager.h                  |  2 -
 bundles/pubsub/pubsub_utils/CMakeLists.txt         |  1 +
 .../gtest/src/PubSubMatchingTestSuite.cpp          |  3 +-
 .../src/PubSubSerializationProviderTestSuite.cc    |  3 +-
 .../pubsub/pubsub_utils/include/pubsub_matching.h  |  1 -
 bundles/pubsub/pubsub_utils/include/pubsub_utils.h |  1 -
 .../src/pubsub_serialization_provider.c            |  1 +
 bundles/pubsub/pubsub_utils/src/pubsub_utils.c     |  1 +
 .../discovery_common/CMakeLists.txt                |  1 +
 .../src/DiscoveryZeroconfAnnouncerTestSuite.cc     |  4 +-
 .../src/DiscoveryZeroconfIntegrationTestSuite.cc   |  6 +-
 .../remote_service_admin_dfi/CMakeLists.txt        |  1 +
 .../remote_service_admin_dfi/gtest/CMakeLists.txt  |  2 +
 .../gtest/src/tst_activator.c                      |  9 +-
 .../src/remote_service_admin_activator.c           |  2 +-
 .../rsa_shm/CMakeLists.txt                         |  2 +-
 .../rsa_shm/gtest/CMakeLists.txt                   |  1 +
 bundles/remote_services/rsa_common/CMakeLists.txt  |  1 +
 .../rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc   |  4 +-
 .../remote_services/rsa_dfi_utils/src/dfi_utils.c  | 99 +++++++++-------------
 .../remote_services/rsa_rpc_json/CMakeLists.txt    |  1 +
 .../gtest/src/RsaJsonRpcActivatorTestSuite.cc      |  6 +-
 .../rsa_rpc_json/gtest/src/RsaJsonRpcTestSuite.cc  | 16 ++--
 .../rsa_rpc_json/src/rsa_json_rpc_activator.c      |  2 +-
 .../rsa_rpc_json/src/rsa_json_rpc_endpoint_impl.h  |  1 -
 .../rsa_rpc_json/src/rsa_json_rpc_impl.c           |  7 +-
 .../rsa_rpc_json/src/rsa_json_rpc_impl.h           |  1 -
 .../rsa_rpc_json/src/rsa_json_rpc_proxy_impl.h     |  1 -
 .../rsa_rpc_json/src/rsa_request_sender_tracker.c  |  3 +-
 bundles/remote_services/rsa_spi/CMakeLists.txt     |  1 -
 .../topology_manager/CMakeLists.txt                |  1 +
 .../topology_manager/tms_tst/CMakeLists.txt        |  1 +
 .../topology_manager/tms_tst/bundle/CMakeLists.txt |  1 +
 bundles/shell/remote_shell/CMakeLists.txt          |  1 +
 bundles/shell/remote_shell/src/activator.c         |  8 +-
 bundles/shell/shell/src/c_shell_activator.c        | 14 ++-
 bundles/shell/shell/src/help_command.c             |  7 +-
 bundles/shell/shell/src/install_command.c          |  6 +-
 bundles/shell/shell/src/query_command.c            | 13 +--
 bundles/shell/shell_bonjour/CMakeLists.txt         |  1 +
 cmake/celix_project/CelixProject.cmake             | 21 ++++-
 libs/dependency_manager/CMakeLists.txt             |  2 +
 libs/dependency_manager_cxx/CMakeLists.txt         |  1 +
 libs/framework/CMakeLists.txt                      |  6 +-
 libs/framework/gtest/CMakeLists.txt                |  3 +
 .../BundleArchiveWithErrorInjectionTestSuite.cc    |  7 +-
 libs/framework/include/celix_log.h                 |  1 -
 .../{include => include_deprecated}/archive.h      |  0
 .../{include => include_deprecated}/bundle.h       |  0
 .../bundle_activator.h                             |  0
 .../bundle_archive.h                               |  0
 .../bundle_context.h                               |  0
 .../{include => include_deprecated}/bundle_event.h |  0
 .../bundle_listener.h                              |  0
 .../bundle_revision.h                              |  0
 .../{include => include_deprecated}/bundle_state.h |  0
 .../{include => include_deprecated}/capability.h   |  0
 .../{include => include_deprecated}/dm_activator.h |  0
 .../{include => include_deprecated}/dm_component.h |  0
 .../dm_dependency_manager.h                        |  0
 .../dm_service_dependency.h                        |  0
 .../{include => include_deprecated}/framework.h    |  0
 .../framework_event.h                              |  0
 .../framework_exports.h                            |  0
 .../framework_listener.h                           |  0
 .../listener_hook_service.h                        |  0
 .../{include => include_deprecated}/manifest.h     |  0
 .../{include => include_deprecated}/module.h       |  0
 .../{include => include_deprecated}/requirement.h  |  0
 .../service_event.h                                |  0
 .../service_factory.h                              |  0
 .../service_listener.h                             |  0
 .../service_reference.h                            |  0
 .../service_registration.h                         |  0
 .../service_registry.h                             |  0
 .../service_tracker.h                              |  0
 .../service_tracker_customizer.h                   |  0
 .../{include => include_deprecated}/wire.h         |  0
 .../{include => include_deprecated}/celixbool.h    |  0
 118 files changed, 205 insertions(+), 171 deletions(-)
 rename libs/framework/{include => include_deprecated}/archive.h (100%)
 rename libs/framework/{include => include_deprecated}/bundle.h (100%)
 rename libs/framework/{include => include_deprecated}/bundle_activator.h (100%)
 rename libs/framework/{include => include_deprecated}/bundle_archive.h (100%)
 rename libs/framework/{include => include_deprecated}/bundle_context.h (100%)
 rename libs/framework/{include => include_deprecated}/bundle_event.h (100%)
 rename libs/framework/{include => include_deprecated}/bundle_listener.h (100%)
 rename libs/framework/{include => include_deprecated}/bundle_revision.h (100%)
 rename libs/framework/{include => include_deprecated}/bundle_state.h (100%)
 rename libs/framework/{include => include_deprecated}/capability.h (100%)
 rename libs/framework/{include => include_deprecated}/dm_activator.h (100%)
 rename libs/framework/{include => include_deprecated}/dm_component.h (100%)
 rename libs/framework/{include => include_deprecated}/dm_dependency_manager.h 
(100%)
 rename libs/framework/{include => include_deprecated}/dm_service_dependency.h 
(100%)
 rename libs/framework/{include => include_deprecated}/framework.h (100%)
 rename libs/framework/{include => include_deprecated}/framework_event.h (100%)
 rename libs/framework/{include => include_deprecated}/framework_exports.h 
(100%)
 rename libs/framework/{include => include_deprecated}/framework_listener.h 
(100%)
 rename libs/framework/{include => include_deprecated}/listener_hook_service.h 
(100%)
 rename libs/framework/{include => include_deprecated}/manifest.h (100%)
 rename libs/framework/{include => include_deprecated}/module.h (100%)
 rename libs/framework/{include => include_deprecated}/requirement.h (100%)
 rename libs/framework/{include => include_deprecated}/service_event.h (100%)
 rename libs/framework/{include => include_deprecated}/service_factory.h (100%)
 rename libs/framework/{include => include_deprecated}/service_listener.h (100%)
 rename libs/framework/{include => include_deprecated}/service_reference.h 
(100%)
 rename libs/framework/{include => include_deprecated}/service_registration.h 
(100%)
 rename libs/framework/{include => include_deprecated}/service_registry.h (100%)
 rename libs/framework/{include => include_deprecated}/service_tracker.h (100%)
 rename libs/framework/{include => 
include_deprecated}/service_tracker_customizer.h (100%)
 rename libs/framework/{include => include_deprecated}/wire.h (100%)
 rename libs/utils/{include => include_deprecated}/celixbool.h (100%)

Reply via email to