This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
from 032438f23 Merge pull request #774 from xuzhenbao/bugfix_dfi
add afc02bed4 gh-685: Add new manifest impl
add a40923049 gh-685: Add manifest validation
add f79f22901 gh-685: Add bundle manifest getter functions
add 3759c1d03 gh-685: Update usage of manifest to celix_bundle_manifest
and removes some usage of deprecated api
add c44bbe606 gh-685: Update bundle zip generation for MANIFEST.json
instead of MANIFEST.MF
add 4678197b9 gh-685: Add cmake generated celix_framework_version.h
add 26d14ff59 gh-685: Refactor bundle manifest storage
add 203cbfc34 Merge remote-tracking branch 'origin/master' into
feature/685-refactor-manifest-format
add 75aafbcf6 gh-685: Add missing includes
add 7b4b0cc56 gh-685: Add additional manifest tests
add 89bafcbfc Merge branch 'refs/heads/master' into
feature/685-refactor-manifest-format
add 4822eed89 gh-685: Removing manifest attribute name from
celix_constants.h
add 150c3dc76 gh-685: Remove commented out code
add a123d961f gh-685: Fix tests which were broken after the manifest
format refactor
add 28ee4a11c gh-685: Add celix_bundle_getVersion error injection wrapper
add 297a4372a gh-685: Add missing sys/select.h include
add dc9077624 gh-685: Remove unused deprecated bundle api
add 30480501a gh-685: Adjust documentation for MANIFEST.MF to
MANIFEST.json refactor
add d10a98390 gh-685: Improve manifest json impl based on review comments
add fff61fc9b Remove unnecessary memory allocation for getting version
string.
add c29d9e639 Add more tests for celix_properties_getAsVersion.
new 08e8f8ded Merge pull request #765 from
apache/feature/685-refactor-manifest-format
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:
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 +++++++++------------
.../gtest/src/MultipleFrameworkTestSuite.cc | 29 --
...{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 ++++++++++
.../src/celix_bundle_manifest_type.h} | 20 +-
.../{bundle_private.h => celix_bundle_private.h} | 47 ++-
...cher_private.h => celix_framework_version.h.in} | 40 +-
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 +-
...celix_filter_type.h => celix_array_list_type.h} | 22 +-
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 +-
107 files changed, 1460 insertions(+), 2414 deletions(-)
create mode 100644 cmake/cmake_celix/templates/MANIFEST.json.in
delete mode 100644 cmake/cmake_celix/templates/Manifest.in
delete mode 100644 libs/framework/gtest/src/MultipleFrameworkTestSuite.cc
rename libs/framework/gtest/src/{nop_activator.c =>
activator_with_exception.c} (98%)
delete mode 100644 libs/framework/include_deprecated/bundle.h
delete mode 100644 libs/framework/include_deprecated/bundle_revision.h
delete mode 100644 libs/framework/include_deprecated/manifest.h
delete mode 100644 libs/framework/include_deprecated/module.h
rename libs/framework/{include_deprecated => src}/bundle_archive.h (54%)
create mode 100644 libs/framework/src/celix_bundle_manifest.c
create mode 100644 libs/framework/src/celix_bundle_manifest.h
copy libs/{utils/include/celix_filter_type.h =>
framework/src/celix_bundle_manifest_type.h} (73%)
rename libs/framework/src/{bundle_private.h => celix_bundle_private.h} (52%)
copy libs/framework/src/{celix_launcher_private.h =>
celix_framework_version.h.in} (54%)
create mode 100644 libs/framework/src/celix_module.h
delete mode 100644 libs/framework/src/manifest.c
delete mode 100644 libs/framework/src/manifest_parser.c
delete mode 100644 libs/framework/src/manifest_parser.h
copy libs/utils/include/{celix_filter_type.h => celix_array_list_type.h} (72%)
