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 08e8f8ded2b0f5f2f0190be59509780056899ec2
Merge: 032438f23 c29d9e639
Author: Pepijn Noltes <pnol...@apache.org>
AuthorDate: Sun Nov 17 16:31:14 2024 +0100
Merge pull request #765 from apache/feature/685-refactor-manifest-format
Feature/685 refactor manifest format
CHANGES.md | 9 +-
bundles/http_admin/http_admin/CMakeLists.txt | 3 -
bundles/http_admin/http_admin/src/http_admin.c | 2 +-
.../http_admin/http_admin/src/websocket_admin.c | 2 +-
bundles/logging/log_helper/CMakeLists.txt | 2 -
.../gtest/src/rsa_tests.cc | 23 +-
.../src/export_registration_dfi.c | 1 +
.../src/import_registration_dfi.c | 2 +
.../src/remote_service_admin_dfi.c | 1 +
.../src/RsaShmExportRegistrationUnitTestSuite.cc | 1 +
.../rsa_shm/src/rsa_shm_export_registration.c | 1 +
.../rsa_shm/src/rsa_shm_impl.c | 1 +
.../rsa_common/src/export_registration_impl.c | 44 +-
.../rsa_common/src/import_registration_impl.c | 67 ++--
.../gtest/src/RsaJsonRpcActivatorUnitTestSuite.cc | 1 -
.../gtest/src/RsaJsonRpcIntegrationTestSuite.cc | 10 +-
.../gtest/src/RsaJsonRpcUnitTestSuite.cc | 36 +-
.../src/RsaRequestSenderTrackerUnitTestSuite.cc | 1 -
.../rsa_rpc_json/src/rsa_json_rpc_impl.c | 9 +-
.../remote_services/rsa_spi/include/remote_proxy.h | 1 +
.../topology_manager/src/topology_manager.c | 2 +-
.../topology_manager/tms_tst/tms_tests.cpp | 20 +-
bundles/shell/remote_shell/CMakeLists.txt | 2 +-
bundles/shell/remote_shell/src/remote_shell.c | 10 +-
bundles/shell/remote_shell/src/shell_mediator.c | 146 ++++---
bundles/shell/remote_shell/src/shell_mediator.h | 3 +-
bundles/shell/shell/CMakeLists.txt | 1 -
bundles/shell/shell_tui/CMakeLists.txt | 1 -
bundles/shell/shell_tui/src/shell_tui.c | 5 +-
cmake/cmake_celix/BundlePackaging.cmake | 87 ++--
cmake/cmake_celix/ContainerPackaging.cmake | 44 +-
cmake/cmake_celix/Generic.cmake | 38 ++
cmake/cmake_celix/templates/MANIFEST.json.in | 12 +
cmake/cmake_celix/templates/Manifest.in | 12 -
cmake/cmake_celix/templates/NOTE | 2 +-
documents/bundles.md | 11 +-
libs/dfi/gtest/CMakeLists.txt | 1 -
libs/framework/CMakeLists.txt | 8 +-
.../error_injector/celix_bundle/CMakeLists.txt | 1 +
.../celix_bundle/include/celix_bundle_ei.h | 3 +
.../celix_bundle/src/celix_bundle_ei.cc | 15 +-
libs/framework/gtest/CMakeLists.txt | 7 +-
libs/framework/gtest/src/BundleArchiveTestSuite.cc | 3 +-
.../BundleArchiveWithErrorInjectionTestSuite.cc | 4 +-
.../src/CelixBundleCacheErrorInjectionTestSuite.cc | 4 +-
.../src/CelixBundleContextBundlesTestSuite.cc | 4 +-
.../src/CelixBundleContextServicesTestSuite.cc | 2 +-
.../gtest/src/CxxBundleContextTestSuite.cc | 12 +-
.../gtest/src/DependencyManagerTestSuite.cc | 2 +-
.../gtest/src/ManifestErrorInjectionTestSuite.cc | 151 +------
libs/framework/gtest/src/ManifestTestSuite.cc | 443 +++++++++------------
...{nop_activator.c => activator_with_exception.c} | 1 +
libs/framework/include/celix_constants.h | 11 -
libs/framework/include/celix_types.h | 2 -
libs/framework/include_deprecated/bundle.h | 114 ------
libs/framework/include_deprecated/bundle_context.h | 8 +-
.../framework/include_deprecated/bundle_revision.h | 111 ------
libs/framework/include_deprecated/framework.h | 2 +-
.../framework/include_deprecated/framework_event.h | 2 +-
libs/framework/include_deprecated/manifest.h | 78 ----
libs/framework/include_deprecated/module.h | 89 -----
.../framework/include_deprecated/service_factory.h | 2 +-
.../include_deprecated/service_reference.h | 2 +-
.../include_deprecated/service_registration.h | 2 +-
.../include_deprecated/service_registry.h | 2 +-
libs/framework/src/bundle.c | 254 +++---------
libs/framework/src/bundle_archive.c | 90 ++---
.../{include_deprecated => src}/bundle_archive.h | 45 +--
libs/framework/src/bundle_archive_private.h | 13 +-
libs/framework/src/bundle_context.c | 29 +-
libs/framework/src/bundle_context_private.h | 1 +
libs/framework/src/bundle_revision.c | 57 +--
libs/framework/src/bundle_revision_private.h | 25 +-
libs/framework/src/celix_bundle_manifest.c | 217 ++++++++++
libs/framework/src/celix_bundle_manifest.h | 203 ++++++++++
.../celix_bundle_manifest_type.h} | 26 +-
.../{bundle_private.h => celix_bundle_private.h} | 47 ++-
libs/framework/src/celix_framework_version.h.in | 48 +++
libs/framework/src/celix_module.h | 68 ++++
libs/framework/src/celix_module_private.h | 4 +-
libs/framework/src/dm_component_impl.c | 1 +
libs/framework/src/dm_dependency_manager_impl.c | 20 +-
libs/framework/src/framework.c | 107 ++---
.../src/framework_bundle_lifecycle_handler.c | 6 +-
libs/framework/src/framework_private.h | 2 +-
libs/framework/src/manifest.c | 313 ---------------
libs/framework/src/manifest_parser.c | 113 ------
libs/framework/src/manifest_parser.h | 45 ---
libs/framework/src/module.c | 298 +++++---------
libs/framework/src/service_reference.c | 15 +-
libs/framework/src/service_reference_private.h | 2 +-
libs/framework/src/service_registration.c | 3 +-
libs/framework/src/service_registration_private.h | 2 +
libs/framework/src/service_registry.c | 16 +-
libs/utils/gtest/src/ConvertUtilsTestSuite.cc | 14 +
libs/utils/gtest/src/PropertiesTestSuite.cc | 7 +
libs/utils/include/celix_array_list.h | 11 +-
.../include/celix_array_list_type.h} | 23 +-
libs/utils/include/celix_errno.h | 11 -
libs/utils/include/celix_properties.h | 3 +-
libs/utils/src/celix_convert_utils.c | 5 +
libs/utils/src/properties.c | 5 +-
.../private/include/configuration_admin_factory.h | 6 +-
.../private/include/configuration_admin_impl.h | 2 +-
.../service/private/include/configuration_store.h | 2 +-
.../service/private/include/framework_patch.h | 2 +-
106 files changed, 1494 insertions(+), 2366 deletions(-)
