This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-osgi-defines in repository https://gitbox.apache.org/repos/asf/celix.git
commit 601909bf70d3833a40f21401d6d72db19d45b198 Author: Pepijn Noltes <[email protected]> AuthorDate: Sat Oct 28 16:39:54 2023 +0200 #509: Remove OSGI_* constants defines and usage Also renames CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR config property to CELIX_FRAMEWORK_CACHE_DIR. --- CHANGES.md | 4 +++ .../log_admin/gtest/src/LogAdminTestSuite.cc | 3 +- .../log_helper/gtest/src/LogHelperTestSuite.cc | 2 +- .../gtest/src/SyslogWriterTestSuite.cc | 3 +- .../publisher/private/src/ps_pub_activator.c | 2 +- .../private/src/ps_websocket_activator.c | 2 +- .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 2 +- .../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 2 +- .../src/pubsub_websocket_admin.c | 2 +- .../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 2 +- .../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 2 +- .../pubsub_discovery/src/pubsub_discovery_impl.c | 2 +- .../PubSubAvrobinSerializationProviderTestSuite.cc | 2 +- .../PubSubJsonSerializationProviderTestSuite.cc | 2 +- bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 4 +-- .../gtest/src/PubSubMatchingTestSuite.cpp | 2 +- .../src/PubSubSerializationHandlerTestSuite.cc | 2 +- .../src/PubSubSerializationProviderTestSuite.cc | 2 +- .../discovery_common/src/discovery_activator.c | 2 +- .../discovery_etcd/src/etcd_watcher.c | 2 +- .../src/DiscoveryZeroconfActivatorTestSuite.cc | 2 +- .../src/DiscoveryZeroconfAnnouncerTestSuite.cc | 2 +- .../src/DiscoveryZeroconfIntegrationTestSuite.cc | 2 +- .../gtest/src/DiscoveryZeroconfWatcherTestSuite.cc | 2 +- .../src/remote_service_admin_dfi.c | 2 +- .../gtest/src/RsaShmActivatorUnitTestSuite.cc | 2 +- .../gtest/src/RsaShmClientServerUnitTestSuite.cc | 2 +- .../src/RsaShmExportRegistrationUnitTestSuite.cc | 2 +- .../rsa_shm/gtest/src/RsaShmImplUnitTestSuite.cc | 6 ++-- .../src/RsaShmImportRegistrationUnitTestSuite.cc | 2 +- .../gtest/src/RsaShmIntegrationTestSuite.cc | 2 +- .../gtest/src/EndpointDescriptionUnitTestSuite.cc | 4 +-- .../rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc | 2 +- .../gtest/src/RsaJsonRpcActivatorUnitTestSuite.cc | 4 +-- .../gtest/src/RsaJsonRpcIntegrationTestSuite.cc | 4 +-- .../gtest/src/RsaJsonRpcUnitTestSuite.cc | 6 ++-- .../src/RsaRequestSenderTrackerUnitTestSuite.cc | 4 +-- .../rsa_rpc_json/src/rsa_json_rpc_impl.c | 2 +- .../topology_manager/src/activator.c | 2 +- .../topology_manager/src/topology_manager.c | 2 +- .../tms_tst/disc_mock/disc_mock_activator.c | 2 +- bundles/shell/shell/gtest/src/ShellTestSuite.cc | 2 +- examples/conan_test_package/test_cxx_shell.cpp | 4 +-- examples/conan_test_package/test_framework.c | 4 +-- examples/conan_test_package/test_log_helper.c | 4 +-- examples/conan_test_package/test_shell.c | 4 +-- .../src/CelixBundleContextBundlesTestSuite.cc | 6 ++-- .../CelixBundleContextBundlesWithErrorTestSuite.cc | 4 +-- .../src/CelixBundleContextServicesTestSuite.cc | 4 +-- .../gtest/src/CxxBundleContextTestSuite.cc | 2 +- .../gtest/src/DependencyManagerTestSuite.cc | 4 +-- libs/framework/include/celix/Constants.h | 5 +-- libs/framework/include/celix_constants.h | 37 +--------------------- libs/framework/src/bundle_archive.c | 4 +-- libs/framework/src/celix_bundle_cache.c | 25 ++------------- libs/framework/src/framework.c | 4 +-- libs/framework/src/framework_private.h | 2 +- libs/framework/src/manifest_parser.c | 4 +-- 58 files changed, 85 insertions(+), 138 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ef9792db..0b31972b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -33,6 +33,10 @@ limitations under the License. - pubsub_serializer.h is removed and no longer supported. Use pubsub_message_serialization_service.h instead. - C++11 support for dm is removed. C++14 is now the minimum required version. - C++17 string_view support is removed from the utils and framework lib. +- Rename of `CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR` config property to `CELIX_FRAMEWORK_CACHE_DIR`. +- Support for OSGI_FRAMEWORK_* config properties are dropped. Use CELIX_FRAMEWORK_* instead. + Note this includes the `OSGI_FRAMEWORK_FRAMEWORK_STORAGE` ("org.osgi.framework.storage") config property, + which has been replaced with the `CELIX_FRAMEWORK_CACHE_DIR` config property. # Noteworthy Changes for 2.4.0 (2023-09-27) diff --git a/bundles/logging/log_admin/gtest/src/LogAdminTestSuite.cc b/bundles/logging/log_admin/gtest/src/LogAdminTestSuite.cc index 9f0d403e..859a24a7 100644 --- a/bundles/logging/log_admin/gtest/src/LogAdminTestSuite.cc +++ b/bundles/logging/log_admin/gtest/src/LogAdminTestSuite.cc @@ -28,12 +28,13 @@ #include "celix_framework_factory.h" #include "celix_log_service.h" #include "celix_shell_command.h" +#include "celix_constants.h" class LogBundleTestSuite : public ::testing::Test { public: LogBundleTestSuite() { auto* properties = celix_properties_create(); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheLogBundleTestSuite"); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheLogBundleTestSuite"); auto* fwPtr = celix_frameworkFactory_createFramework(properties); diff --git a/bundles/logging/log_helper/gtest/src/LogHelperTestSuite.cc b/bundles/logging/log_helper/gtest/src/LogHelperTestSuite.cc index 98b01a00..0bf6dbcb 100644 --- a/bundles/logging/log_helper/gtest/src/LogHelperTestSuite.cc +++ b/bundles/logging/log_helper/gtest/src/LogHelperTestSuite.cc @@ -32,7 +32,7 @@ class LogHelperTestSuite : public ::testing::Test { public: LogHelperTestSuite() { celix::Properties properties{}; - properties.set("org.osgi.framework.storage", ".cacheLogHelperTestSuite"); + properties.set(CELIX_FRAMEWORK_CACHE_DIR, ".cacheLogHelperTestSuite"); properties.set(CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL_CONFIG_NAME, "debug"); fw = celix::createFramework(properties); ctx = fw->getFrameworkBundleContext(); diff --git a/bundles/logging/log_writers/syslog_writer/gtest/src/SyslogWriterTestSuite.cc b/bundles/logging/log_writers/syslog_writer/gtest/src/SyslogWriterTestSuite.cc index 26415dac..e6018246 100644 --- a/bundles/logging/log_writers/syslog_writer/gtest/src/SyslogWriterTestSuite.cc +++ b/bundles/logging/log_writers/syslog_writer/gtest/src/SyslogWriterTestSuite.cc @@ -27,12 +27,13 @@ #include "celix_framework_factory.h" #include "celix_log_service.h" #include "celix_log_constants.h" +#include "celix_constants.h" class SyslogWriterTestSuite : public ::testing::Test { public: SyslogWriterTestSuite() { auto* properties = celix_properties_create(); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheSyslogWriterTestSuite"); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheSyslogWriterTestSuite"); celix_properties_set(properties, CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL_CONFIG_NAME, "trace"); diff --git a/bundles/pubsub/examples/pubsub/publisher/private/src/ps_pub_activator.c b/bundles/pubsub/examples/pubsub/publisher/private/src/ps_pub_activator.c index 00745e56..db62b65f 100644 --- a/bundles/pubsub/examples/pubsub/publisher/private/src/ps_pub_activator.c +++ b/bundles/pubsub/examples/pubsub/publisher/private/src/ps_pub_activator.c @@ -38,7 +38,7 @@ struct publisherActivator { }; static int pub_start(struct publisherActivator *act, celix_bundle_context_t *ctx) { - const char *fwUUID = celix_bundleContext_getProperty(ctx,OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *fwUUID = celix_bundleContext_getProperty(ctx,CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); if (fwUUID == NULL) { printf("PUBLISHER: Cannot retrieve fwUUID.\n"); return CELIX_INVALID_BUNDLE_CONTEXT; diff --git a/bundles/pubsub/examples/pubsub/pubsub_websocket/private/src/ps_websocket_activator.c b/bundles/pubsub/examples/pubsub/pubsub_websocket/private/src/ps_websocket_activator.c index f5c51143..fa6e150a 100644 --- a/bundles/pubsub/examples/pubsub/pubsub_websocket/private/src/ps_websocket_activator.c +++ b/bundles/pubsub/examples/pubsub/pubsub_websocket/private/src/ps_websocket_activator.c @@ -56,7 +56,7 @@ struct ps_websocketActivator { }; static int pubsub_start(struct ps_websocketActivator *act, celix_bundle_context_t *ctx) { - const char *fwUUID = celix_bundleContext_getProperty(ctx,OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *fwUUID = celix_bundleContext_getProperty(ctx,CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); if (fwUUID == NULL) { printf("PUBLISHER: Cannot retrieve fwUUID.\n"); return CELIX_INVALID_BUNDLE_CONTEXT; diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c index 8d7898c6..877e8b06 100644 --- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c +++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c @@ -107,7 +107,7 @@ pubsub_tcp_admin_t *pubsub_tcpAdmin_create(celix_bundle_context_t *ctx, celix_lo psa->ctx = ctx; psa->log = logHelper; psa->verbose = celix_bundleContext_getPropertyAsBool(ctx, PUBSUB_TCP_VERBOSE_KEY, PUBSUB_TCP_VERBOSE_DEFAULT); - psa->fwUUID = celix_bundleContext_getProperty(ctx, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + psa->fwUUID = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); long basePort = celix_bundleContext_getPropertyAsLong(ctx, PSA_TCP_BASE_PORT, PSA_TCP_DEFAULT_BASE_PORT); psa->basePort = (unsigned int) basePort; psa->defaultScore = celix_bundleContext_getPropertyAsDouble(ctx, PSA_TCP_DEFAULT_SCORE_KEY, PSA_TCP_DEFAULT_SCORE); diff --git a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c index 4332fc54..9763e336 100644 --- a/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c +++ b/bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c @@ -115,7 +115,7 @@ pubsub_tcp_topic_sender_t *pubsub_tcpTopicSender_create( sender->admin = admin; sender->protocolSvcId = protocolSvcId; sender->protocol = protocol; - const char *uuid = celix_bundleContext_getProperty(ctx, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *uuid = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); if (uuid != NULL) { uuid_parse(uuid, sender->fwUUID); } diff --git a/bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_admin.c b/bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_admin.c index 747a62a4..cee80028 100644 --- a/bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_admin.c +++ b/bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_admin.c @@ -80,7 +80,7 @@ pubsub_websocket_admin_t* pubsub_websocketAdmin_create(celix_bundle_context_t *c psa->ctx = ctx; psa->log = logHelper; psa->verbose = celix_bundleContext_getPropertyAsBool(ctx, PUBSUB_WEBSOCKET_VERBOSE_KEY, PUBSUB_WEBSOCKET_VERBOSE_DEFAULT); - psa->fwUUID = celix_bundleContext_getProperty(ctx, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + psa->fwUUID = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); psa->defaultScore = celix_bundleContext_getPropertyAsDouble(ctx, PSA_WEBSOCKET_DEFAULT_SCORE_KEY, PSA_WEBSOCKET_DEFAULT_SCORE); psa->qosSampleScore = celix_bundleContext_getPropertyAsDouble(ctx, PSA_WEBSOCKET_QOS_SAMPLE_SCORE_KEY, PSA_WEBSOCKET_DEFAULT_QOS_SAMPLE_SCORE); diff --git a/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c b/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c index d0cc95d2..c9e086a1 100644 --- a/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c +++ b/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c @@ -112,7 +112,7 @@ pubsub_zmq_admin_t* pubsub_zmqAdmin_create(celix_bundle_context_t *ctx, celix_lo psa->ctx = ctx; psa->log = logHelper; psa->verbose = celix_bundleContext_getPropertyAsBool(ctx, PUBSUB_ZMQ_VERBOSE_KEY, PUBSUB_ZMQ_VERBOSE_DEFAULT); - psa->fwUUID = celix_bundleContext_getProperty(ctx, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + psa->fwUUID = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); char *ip = NULL; const char *confIp = celix_bundleContext_getProperty(ctx, PUBSUB_ZMQ_PSA_IP_KEY , NULL); diff --git a/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c b/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c index 5fdb45b2..5cf4b576 100644 --- a/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c +++ b/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c @@ -134,7 +134,7 @@ pubsub_zmq_topic_sender_t* pubsub_zmqTopicSender_create( sender->admin = admin; sender->protocolSvcId = protocolSvcId; sender->protocol = prot; - const char* uuid = celix_bundleContext_getProperty(ctx, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char* uuid = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); if (uuid != NULL) { uuid_parse(uuid, sender->fwUUID); } diff --git a/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c b/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c index 4e71d60a..b4cb3002 100644 --- a/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c +++ b/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c @@ -83,7 +83,7 @@ pubsub_discovery_t* pubsub_discovery_create(celix_bundle_context_t *context, cel disc->ttlForEntries = (int)ttl; disc->sleepInsecBetweenTTLRefresh = (int)(((float)ttl)/2.0); disc->pubsubPath = celix_bundleContext_getProperty(context, PUBSUB_DISCOVERY_SERVER_PATH_KEY, PUBSUB_DISCOVERY_SERVER_PATH_DEFAULT); - disc->fwUUID = celix_bundleContext_getProperty(context, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + disc->fwUUID = celix_bundleContext_getProperty(context, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); return disc; } diff --git a/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc b/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc index 937f59fd..c52be9d8 100644 --- a/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc +++ b/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc @@ -30,7 +30,7 @@ class PubSubAvrobinSerializationProviderTestSuite : public ::testing::Test { public: PubSubAvrobinSerializationProviderTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".pubsub_avrobin_serializer_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".pubsub_avrobin_serializer_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/pubsub/pubsub_serializer_json/gtest/src/PubSubJsonSerializationProviderTestSuite.cc b/bundles/pubsub/pubsub_serializer_json/gtest/src/PubSubJsonSerializationProviderTestSuite.cc index b5365897..b24c623a 100644 --- a/bundles/pubsub/pubsub_serializer_json/gtest/src/PubSubJsonSerializationProviderTestSuite.cc +++ b/bundles/pubsub/pubsub_serializer_json/gtest/src/PubSubJsonSerializationProviderTestSuite.cc @@ -30,7 +30,7 @@ class PubSubJsonSerializationProviderTestSuite : public ::testing::Test { public: PubSubJsonSerializationProviderTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".pubsub_json_serializer_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".pubsub_json_serializer_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c b/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c index 09b4fdf9..d3b3cc19 100644 --- a/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c +++ b/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c @@ -122,7 +122,7 @@ static void retrieveTopicProperties(void *handle, const celix_bundle_t *bnd) { celix_properties_t* pubsubEndpoint_createFromSubscriberSvc(bundle_context_t* ctx, long bundleId, const celix_properties_t *svcProps) { celix_properties_t *ep = celix_properties_create(); - const char* fwUUID = celix_bundleContext_getProperty(ctx, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char* fwUUID = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); const char* scope = celix_properties_get(svcProps, PUBSUB_SUBSCRIBER_SCOPE, NULL); const char* topic = celix_properties_get(svcProps, PUBSUB_SUBSCRIBER_TOPIC, NULL); @@ -152,7 +152,7 @@ celix_properties_t* pubsubEndpoint_createFromSubscriberSvc(bundle_context_t* ctx celix_properties_t* pubsubEndpoint_createFromPublisherTrackerInfo(bundle_context_t *ctx, long bundleId, const char *filter) { celix_properties_t *ep = celix_properties_create(); - const char* fwUUID= celix_bundleContext_getProperty(ctx, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char* fwUUID= celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); assert(fwUUID != NULL); char* topic = NULL; diff --git a/bundles/pubsub/pubsub_utils/gtest/src/PubSubMatchingTestSuite.cpp b/bundles/pubsub/pubsub_utils/gtest/src/PubSubMatchingTestSuite.cpp index 000a90a4..a3b2bb82 100644 --- a/bundles/pubsub/pubsub_utils/gtest/src/PubSubMatchingTestSuite.cpp +++ b/bundles/pubsub/pubsub_utils/gtest/src/PubSubMatchingTestSuite.cpp @@ -47,7 +47,7 @@ class PubSubMatchingTestSuite : public ::testing::Test { public: PubSubMatchingTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".pubsub_utils_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".pubsub_utils_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationHandlerTestSuite.cc b/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationHandlerTestSuite.cc index 1fb6bca3..2522fcbd 100644 --- a/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationHandlerTestSuite.cc +++ b/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationHandlerTestSuite.cc @@ -44,7 +44,7 @@ class PubSubSerializationHandlerTestSuite : public ::testing::Test { public: PubSubSerializationHandlerTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".pubsub_utils_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".pubsub_utils_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationProviderTestSuite.cc b/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationProviderTestSuite.cc index a9b3c8c8..9735611a 100644 --- a/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationProviderTestSuite.cc +++ b/bundles/pubsub/pubsub_utils/gtest/src/PubSubSerializationProviderTestSuite.cc @@ -30,7 +30,7 @@ class PubSubSerializationProviderTestSuite : public ::testing::Test { public: PubSubSerializationProviderTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".pubsub_serialization_provider_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".pubsub_serialization_provider_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/discovery_common/src/discovery_activator.c b/bundles/remote_services/discovery_common/src/discovery_activator.c index 3ebfe0ea..ce8b6b8d 100644 --- a/bundles/remote_services/discovery_common/src/discovery_activator.c +++ b/bundles/remote_services/discovery_common/src/discovery_activator.c @@ -96,7 +96,7 @@ celix_status_t bundleActivator_start(void * userData, celix_bundle_context_t *co struct activator *activator = userData; const char *uuid = NULL; - status = bundleContext_getProperty(context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid); + status = bundleContext_getProperty(context, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid); if (!uuid) { celix_logHelper_debug(activator->loghelper, "no framework UUID defined?!"); return CELIX_ILLEGAL_STATE; diff --git a/bundles/remote_services/discovery_etcd/src/etcd_watcher.c b/bundles/remote_services/discovery_etcd/src/etcd_watcher.c index 7341698f..0b32b695 100644 --- a/bundles/remote_services/discovery_etcd/src/etcd_watcher.c +++ b/bundles/remote_services/discovery_etcd/src/etcd_watcher.c @@ -89,7 +89,7 @@ static celix_status_t etcdWatcher_getLocalNodePath(celix_bundle_context_t *conte if ((etcdWatcher_getRootPath(context, rootPath) != CELIX_SUCCESS)) { status = CELIX_ILLEGAL_STATE; } - else if (((bundleContext_getProperty(context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid)) != CELIX_SUCCESS) || (!uuid)) { + else if (((bundleContext_getProperty(context, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid)) != CELIX_SUCCESS) || (!uuid)) { status = CELIX_ILLEGAL_STATE; } else if (rootPath[strlen(rootPath) - 1] == '/') { diff --git a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfActivatorTestSuite.cc b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfActivatorTestSuite.cc index 5e5d438f..9c01fffb 100644 --- a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfActivatorTestSuite.cc +++ b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfActivatorTestSuite.cc @@ -31,7 +31,7 @@ public: DiscoveryZeroconfActivatorTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".dzc_act_test_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".dzc_act_test_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfAnnouncerTestSuite.cc b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfAnnouncerTestSuite.cc index 52a499bb..58607b5e 100644 --- a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfAnnouncerTestSuite.cc +++ b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfAnnouncerTestSuite.cc @@ -58,7 +58,7 @@ public: DiscoveryZeroconfAnnouncerTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".dzc_announcer_test_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".dzc_announcer_test_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfIntegrationTestSuite.cc b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfIntegrationTestSuite.cc index 896eaa09..0419140c 100644 --- a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfIntegrationTestSuite.cc +++ b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfIntegrationTestSuite.cc @@ -27,7 +27,7 @@ public: DiscoveryZeroconfIntegrationTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".dzc_integration_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".dzc_integration_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfWatcherTestSuite.cc b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfWatcherTestSuite.cc index 54b96827..7a592123 100644 --- a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfWatcherTestSuite.cc +++ b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfWatcherTestSuite.cc @@ -82,7 +82,7 @@ public: DiscoveryZeroconfWatcherTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".dzc_watcher_test_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".dzc_watcher_test_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.c b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.c index d40f6faf..4628268e 100644 --- a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.c +++ b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.c @@ -762,7 +762,7 @@ static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_servic char endpoint_uuid[37]; uuid_unparse_lower(endpoint_uid, endpoint_uuid); - bundleContext_getProperty(admin->context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid); + bundleContext_getProperty(admin->context, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid); celix_properties_set(endpointProperties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid); celix_properties_set(endpointProperties, OSGI_FRAMEWORK_OBJECTCLASS, interface); celix_properties_set(endpointProperties, OSGI_RSA_ENDPOINT_SERVICE_ID, serviceId); diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmActivatorUnitTestSuite.cc b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmActivatorUnitTestSuite.cc index bef1c7e9..bb0649b7 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmActivatorUnitTestSuite.cc +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmActivatorUnitTestSuite.cc @@ -30,7 +30,7 @@ public: RsaShmActivatorUnitTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "onFirstInit"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_shm_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_shm_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmClientServerUnitTestSuite.cc b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmClientServerUnitTestSuite.cc index d7d27231..f651b9fd 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmClientServerUnitTestSuite.cc +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmClientServerUnitTestSuite.cc @@ -46,7 +46,7 @@ public: RsaShmClientServerUnitTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_shm_client_server_test_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_shm_client_server_test_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmExportRegistrationUnitTestSuite.cc b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmExportRegistrationUnitTestSuite.cc index b9a10e75..8c8452a3 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmExportRegistrationUnitTestSuite.cc +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmExportRegistrationUnitTestSuite.cc @@ -73,7 +73,7 @@ public: RsaShmExportRegUnitTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_shm_export_reg_test_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_shm_export_reg_test_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImplUnitTestSuite.cc b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImplUnitTestSuite.cc index d2123a0e..42d0e080 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImplUnitTestSuite.cc +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImplUnitTestSuite.cc @@ -53,7 +53,7 @@ public: RsaShmUnitTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_shm_impl_test_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_shm_impl_test_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; @@ -719,7 +719,7 @@ public: RsaShmRpcTestSuite() { auto* clientProps = celix_properties_create(); celix_properties_set(clientProps, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(clientProps, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_shm_client_cache"); + celix_properties_set(clientProps, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_shm_client_cache"); celix_properties_set(clientProps, "CELIX_FRAMEWORK_EXTENDER_PATH", RESOURCES_DIR); auto* clientFwPtr = celix_frameworkFactory_createFramework(clientProps); auto* clientCtxPtr = celix_framework_getFrameworkContext(clientFwPtr); @@ -737,7 +737,7 @@ public: auto* serverProps = celix_properties_create(); celix_properties_set(serverProps, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(serverProps, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_shm_server_cache"); + celix_properties_set(serverProps, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_shm_server_cache"); celix_properties_set(serverProps, "CELIX_FRAMEWORK_EXTENDER_PATH", RESOURCES_DIR); auto* serverFwPtr = celix_frameworkFactory_createFramework(serverProps); auto* serverCtxPtr = celix_framework_getFrameworkContext(serverFwPtr); diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImportRegistrationUnitTestSuite.cc b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImportRegistrationUnitTestSuite.cc index 83ae6eb5..9535ad90 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImportRegistrationUnitTestSuite.cc +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImportRegistrationUnitTestSuite.cc @@ -69,7 +69,7 @@ public: RsaShmImportRegUnitTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_shm_import_reg_test_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_shm_import_reg_test_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmIntegrationTestSuite.cc b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmIntegrationTestSuite.cc index 8249be76..5733dc1a 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmIntegrationTestSuite.cc +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmIntegrationTestSuite.cc @@ -25,7 +25,7 @@ public: RsaShmActivatorTestSuite() { auto* props = celix_properties_create(); celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "onFirstInit"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_shm_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_shm_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/rsa_common/gtest/src/EndpointDescriptionUnitTestSuite.cc b/bundles/remote_services/rsa_common/gtest/src/EndpointDescriptionUnitTestSuite.cc index 795875fc..2eaef81e 100644 --- a/bundles/remote_services/rsa_common/gtest/src/EndpointDescriptionUnitTestSuite.cc +++ b/bundles/remote_services/rsa_common/gtest/src/EndpointDescriptionUnitTestSuite.cc @@ -33,8 +33,8 @@ class EndpointDescriptionUnitTestSuite : public ::testing::Test { public: EndpointDescriptionUnitTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "true"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_common_test_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, "true"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_common_test_cache"); fw = std::shared_ptr<celix_framework_t>{celix_frameworkFactory_createFramework(props), [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; properties = std::shared_ptr<celix_properties_t>(celix_properties_create(), [](celix_properties_t* p) {celix_properties_destroy(p);}); diff --git a/bundles/remote_services/rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc b/bundles/remote_services/rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc index 23392c04..ac23ad83 100644 --- a/bundles/remote_services/rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc +++ b/bundles/remote_services/rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc @@ -29,7 +29,7 @@ class DfiUtilsTestSuite : public ::testing::Test { public: DfiUtilsTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_dfi_utils_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_dfi_utils_cache"); celix_properties_set(props, "CELIX_FRAMEWORK_EXTENDER_PATH", DESCRIPTOR_FILE_PATH); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); diff --git a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcActivatorUnitTestSuite.cc b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcActivatorUnitTestSuite.cc index 17544a51..94dfaefa 100644 --- a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcActivatorUnitTestSuite.cc +++ b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcActivatorUnitTestSuite.cc @@ -37,8 +37,8 @@ class RsaJsonRpcActivatorUnitTestSuite : public ::testing::Test { public: RsaJsonRpcActivatorUnitTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_json_rpc_impl_cache"); - celix_properties_set(props, OSGI_FRAMEWORK_BUNDLE_VERSION, "1.0.0"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_json_rpc_impl_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_BUNDLE_VERSION, "1.0.0"); celix_properties_set(props, RSA_JSON_RPC_LOG_CALLS_KEY, "true"); celix_properties_set(props, "CELIX_FRAMEWORK_EXTENDER_PATH", RESOURCES_DIR); auto* fwPtr = celix_frameworkFactory_createFramework(props); diff --git a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcIntegrationTestSuite.cc b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcIntegrationTestSuite.cc index ef3de15b..843e6f48 100644 --- a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcIntegrationTestSuite.cc +++ b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcIntegrationTestSuite.cc @@ -26,8 +26,8 @@ class RsaJsonRpcIntegrationTestSuite : public ::testing::Test { public: RsaJsonRpcIntegrationTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, "onFirstInit"); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_json_rpc_integration_cache"); + celix_properties_setBool(props, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, true); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_json_rpc_integration_cache"); auto* fwPtr = celix_frameworkFactory_createFramework(props); auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; diff --git a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcUnitTestSuite.cc b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcUnitTestSuite.cc index 663adc67..d25901b7 100644 --- a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcUnitTestSuite.cc +++ b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcUnitTestSuite.cc @@ -53,8 +53,8 @@ class RsaJsonRpcUnitTestSuite : public ::testing::Test { public: RsaJsonRpcUnitTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_json_rpc_impl_cache"); - celix_properties_set(props, OSGI_FRAMEWORK_BUNDLE_VERSION, "1.0.0"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_json_rpc_impl_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_BUNDLE_VERSION, "1.0.0"); celix_properties_set(props, RSA_JSON_RPC_LOG_CALLS_KEY, "true"); celix_properties_set(props, "CELIX_FRAMEWORK_EXTENDER_PATH", RESOURCES_DIR); auto* fwPtr = celix_frameworkFactory_createFramework(props); @@ -86,7 +86,7 @@ public: EXPECT_NE(endpointDesc, nullptr); endpointDesc->properties = celix_properties_create(); EXPECT_TRUE(endpointDesc->properties != nullptr); - const char *uuid = celix_bundleContext_getProperty(ctx.get(), OSGI_FRAMEWORK_FRAMEWORK_UUID, nullptr); + const char *uuid = celix_bundleContext_getProperty(ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); celix_properties_set(endpointDesc->properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid); celix_properties_set(endpointDesc->properties, OSGI_FRAMEWORK_OBJECTCLASS, RSA_RPC_JSON_TEST_SERVICE); celix_properties_set(endpointDesc->properties, CELIX_FRAMEWORK_SERVICE_VERSION, "1.0.0"); diff --git a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaRequestSenderTrackerUnitTestSuite.cc b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaRequestSenderTrackerUnitTestSuite.cc index 038c6166..9728cde0 100644 --- a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaRequestSenderTrackerUnitTestSuite.cc +++ b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaRequestSenderTrackerUnitTestSuite.cc @@ -35,8 +35,8 @@ class RsaRequestSenderTrackerUnitTestSuite : public ::testing::Test { public: RsaRequestSenderTrackerUnitTestSuite() { auto* props = celix_properties_create(); - celix_properties_set(props, OSGI_FRAMEWORK_FRAMEWORK_STORAGE, ".rsa_json_rpc_impl_cache"); - celix_properties_set(props, OSGI_FRAMEWORK_BUNDLE_VERSION, "1.0.0"); + celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".rsa_json_rpc_impl_cache"); + celix_properties_set(props, CELIX_FRAMEWORK_BUNDLE_VERSION, "1.0.0"); celix_properties_set(props, RSA_JSON_RPC_LOG_CALLS_KEY, "true"); celix_properties_set(props, "CELIX_FRAMEWORK_EXTENDER_PATH", RESOURCES_DIR); auto* fwPtr = celix_frameworkFactory_createFramework(props); diff --git a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.c b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.c index 25c4ac43..de86537f 100644 --- a/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.c +++ b/bundles/remote_services/rsa_rpc_json/src/rsa_json_rpc_impl.c @@ -51,7 +51,7 @@ struct rsa_json_rpc { static unsigned int rsaJsonRpc_generateSerialProtoId(celix_bundle_t *bnd) { const char *bundleSymName = celix_bundle_getSymbolicName(bnd); - const char *bundleVer = celix_bundle_getManifestValue(bnd, OSGI_FRAMEWORK_BUNDLE_VERSION); + const char *bundleVer = celix_bundle_getManifestValue(bnd, CELIX_FRAMEWORK_BUNDLE_VERSION); if (bundleSymName == NULL || bundleVer == NULL) { return 0; } diff --git a/bundles/remote_services/topology_manager/src/activator.c b/bundles/remote_services/topology_manager/src/activator.c index e4a6eeaf..c36b2f92 100644 --- a/bundles/remote_services/topology_manager/src/activator.c +++ b/bundles/remote_services/topology_manager/src/activator.c @@ -166,7 +166,7 @@ celix_status_t celix_bundleActivator_start(void * userData, celix_bundle_context activator->endpointListener = endpointListener; const char *uuid = NULL; - status = bundleContext_getProperty(activator->context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid); + status = bundleContext_getProperty(activator->context, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid); if (!uuid) { celix_logHelper_log(activator->celix_logHelper, CELIX_LOG_LEVEL_ERROR, "TOPOLOGY_MANAGER: no framework UUID defined?!"); return CELIX_ILLEGAL_STATE; diff --git a/bundles/remote_services/topology_manager/src/topology_manager.c b/bundles/remote_services/topology_manager/src/topology_manager.c index ad1d3c23..6076af4f 100644 --- a/bundles/remote_services/topology_manager/src/topology_manager.c +++ b/bundles/remote_services/topology_manager/src/topology_manager.c @@ -819,7 +819,7 @@ static celix_status_t topologyManager_extendFilter(topology_manager_pt manager, celix_bundle_context_t *context = manager->context; const char* uuid = NULL; - status = bundleContext_getProperty(context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid); + status = bundleContext_getProperty(context, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid); if (!uuid) { celix_logHelper_log(manager->loghelper, CELIX_LOG_LEVEL_ERROR, "TOPOLOGY_MANAGER: no framework UUID defined?!"); diff --git a/bundles/remote_services/topology_manager/tms_tst/disc_mock/disc_mock_activator.c b/bundles/remote_services/topology_manager/tms_tst/disc_mock/disc_mock_activator.c index 708f0eac..548b64ca 100644 --- a/bundles/remote_services/topology_manager/tms_tst/disc_mock/disc_mock_activator.c +++ b/bundles/remote_services/topology_manager/tms_tst/disc_mock/disc_mock_activator.c @@ -66,7 +66,7 @@ celix_status_t bundleActivator_start(void * userData, celix_bundle_context_t *co act->reg = NULL; status = bundleContext_registerService(context, DISC_MOCK_SERVICE_NAME, act->serv, NULL, &act->reg); - bundleContext_getProperty(context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid); + uuid = celix_bundleContext_getProperty(context, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); if (!uuid) { return CELIX_ILLEGAL_STATE; diff --git a/bundles/shell/shell/gtest/src/ShellTestSuite.cc b/bundles/shell/shell/gtest/src/ShellTestSuite.cc index 8ee7c015..e9ffc53f 100644 --- a/bundles/shell/shell/gtest/src/ShellTestSuite.cc +++ b/bundles/shell/shell/gtest/src/ShellTestSuite.cc @@ -39,7 +39,7 @@ public: static std::shared_ptr<celix_bundle_context_t> createFrameworkContext() { auto properties = celix_properties_create(); celix_properties_set(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", "true"); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheShellTestSuite"); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheShellTestSuite"); celix_properties_set(properties, "CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL", "trace"); //to ensure "query 0" is still a test case for am empty result. diff --git a/examples/conan_test_package/test_cxx_shell.cpp b/examples/conan_test_package/test_cxx_shell.cpp index da028ffa..73c856a1 100644 --- a/examples/conan_test_package/test_cxx_shell.cpp +++ b/examples/conan_test_package/test_cxx_shell.cpp @@ -43,8 +43,8 @@ int main() { properties = celix_properties_create(); celix_properties_setBool(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", true); - celix_properties_setBool(properties, "org.osgi.framework.storage.clean", true); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheBundleContextTestFramework"); + celix_properties_setBool(properties, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, true); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheBundleContextTestFramework"); fw = celix_frameworkFactory_createFramework(properties); ctx = celix_framework_getFrameworkContext(fw); diff --git a/examples/conan_test_package/test_framework.c b/examples/conan_test_package/test_framework.c index ae9531ed..54bfa126 100644 --- a/examples/conan_test_package/test_framework.c +++ b/examples/conan_test_package/test_framework.c @@ -30,8 +30,8 @@ int main() { properties = celix_properties_create(); celix_properties_setBool(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", true); - celix_properties_setBool(properties, "org.osgi.framework.storage.clean", true); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheBundleContextTestFramework"); + celix_properties_setBool(properties, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, true); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheBundleContextTestFramework"); fw = celix_frameworkFactory_createFramework(properties); ctx = celix_framework_getFrameworkContext(fw); diff --git a/examples/conan_test_package/test_log_helper.c b/examples/conan_test_package/test_log_helper.c index 49a9371c..7ffe8e89 100644 --- a/examples/conan_test_package/test_log_helper.c +++ b/examples/conan_test_package/test_log_helper.c @@ -24,8 +24,8 @@ int main() { celix_properties_t *properties = NULL; properties = celix_properties_create(); celix_properties_setBool(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", true); - celix_properties_setBool(properties, "org.osgi.framework.storage.clean", true); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheBundleContextTestFramework"); + celix_properties_setBool(properties, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, true); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheBundleContextTestFramework"); celix_framework_t *fw = celix_frameworkFactory_createFramework(properties); celix_bundle_context_t *ctx = celix_framework_getFrameworkContext(fw); celix_log_helper_t *logHelper = celix_logHelper_create(ctx, "example_log_helper"); diff --git a/examples/conan_test_package/test_shell.c b/examples/conan_test_package/test_shell.c index db693732..177c0032 100644 --- a/examples/conan_test_package/test_shell.c +++ b/examples/conan_test_package/test_shell.c @@ -45,8 +45,8 @@ int main() { properties = celix_properties_create(); celix_properties_setBool(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", true); - celix_properties_setBool(properties, "org.osgi.framework.storage.clean", true); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheBundleContextTestFramework"); + celix_properties_setBool(properties, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, true); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheBundleContextTestFramework"); fw = celix_frameworkFactory_createFramework(properties); ctx = celix_framework_getFrameworkContext(fw); diff --git a/libs/framework/gtest/src/CelixBundleContextBundlesTestSuite.cc b/libs/framework/gtest/src/CelixBundleContextBundlesTestSuite.cc index 6b673a56..4f21bf9e 100644 --- a/libs/framework/gtest/src/CelixBundleContextBundlesTestSuite.cc +++ b/libs/framework/gtest/src/CelixBundleContextBundlesTestSuite.cc @@ -51,9 +51,9 @@ public: CelixBundleContextBundlesTestSuite() { properties = celix_properties_create(); celix_properties_set(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", "true"); - celix_properties_set(properties, "org.osgi.framework.storage.clean", "true"); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheBundleContextTestFramework"); - celix_properties_set(properties, "CELIX_FRAMEWORK_CONDITION_SERVICES_ENABLED", "false"); + celix_properties_set(properties, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, "true"); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheBundleContextTestFramework"); + celix_properties_set(properties, CELIX_FRAMEWORK_CONDITION_SERVICES_ENABLED, "false"); fw = celix_frameworkFactory_createFramework(properties); diff --git a/libs/framework/gtest/src/CelixBundleContextBundlesWithErrorTestSuite.cc b/libs/framework/gtest/src/CelixBundleContextBundlesWithErrorTestSuite.cc index b82e21ac..c27a0550 100644 --- a/libs/framework/gtest/src/CelixBundleContextBundlesWithErrorTestSuite.cc +++ b/libs/framework/gtest/src/CelixBundleContextBundlesWithErrorTestSuite.cc @@ -37,8 +37,8 @@ public: CelixBundleContextBundlesWithErrorTestSuite() { properties = celix_properties_create(); celix_properties_setBool(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", true); - celix_properties_setBool(properties, "org.osgi.framework.storage.clean", true); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheBundleContextTestFramework"); + celix_properties_setBool(properties, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, true); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheBundleContextTestFramework"); celix_properties_setBool(properties, CELIX_FRAMEWORK_CONDITION_SERVICES_ENABLED, false); celix_properties_set(properties, CELIX_FRAMEWORK_STATIC_EVENT_QUEUE_SIZE, "10"); diff --git a/libs/framework/gtest/src/CelixBundleContextServicesTestSuite.cc b/libs/framework/gtest/src/CelixBundleContextServicesTestSuite.cc index 8780a4b7..7008c7be 100644 --- a/libs/framework/gtest/src/CelixBundleContextServicesTestSuite.cc +++ b/libs/framework/gtest/src/CelixBundleContextServicesTestSuite.cc @@ -44,8 +44,8 @@ public: CelixBundleContextServicesTestSuite() { properties = celix_properties_create(); celix_properties_set(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", "true"); - celix_properties_set(properties, "org.osgi.framework.storage.clean", "onFirstInit"); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheBundleContextTestFramework"); + celix_properties_set(properties, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, "onFirstInit"); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheBundleContextTestFramework"); celix_properties_set(properties, "CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL", "trace"); celix_properties_set(properties, "CELIX_FRAMEWORK_CONDITION_SERVICES_ENABLED", "false"); celix_properties_setLong(properties, CELIX_FRAMEWORK_STATIC_EVENT_QUEUE_SIZE, 256); //ensure that the floodEventLoopTest overflows the static event queue size diff --git a/libs/framework/gtest/src/CxxBundleContextTestSuite.cc b/libs/framework/gtest/src/CxxBundleContextTestSuite.cc index 580a56f8..b5438455 100644 --- a/libs/framework/gtest/src/CxxBundleContextTestSuite.cc +++ b/libs/framework/gtest/src/CxxBundleContextTestSuite.cc @@ -36,7 +36,7 @@ public: CxxBundleContextTestSuite() { auto* properties = celix_properties_create(); celix_properties_set(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", "true"); - celix_properties_set(properties, "org.osgi.framework.storage.clean", "onFirstInit"); + celix_properties_set(properties, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, "onFirstInit"); celix_properties_set(properties, "CELIX_FRAMEWORK_CONDITION_SERVICES_ENABLED", "false"); auto* cfw = celix_frameworkFactory_createFramework(properties); diff --git a/libs/framework/gtest/src/DependencyManagerTestSuite.cc b/libs/framework/gtest/src/DependencyManagerTestSuite.cc index 1d03134b..27cd6a14 100644 --- a/libs/framework/gtest/src/DependencyManagerTestSuite.cc +++ b/libs/framework/gtest/src/DependencyManagerTestSuite.cc @@ -35,8 +35,8 @@ public: DependencyManagerTestSuite() { properties = celix_properties_create(); celix_properties_set(properties, "LOGHELPER_ENABLE_STDOUT_FALLBACK", "true"); - celix_properties_set(properties, "org.osgi.framework.storage.clean", "onFirstInit"); - celix_properties_set(properties, "org.osgi.framework.storage", ".cacheBundleContextTestFramework"); + celix_properties_set(properties, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, "onFirstInit"); + celix_properties_set(properties, CELIX_FRAMEWORK_CACHE_DIR, ".cacheBundleContextTestFramework"); celix_properties_set(properties, "CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL", "trace"); diff --git a/libs/framework/include/celix/Constants.h b/libs/framework/include/celix/Constants.h index 13046110..b37f1b8b 100644 --- a/libs/framework/include/celix/Constants.h +++ b/libs/framework/include/celix/Constants.h @@ -111,10 +111,7 @@ namespace celix { * * If not specified ".cache" is used. */ - constexpr const char * const FRAMEWORK_CACHE_DIR = CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR; - - //@deprecated use FRAMEWORK_CACHE_DIR. - constexpr const char * const FRAMEWORK_STORAGE = CELIX_FRAMEWORK_FRAMEWORK_STORAGE; + constexpr const char * const FRAMEWORK_CACHE_DIR = CELIX_FRAMEWORK_CACHE_DIR; /** * @brief Celix framework environment property (named "org.osgi.framework.uuid") specifying the UUID for the diff --git a/libs/framework/include/celix_constants.h b/libs/framework/include/celix_constants.h index 76920c5b..f7f343c8 100644 --- a/libs/framework/include/celix_constants.h +++ b/libs/framework/include/celix_constants.h @@ -127,16 +127,11 @@ extern "C" { #define CELIX_FRAMEWORK_SERVICE_SHARED_LANGUAGE "shared" //e.g. marker services #define CELIX_FRAMEWORK_BUNDLE_ACTIVATOR "Bundle-Activator" -#define OSGI_FRAMEWORK_BUNDLE_ACTIVATOR CELIX_FRAMEWORK_BUNDLE_ACTIVATOR #define CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_CREATE "celix_bundleActivator_create" #define CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_START "celix_bundleActivator_start" #define CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_STOP "celix_bundleActivator_stop" #define CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_DESTROY "celix_bundleActivator_destroy" -#define OSGI_FRAMEWORK_BUNDLE_ACTIVATOR_CREATE CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_CREATE -#define OSGI_FRAMEWORK_BUNDLE_ACTIVATOR_START CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_START -#define OSGI_FRAMEWORK_BUNDLE_ACTIVATOR_STOP CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_STOP -#define OSGI_FRAMEWORK_BUNDLE_ACTIVATOR_DESTROY CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_DESTROY #define OSGI_FRAMEWORK_DEPRECATED_BUNDLE_ACTIVATOR_CREATE "bundleActivator_create" #define OSGI_FRAMEWORK_DEPRECATED_BUNDLE_ACTIVATOR_START "bundleActivator_start" @@ -151,11 +146,6 @@ extern "C" { #define CELIX_FRAMEWORK_PRIVATE_LIBRARY "Private-Library" #define CELIX_FRAMEWORK_EXPORT_LIBRARY "Export-Library" #define CELIX_FRAMEWORK_IMPORT_LIBRARY "Import-Library" -#define OSGI_FRAMEWORK_BUNDLE_SYMBOLICNAME CELIX_FRAMEWORK_BUNDLE_SYMBOLICNAME -#define OSGI_FRAMEWORK_BUNDLE_VERSION CELIX_FRAMEWORK_BUNDLE_VERSION -#define OSGI_FRAMEWORK_PRIVATE_LIBRARY CELIX_FRAMEWORK_PRIVATE_LIBRARY -#define OSGI_FRAMEWORK_EXPORT_LIBRARY CELIX_FRAMEWORK_EXPORT_LIBRARY -#define OSGI_FRAMEWORK_IMPORT_LIBRARY CELIX_FRAMEWORK_IMPORT_LIBRARY /** * @brief Celix framework environment property (named "CELIX_FRAMEWORK_CACHE_DIR") specifying the cache @@ -165,13 +155,7 @@ extern "C" { * * Default value is ".cache". */ -#define CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR "CELIX_FRAMEWORK_CACHE_DIR" - -//@deprecated use CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR -#define CELIX_FRAMEWORK_FRAMEWORK_STORAGE "CELIX_FRAMEWORK_CACHE_DIR" - -//@deprecated use CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR -#define OSGI_FRAMEWORK_FRAMEWORK_STORAGE "org.osgi.framework.storage" +#define CELIX_FRAMEWORK_CACHE_DIR "CELIX_FRAMEWORK_CACHE_DIR" /** * @brief Celix framework environment property (named "CELIX_FRAMEWORK_CACHE_USE_TMP_DIR") specifying the @@ -181,9 +165,6 @@ extern "C" { */ #define CELIX_FRAMEWORK_CACHE_USE_TMP_DIR "CELIX_FRAMEWORK_CACHE_USE_TMP_DIR" -//@deprecated use CELIX_FRAMEWORK_CACHE_USE_TMP_DIR -#define CELIX_FRAMEWORK_STORAGE_USE_TMP_DIR "org.osgi.framework.storage.use.tmp.dir" - /** * @brief Celix framework environment property (named "CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE") specifying * whether to delete the cache dir on framework creation. @@ -192,21 +173,6 @@ extern "C" { */ #define CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE "CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE" -//@deprecated use CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE -#define CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME "org.osgi.framework.storage.clean" - -//@deprecated use CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE -#define CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_DEFAULT true - -//@deprecated use CELIX_FRAMEWORK_CACHE_USE_TMP_DIR -#define OSGI_FRAMEWORK_STORAGE_USE_TMP_DIR CELIX_FRAMEWORK_STORAGE_USE_TMP_DIR - -//@deprecated use CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE -#define OSGI_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME - -//@deprecated use CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE -#define OSGI_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_DEFAULT CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_DEFAULT - /** * @brief Celix framework environment property (named "org.osgi.framework.uuid") specifying the UUID for the * framework UUID. @@ -217,7 +183,6 @@ extern "C" { * @note The Celix framework expects framework UUIDs to be unique per process. */ #define CELIX_FRAMEWORK_FRAMEWORK_UUID "org.osgi.framework.uuid" -#define OSGI_FRAMEWORK_FRAMEWORK_UUID CELIX_FRAMEWORK_FRAMEWORK_UUID /** * @brief Celix framework environment property (named "CELIX_BUNDLES_PATH") which specified a `:` separated diff --git a/libs/framework/src/bundle_archive.c b/libs/framework/src/bundle_archive.c index e0243815..fef98c69 100644 --- a/libs/framework/src/bundle_archive.c +++ b/libs/framework/src/bundle_archive.c @@ -216,13 +216,13 @@ static celix_status_t celix_bundleArchive_createCacheDirectory(bundle_archive_pt } //populate bundle symbolic name and version from manifest - archive->bundleSymbolicName = celix_utils_strdup(manifest_getValue(*manifestOut, OSGI_FRAMEWORK_BUNDLE_SYMBOLICNAME)); + archive->bundleSymbolicName = celix_utils_strdup(manifest_getValue(*manifestOut, CELIX_FRAMEWORK_BUNDLE_SYMBOLICNAME)); if (archive->bundleSymbolicName == NULL) { fw_log(archive->fw->logger, CELIX_LOG_LEVEL_ERROR, "Failed to initialize archive. Cannot read bundle symbolic name."); manifest_destroy(*manifestOut); return CELIX_BUNDLE_EXCEPTION; } - archive->bundleVersion = celix_utils_strdup(manifest_getValue(*manifestOut, OSGI_FRAMEWORK_BUNDLE_VERSION)); + archive->bundleVersion = celix_utils_strdup(manifest_getValue(*manifestOut, CELIX_FRAMEWORK_BUNDLE_VERSION)); if (archive->bundleVersion == NULL) { fw_log(archive->fw->logger, CELIX_LOG_LEVEL_ERROR, "Failed to initialize archive. Cannot read bundle version."); manifest_destroy(*manifestOut); diff --git a/libs/framework/src/celix_bundle_cache.c b/libs/framework/src/celix_bundle_cache.c index b6191ab0..576d3fe1 100644 --- a/libs/framework/src/celix_bundle_cache.c +++ b/libs/framework/src/celix_bundle_cache.c @@ -69,16 +69,9 @@ static const char* bundleCache_progamName() { static const char* celix_bundleCache_cacheDirPath(celix_framework_t* fw) { bool found = false; const char* cacheDir = celix_framework_getConfigProperty(fw, - CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR, - CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR_DEFAULT, + CELIX_FRAMEWORK_CACHE_DIR, + CELIX_FRAMEWORK_CACHE_DIR_DEFAULT, &found); - if (!found) { - //falling back to old property - cacheDir = celix_framework_getConfigProperty(fw, - OSGI_FRAMEWORK_FRAMEWORK_STORAGE, - CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR_DEFAULT, - NULL); - } return cacheDir; } @@ -88,13 +81,6 @@ static bool celix_bundleCache_useTmpDir(celix_framework_t* fw) { CELIX_FRAMEWORK_CACHE_USE_TMP_DIR, CELIX_FRAMEWORK_CACHE_USE_TMP_DIR_DEFAULT, &converted); - if (!converted) { - //falling back to old property - useTmp = celix_framework_getConfigPropertyAsBool(fw, - CELIX_FRAMEWORK_STORAGE_USE_TMP_DIR, - CELIX_FRAMEWORK_CACHE_USE_TMP_DIR_DEFAULT, - NULL); - } return useTmp; } @@ -104,13 +90,6 @@ static bool celix_bundleCache_cleanOnCreate(celix_framework_t* fw) { CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE, CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE_DEFAULT, &converted); - if (!converted) { - //falling back to old property - cleanOnCreate = celix_framework_getConfigPropertyAsBool(fw, - CELIX_FRAMEWORK_FRAMEWORK_STORAGE_CLEAN_NAME, - CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE_DEFAULT, - NULL); - } return cleanOnCreate; } diff --git a/libs/framework/src/framework.c b/libs/framework/src/framework.c index fc61a53b..3458aec9 100644 --- a/libs/framework/src/framework.c +++ b/libs/framework/src/framework.c @@ -247,7 +247,7 @@ celix_status_t framework_create(framework_pt *out, celix_properties_t* config) { uuid_t uid; uuid_generate(uid); uuid_unparse(uid, uuid); - properties_set(framework->configurationMap, (char*) OSGI_FRAMEWORK_FRAMEWORK_UUID, uuid); + celix_properties_set(framework->configurationMap, CELIX_FRAMEWORK_FRAMEWORK_UUID, uuid); //setup framework logger const char* logStr = celix_framework_getConfigProperty(framework, CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL_CONFIG_NAME, CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL_DEFAULT_VALUE, NULL); @@ -1839,7 +1839,7 @@ bool celix_framework_isCurrentThreadTheEventLoop(framework_t* fw) { const char* celix_framework_getUUID(const celix_framework_t *fw) { if (fw != NULL) { - return celix_properties_get(fw->configurationMap, OSGI_FRAMEWORK_FRAMEWORK_UUID, NULL); + return celix_properties_get(fw->configurationMap, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); } return NULL; } diff --git a/libs/framework/src/framework_private.h b/libs/framework/src/framework_private.h index 6e6cd7a2..a5b299ff 100644 --- a/libs/framework/src/framework_private.h +++ b/libs/framework/src/framework_private.h @@ -53,7 +53,7 @@ extern "C" { #define CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE_DEFAULT false #define CELIX_FRAMEWORK_CACHE_USE_TMP_DIR_DEFAULT false -#define CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR_DEFAULT ".cache" +#define CELIX_FRAMEWORK_CACHE_DIR_DEFAULT ".cache" typedef struct celix_framework_bundle_entry { celix_bundle_t *bnd; diff --git a/libs/framework/src/manifest_parser.c b/libs/framework/src/manifest_parser.c index 479f094c..cef149be 100644 --- a/libs/framework/src/manifest_parser.c +++ b/libs/framework/src/manifest_parser.c @@ -52,7 +52,7 @@ celix_status_t manifestParser_create(module_pt owner, manifest_pt manifest, mani parser->manifest = manifest; parser->owner = owner; - bundleVersion = manifest_getValue(manifest, OSGI_FRAMEWORK_BUNDLE_VERSION); + bundleVersion = manifest_getValue(manifest, CELIX_FRAMEWORK_BUNDLE_VERSION); if (bundleVersion != NULL) { parser->bundleVersion = NULL; version_createVersionFromString(bundleVersion, &parser->bundleVersion); @@ -99,7 +99,7 @@ celix_status_t manifestParser_getAndDuplicateGroup(manifest_parser_pt parser, ch } celix_status_t manifestParser_getAndDuplicateSymbolicName(manifest_parser_pt parser, char **symbolicName) { - return manifestParser_getDuplicateEntry(parser, OSGI_FRAMEWORK_BUNDLE_SYMBOLICNAME, symbolicName); + return manifestParser_getDuplicateEntry(parser, CELIX_FRAMEWORK_BUNDLE_SYMBOLICNAME, symbolicName); } celix_status_t manifestParser_getAndDuplicateName(manifest_parser_pt parser, char **name) {
