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 30fd1f347042118062e5d651d496d6af82d3668a Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Oct 29 14:07:41 2023 +0100 #509: Rename CELIX_FRAMEWORK_FRAMEWORK_UUID to CELIX_FRAMEWORK_UUID --- .../pubsub/examples/pubsub/publisher/private/src/ps_pub_activator.c | 2 +- .../pubsub/pubsub_websocket/private/src/ps_websocket_activator.c | 2 +- bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 2 +- bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 2 +- bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_admin.c | 2 +- bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 2 +- bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 2 +- bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c | 2 +- bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 4 ++-- bundles/remote_services/discovery_common/src/discovery_activator.c | 2 +- bundles/remote_services/discovery_etcd/src/etcd_watcher.c | 2 +- .../discovery_zeroconf/src/discovery_zeroconf_announcer.c | 2 +- .../discovery_zeroconf/src/discovery_zeroconf_watcher.c | 2 +- .../remote_service_admin_dfi/src/remote_service_admin_dfi.c | 2 +- .../remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c | 4 ++-- bundles/remote_services/topology_manager/src/activator.c | 2 +- bundles/remote_services/topology_manager/src/topology_manager.c | 2 +- .../topology_manager/tms_tst/disc_mock/disc_mock_activator.c | 2 +- libs/framework/include/celix/Constants.h | 2 +- libs/framework/include/celix_constants.h | 2 +- libs/framework/src/framework.c | 4 ++-- 21 files changed, 24 insertions(+), 24 deletions(-) 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 3a3b7472..7efc3ac1 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,CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *fwUUID = celix_bundleContext_getProperty(ctx,CELIX_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 bbfb7e31..5cd72d3e 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,CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *fwUUID = celix_bundleContext_getProperty(ctx,CELIX_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 07a76719..bdca02cb 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + psa->fwUUID = celix_bundleContext_getProperty(ctx, CELIX_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 9763e336..7272af28 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *uuid = celix_bundleContext_getProperty(ctx, CELIX_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 cee80028..ee48d276 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + psa->fwUUID = celix_bundleContext_getProperty(ctx, CELIX_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 cd70e503..7b101b80 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + psa->fwUUID = celix_bundleContext_getProperty(ctx, CELIX_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 5cf4b576..a8ff08f3 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char* uuid = celix_bundleContext_getProperty(ctx, CELIX_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 2e0169d4..d048ef75 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + disc->fwUUID = celix_bundleContext_getProperty(context, CELIX_FRAMEWORK_UUID, NULL); return disc; } diff --git a/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c b/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c index d3b3cc19..422fc0cf 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char* fwUUID = celix_bundleContext_getProperty(ctx, CELIX_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, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char* fwUUID= celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_UUID, NULL); assert(fwUUID != NULL); char* topic = NULL; diff --git a/bundles/remote_services/discovery_common/src/discovery_activator.c b/bundles/remote_services/discovery_common/src/discovery_activator.c index c3038bad..c1b44111 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 celix_bundleActivator_start(void * userData, celix_bundle_context struct activator *activator = userData; const char *uuid = NULL; - status = bundleContext_getProperty(context, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid); + status = bundleContext_getProperty(context, CELIX_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 0b32b695..131ec14e 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid)) != CELIX_SUCCESS) || (!uuid)) { + else if (((bundleContext_getProperty(context, CELIX_FRAMEWORK_UUID, &uuid)) != CELIX_SUCCESS) || (!uuid)) { status = CELIX_ILLEGAL_STATE; } else if (rootPath[strlen(rootPath) - 1] == '/') { diff --git a/bundles/remote_services/discovery_zeroconf/src/discovery_zeroconf_announcer.c b/bundles/remote_services/discovery_zeroconf/src/discovery_zeroconf_announcer.c index 4f2510ce..1dcbc3a3 100644 --- a/bundles/remote_services/discovery_zeroconf/src/discovery_zeroconf_announcer.c +++ b/bundles/remote_services/discovery_zeroconf/src/discovery_zeroconf_announcer.c @@ -119,7 +119,7 @@ celix_status_t discoveryZeroconfAnnouncer_create(celix_bundle_context_t *ctx, ce celix_autoptr(celix_array_list_t) revokedEndpoints = announcer->revokedEndpoints = celix_arrayList_create(); assert(announcer->revokedEndpoints != NULL); - const char *fwUuid = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *fwUuid = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_UUID, NULL); if (fwUuid == NULL || strlen(fwUuid) >= sizeof(announcer->fwUuid)) { celix_logHelper_fatal(logHelper, "Announcer: Failed to get framework uuid."); return CELIX_BUNDLE_EXCEPTION; diff --git a/bundles/remote_services/discovery_zeroconf/src/discovery_zeroconf_watcher.c b/bundles/remote_services/discovery_zeroconf/src/discovery_zeroconf_watcher.c index 308a9c92..f2380eff 100644 --- a/bundles/remote_services/discovery_zeroconf/src/discovery_zeroconf_watcher.c +++ b/bundles/remote_services/discovery_zeroconf/src/discovery_zeroconf_watcher.c @@ -107,7 +107,7 @@ celix_status_t discoveryZeroconfWatcher_create(celix_bundle_context_t *ctx, celi } celix_auto(celix_fd_t) eventFd = watcher->eventFd; - const char *fwUuid = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *fwUuid = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_UUID, NULL); if (fwUuid == NULL || strlen(fwUuid) >= sizeof(watcher->fwUuid)) { celix_logHelper_fatal(logHelper, "Watcher: Failed to get framework uuid."); return CELIX_BUNDLE_EXCEPTION; 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 14de6e30..4e6c5e18 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid); + bundleContext_getProperty(admin->context, CELIX_FRAMEWORK_UUID, &uuid); celix_properties_set(endpointProperties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid); celix_properties_set(endpointProperties, CELIX_FRAMEWORK_SERVICE_NAME, interface); celix_properties_set(endpointProperties, OSGI_RSA_ENDPOINT_SERVICE_ID, serviceId); diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c index d45854f8..72a8d1a5 100755 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c @@ -114,7 +114,7 @@ celix_status_t rsaShm_create(celix_bundle_context_t *context, celix_log_helper_t celix_auto(celix_service_registration_guard_t) reg = celix_serviceRegistrationGuard_init(context, ad->reqSenderSvcId); - const char *fwUuid = celix_bundleContext_getProperty(context, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *fwUuid = celix_bundleContext_getProperty(context, CELIX_FRAMEWORK_UUID, NULL); if (fwUuid == NULL) { celix_logHelper_error(logHelper,"Error Getting cfw uuid for shm rsa admin."); return CELIX_BUNDLE_EXCEPTION; @@ -505,7 +505,7 @@ static celix_status_t rsaShm_createEndpointDescription(rsa_shm_t *admin, char endpoint_uuid[37]; uuid_unparse_lower(endpoint_uid, endpoint_uuid); - const char *uuid = celix_bundleContext_getProperty(admin->context, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + const char *uuid = celix_bundleContext_getProperty(admin->context, CELIX_FRAMEWORK_UUID, NULL); if (uuid == NULL) { celix_logHelper_error(admin->logHelper, "Cannot get framework uuid"); return CELIX_FRAMEWORK_EXCEPTION; diff --git a/bundles/remote_services/topology_manager/src/activator.c b/bundles/remote_services/topology_manager/src/activator.c index 1e8e36dd..79ed7c94 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid); + status = bundleContext_getProperty(activator->context, CELIX_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 c58115ff..4ff46e0f 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, CELIX_FRAMEWORK_FRAMEWORK_UUID, &uuid); + status = bundleContext_getProperty(context, CELIX_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 53929ad1..bd5328bf 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 celix_bundleActivator_start(void * userData, celix_bundle_context act->reg = NULL; status = bundleContext_registerService(context, DISC_MOCK_SERVICE_NAME, act->serv, NULL, &act->reg); - uuid = celix_bundleContext_getProperty(context, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + uuid = celix_bundleContext_getProperty(context, CELIX_FRAMEWORK_UUID, NULL); if (!uuid) { return CELIX_ILLEGAL_STATE; diff --git a/libs/framework/include/celix/Constants.h b/libs/framework/include/celix/Constants.h index b37f1b8b..9d5cccba 100644 --- a/libs/framework/include/celix/Constants.h +++ b/libs/framework/include/celix/Constants.h @@ -122,7 +122,7 @@ namespace celix { * * @note The Celix framework expects framework UUIDs to be unique per process. */ - constexpr const char * const FRAMEWORK_UUID = CELIX_FRAMEWORK_FRAMEWORK_UUID; + constexpr const char * const FRAMEWORK_UUID = CELIX_FRAMEWORK_UUID; /** * @brief Celix framework environment property (named "CELIX_FRAMEWORK_STATIC_EVENT_QUEUE_SIZE") which configures diff --git a/libs/framework/include/celix_constants.h b/libs/framework/include/celix_constants.h index 75d38171..1fb75e09 100644 --- a/libs/framework/include/celix_constants.h +++ b/libs/framework/include/celix_constants.h @@ -163,7 +163,7 @@ extern "C" { * * @note The Celix framework expects framework UUIDs to be unique per process. */ -#define CELIX_FRAMEWORK_FRAMEWORK_UUID "org.osgi.framework.uuid" +#define CELIX_FRAMEWORK_UUID "org.osgi.framework.uuid" /** * @brief Celix framework environment property (named "CELIX_BUNDLES_PATH") which specified a `:` separated diff --git a/libs/framework/src/framework.c b/libs/framework/src/framework.c index e22d4b85..9321b6fc 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); - celix_properties_set(framework->configurationMap, CELIX_FRAMEWORK_FRAMEWORK_UUID, uuid); + celix_properties_set(framework->configurationMap, CELIX_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); @@ -1834,7 +1834,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, CELIX_FRAMEWORK_FRAMEWORK_UUID, NULL); + return celix_properties_get(fw->configurationMap, CELIX_FRAMEWORK_UUID, NULL); } return NULL; }
