This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git
commit 25463cf8820e9296aef10cdb7b23d802403b9f43 Merge: c8d7cede 0cf0d0af Author: Pepijn Noltes <[email protected]> AuthorDate: Mon Nov 6 19:54:04 2023 +0100 Merge pull request #679 from apache/feature/509-remove-osgi-defines Feature/509 remove osgi defines CHANGES.md | 14 ++- .../log_admin/gtest/src/LogAdminTestSuite.cc | 3 +- bundles/logging/log_admin/src/celix_log_admin.c | 6 +- .../log_helper/gtest/src/LogHelperTestSuite.cc | 2 +- .../gtest/src/SyslogWriterTestSuite.cc | 3 +- .../interceptors/src/ps_interceptor_activator.c | 4 +- .../publisher/private/src/ps_pub_activator.c | 2 +- .../private/src/ps_websocket_activator.c | 2 +- .../integration/gtest/serializer_activator.cc | 2 +- .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 6 +- .../src/pubsub_tcp_topic_receiver.c | 4 +- .../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 2 +- .../src/pubsub_websocket_admin.c | 2 +- .../src/pubsub_websocket_topic_receiver.c | 4 +- .../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 6 +- .../src/pubsub_zmq_topic_receiver.c | 4 +- .../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 2 +- .../pubsub_discovery/src/pubsub_discovery_impl.c | 6 +- .../src/ps_wire_protocol_activator.c | 2 +- .../src/ps_wire_v2_protocol_activator.c | 2 +- .../PubSubAvrobinSerializationProviderTestSuite.cc | 2 +- .../PubSubJsonSerializationProviderTestSuite.cc | 2 +- bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 4 +- .../pubsub_spi/src/pubsub_interceptors_handler.c | 8 +- .../src/pubsub_topology_manager.c | 8 +- .../gtest/src/PubSubMatchingTestSuite.cpp | 2 +- .../src/PubSubSerializationHandlerTestSuite.cc | 2 +- .../src/PubSubSerializationProviderTestSuite.cc | 2 +- .../pubsub_utils/src/pubsub_serializer_handler.c | 14 +-- bundles/pubsub/pubsub_utils/src/pubsub_utils.c | 2 +- .../discovery_common/src/discovery_activator.c | 16 +-- .../src/endpoint_descriptor_writer.c | 2 +- .../discovery_etcd/src/etcd_watcher.c | 2 +- .../src/DiscoveryZeroconfActivatorTestSuite.cc | 4 +- .../src/DiscoveryZeroconfAnnouncerTestSuite.cc | 30 +++--- .../src/DiscoveryZeroconfIntegrationTestSuite.cc | 4 +- .../gtest/src/DiscoveryZeroconfWatcherTestSuite.cc | 14 +-- .../src/discovery_zeroconf_announcer.c | 6 +- .../src/discovery_zeroconf_watcher.c | 8 +- .../interceptors/src/rs_interceptor_activator.c | 4 +- .../gtest/client.properties.in | 6 +- .../gtest/config.properties.in | 4 +- .../gtest/server.properties.in | 6 +- .../gtest/src/rsa_client_server_tests.cc | 4 +- .../gtest/src/rsa_tests.cc | 2 +- .../src/remote_service_admin_dfi.c | 14 +-- .../gtest/src/RsaShmActivatorUnitTestSuite.cc | 4 +- .../gtest/src/RsaShmClientServerUnitTestSuite.cc | 4 +- .../src/RsaShmExportRegistrationUnitTestSuite.cc | 10 +- .../rsa_shm/gtest/src/RsaShmImplUnitTestSuite.cc | 16 +-- .../src/RsaShmImportRegistrationUnitTestSuite.cc | 8 +- .../gtest/src/RsaShmIntegrationTestSuite.cc | 4 +- .../rsa_shm/src/rsa_shm_export_registration.c | 2 +- .../rsa_shm/src/rsa_shm_impl.c | 22 ++-- .../gtest/src/EndpointDescriptionUnitTestSuite.cc | 8 +- .../rsa_common/src/endpoint_description.c | 2 +- .../rsa_common/src/export_registration_impl.c | 2 +- .../rsa_common/src/import_registration_impl.c | 2 +- .../rsa_common/src/remote_interceptors_handler.c | 8 +- .../rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc | 2 +- .../gtest/src/RsaJsonRpcActivatorUnitTestSuite.cc | 4 +- .../gtest/src/RsaJsonRpcIntegrationTestSuite.cc | 4 +- .../gtest/src/RsaJsonRpcUnitTestSuite.cc | 8 +- .../src/RsaRequestSenderTrackerUnitTestSuite.cc | 4 +- .../rsa_rpc_json/src/rsa_json_rpc_impl.c | 2 +- .../topology_manager/src/activator.c | 6 +- .../remote_services/topology_manager/src/scope.c | 2 +- .../topology_manager/src/topology_manager.c | 8 +- .../topology_manager/tms_tst/CMakeLists.txt | 8 +- .../tms_tst/bundle/tst_activator.c | 10 +- .../tms_tst/disc_mock/disc_mock_activator.c | 14 +-- .../tms_tst/disc_mock/disc_mock_service.c | 1 - .../topology_manager/tms_tst/tms_tests.cpp | 8 +- bundles/shell/shell/gtest/src/ShellTestSuite.cc | 2 +- bundles/shell/shell/src/bundle_command.c | 6 +- bundles/shell/shell/src/c_shell.c | 24 +---- bundles/shell/shell/src/help_command.c | 4 +- bundles/shell/shell/src/lb_command.c | 6 +- bundles/shell/shell/src/query_command.c | 6 +- bundles/shell/shell/src/shell_private.h | 32 ------ bundles/shell/shell/src/std_commands.h | 2 +- .../src/dynamic_consumer_example.c | 8 +- .../src/dynamic_provider_example.c | 2 +- examples/conan_test_package/test_cxx_shell.cpp | 4 +- examples/conan_test_package/test_framework.c | 5 +- examples/conan_test_package/test_log_helper.c | 5 +- examples/conan_test_package/test_shell.c | 5 +- libs/framework/gtest/config.properties.in | 2 +- .../src/CelixBundleContextBundlesTestSuite.cc | 6 +- .../CelixBundleContextBundlesWithErrorTestSuite.cc | 4 +- .../src/CelixBundleContextServicesTestSuite.cc | 12 +-- .../gtest/src/CxxBundleContextTestSuite.cc | 6 +- .../gtest/src/DependencyManagerTestSuite.cc | 4 +- libs/framework/include/celix/Constants.h | 7 +- libs/framework/include/celix/Trackers.h | 6 +- libs/framework/include/celix_constants.h | 52 +--------- .../include_deprecated/bundle_activator.h | 113 --------------------- libs/framework/src/bundle_archive.c | 4 +- libs/framework/src/bundle_context.c | 6 +- libs/framework/src/celix_bundle_cache.c | 50 ++------- libs/framework/src/celix_libloader.c | 12 --- libs/framework/src/framework.c | 11 +- libs/framework/src/framework_private.h | 2 +- libs/framework/src/manifest_parser.c | 4 +- libs/framework/src/service_reference.c | 8 +- libs/framework/src/service_registration.c | 6 +- libs/framework/src/service_registry.c | 18 ++-- libs/framework/src/service_tracker.c | 6 +- .../config_admin_tst/config.properties.in | 4 +- .../config_admin_tst/config_admin_test.cpp | 8 +- .../example_test/private/src/activator.c | 2 +- .../example_test2/private/src/activator.c | 6 +- .../service/private/src/configuration_impl.c | 8 +- .../service/private/src/managed_service_tracker.c | 4 +- .../src/pubsub_nanomsg_admin.cc | 6 +- 115 files changed, 331 insertions(+), 580 deletions(-)
