You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2019/09/19 19:34:48 UTC
[celix] branch develop updated: CELIX-468 (#53)
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/develop by this push:
new bdf634c CELIX-468 (#53)
bdf634c is described below
commit bdf634c76a23a122a03321735050de9e4ca9c576
Author: idzardh <id...@live.nl>
AuthorDate: Thu Sep 19 21:34:43 2019 +0200
CELIX-468 (#53)
* Added parsing of internal types
* [CELIX-468] Renamed constants to celix_constants
* [CELIX-468] Updated all include paths
* Removed commentary
---
bundles/config_admin/config_admin_tst/config_admin_test.cpp | 2 +-
.../config_admin_tst/example_test/private/src/activator.c | 2 +-
.../config_admin_tst/example_test2/private/src/activator.c | 2 +-
bundles/config_admin/example/private/src/bundle_activator.c | 2 +-
bundles/config_admin/service/private/src/configuration_impl.c | 2 +-
.../config_admin/service/private/src/managed_service_tracker.c | 2 +-
bundles/deployment_admin/src/deployment_admin.c | 2 +-
bundles/deployment_admin/src/deployment_package.c | 2 +-
bundles/device_access/device_access/src/device_manager.c | 2 +-
bundles/device_access/device_access/src/driver_attributes.c | 2 +-
bundles/device_access/device_access/src/driver_matcher.c | 2 +-
.../event_admin/event_admin/private/include/event_admin_impl.h | 2 +-
bundles/http_admin/test/test/http_admin_info_tests.cc | 2 +-
bundles/http_admin/test/test/http_websocket_tests.cc | 2 +-
bundles/logging/log_service/src/log_service_activator.c | 2 +-
bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 2 +-
.../pubsub_admin_websocket/src/pubsub_websocket_topic_sender.c | 2 +-
bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 2 +-
bundles/pubsub/pubsub_discovery/src/psd_activator.c | 2 +-
bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c | 2 +-
bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 2 +-
bundles/pubsub/pubsub_spi/src/pubsub_utils.c | 2 +-
bundles/pubsub/pubsub_spi/src/pubsub_utils_match.c | 2 +-
.../pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c | 2 +-
bundles/pubsub/test/test/loopback_activator.c | 2 +-
bundles/pubsub/test/test/sut_activator.c | 2 +-
bundles/pubsub/test/test/sut_endpoint_activator.c | 2 +-
.../remote_services/discovery_common/src/discovery_activator.c | 2 +-
.../discovery_common/src/endpoint_descriptor_writer.c | 2 +-
bundles/remote_services/discovery_etcd/src/discovery_impl.c | 2 +-
bundles/remote_services/discovery_etcd/src/etcd_watcher.c | 2 +-
bundles/remote_services/discovery_shm/src/discovery_impl.c | 2 +-
bundles/remote_services/discovery_shm/src/discovery_shmWatcher.c | 2 +-
.../remote_service_admin_dfi/src/export_registration_dfi.c | 2 +-
.../remote_service_admin_dfi/src/remote_service_admin_dfi.c | 2 +-
.../private/src/remote_service_admin_impl.c | 2 +-
bundles/remote_services/rsa_common/src/endpoint_description.c | 2 +-
bundles/remote_services/rsa_common/src/export_registration_impl.c | 2 +-
bundles/remote_services/rsa_common/src/import_registration_impl.c | 2 +-
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 +-
bundles/remote_services/topology_manager/tms_tst/tms_tests.cpp | 2 +-
bundles/shell/shell/src/activator.c | 2 +-
bundles/shell/shell_bonjour/private/src/activator.c | 2 +-
.../services_example_c/src/dynamic_consumer_example.c | 2 +-
libs/framework/include/celix/dm/ServiceDependency_Impl.h | 2 +-
libs/framework/include/celix_api.h | 2 +-
libs/framework/include/{constants.h => celix_constants.h} | 8 ++++----
libs/framework/private/test/manifest_parser_test.cpp | 2 +-
libs/framework/private/test/service_reference_test.cpp | 2 +-
libs/framework/private/test/service_registry_test.cpp | 2 +-
libs/framework/src/bundle_cache.c | 2 +-
libs/framework/src/bundle_context.c | 2 +-
libs/framework/src/celix_library_loader.c | 2 +-
libs/framework/src/dm_component_impl.c | 2 +-
libs/framework/src/dm_event.c | 2 +-
libs/framework/src/dm_service_dependency.c | 2 +-
libs/framework/src/framework.c | 2 +-
libs/framework/src/manifest_parser.c | 2 +-
libs/framework/src/service_reference.c | 2 +-
libs/framework/src/service_registration.c | 2 +-
libs/framework/src/service_registry.c | 2 +-
libs/framework/src/service_tracker.c | 2 +-
64 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/bundles/config_admin/config_admin_tst/config_admin_test.cpp b/bundles/config_admin/config_admin_tst/config_admin_test.cpp
index 04cd6d7..fddfff4 100644
--- a/bundles/config_admin/config_admin_tst/config_admin_test.cpp
+++ b/bundles/config_admin/config_admin_tst/config_admin_test.cpp
@@ -37,7 +37,7 @@ extern "C" {
#include "array_list.h"
#include "celix_launcher.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "framework.h"
#include "configuration_admin.h"
#include "example_managed_service_impl.h"
diff --git a/bundles/config_admin/config_admin_tst/example_test/private/src/activator.c b/bundles/config_admin/config_admin_tst/example_test/private/src/activator.c
index bae4daf..fbc8e64 100644
--- a/bundles/config_admin/config_admin_tst/example_test/private/src/activator.c
+++ b/bundles/config_admin/config_admin_tst/example_test/private/src/activator.c
@@ -32,7 +32,7 @@
/* celix.framework */
#include "bundle_activator.h"
#include "bundle_context.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "properties.h"
#include "utils.h"
/* celix.utils */
diff --git a/bundles/config_admin/config_admin_tst/example_test2/private/src/activator.c b/bundles/config_admin/config_admin_tst/example_test2/private/src/activator.c
index a5ff343..53037fe 100644
--- a/bundles/config_admin/config_admin_tst/example_test2/private/src/activator.c
+++ b/bundles/config_admin/config_admin_tst/example_test2/private/src/activator.c
@@ -33,7 +33,7 @@
/* celix.framework */
#include "bundle_activator.h"
#include "bundle_context.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "properties.h"
#include "utils.h"
/* celix.utils */
diff --git a/bundles/config_admin/example/private/src/bundle_activator.c b/bundles/config_admin/example/private/src/bundle_activator.c
index 3e4622f..243ff1b 100644
--- a/bundles/config_admin/example/private/src/bundle_activator.c
+++ b/bundles/config_admin/example/private/src/bundle_activator.c
@@ -1,7 +1,7 @@
#include <stdlib.h>
#include <pthread.h>
-#include <constants.h>
+#include "celix_constants.h"
#include <bundle_context.h>
#include <service_tracker.h>
diff --git a/bundles/config_admin/service/private/src/configuration_impl.c b/bundles/config_admin/service/private/src/configuration_impl.c
index ed3c8c6..a959792 100644
--- a/bundles/config_admin/service/private/src/configuration_impl.c
+++ b/bundles/config_admin/service/private/src/configuration_impl.c
@@ -37,7 +37,7 @@
/* celix.framework */
#include "bundle.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "utils.h"
/* celix.framework_patch*/
#include "framework_patch.h"
diff --git a/bundles/config_admin/service/private/src/managed_service_tracker.c b/bundles/config_admin/service/private/src/managed_service_tracker.c
index c406792..70b20cd 100644
--- a/bundles/config_admin/service/private/src/managed_service_tracker.c
+++ b/bundles/config_admin/service/private/src/managed_service_tracker.c
@@ -36,7 +36,7 @@
/* celix.utils */
#include "hash_map.h"
/* celix.framework */
-#include "constants.h"
+#include "celix_constants.h"
#include "properties.h"
#include "utils.h"
#include "service_reference.h"
diff --git a/bundles/deployment_admin/src/deployment_admin.c b/bundles/deployment_admin/src/deployment_admin.c
index d1f66ca..717cec6 100644
--- a/bundles/deployment_admin/src/deployment_admin.c
+++ b/bundles/deployment_admin/src/deployment_admin.c
@@ -44,7 +44,7 @@
#include "deployment_admin.h"
#include "celix_errno.h"
#include "bundle_context.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "deployment_package.h"
#include "bundle.h"
#include "utils.h"
diff --git a/bundles/deployment_admin/src/deployment_package.c b/bundles/deployment_admin/src/deployment_package.c
index 1520db8..7d63899 100644
--- a/bundles/deployment_admin/src/deployment_package.c
+++ b/bundles/deployment_admin/src/deployment_package.c
@@ -29,7 +29,7 @@
#include "celix_errno.h"
#include "deployment_package.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "utils.h"
#include "bundle_context.h"
#include "module.h"
diff --git a/bundles/device_access/device_access/src/device_manager.c b/bundles/device_access/device_access/src/device_manager.c
index e326013..94a6965 100644
--- a/bundles/device_access/device_access/src/device_manager.c
+++ b/bundles/device_access/device_access/src/device_manager.c
@@ -24,7 +24,7 @@
* \copyright Apache License, Version 2.0
*/
#include <stdlib.h>
-#include <constants.h>
+#include "celix_constants.h"
#include <string.h>
#include "device_manager.h"
diff --git a/bundles/device_access/device_access/src/driver_attributes.c b/bundles/device_access/device_access/src/driver_attributes.c
index 5ac7fda..627b268 100644
--- a/bundles/device_access/device_access/src/driver_attributes.c
+++ b/bundles/device_access/device_access/src/driver_attributes.c
@@ -31,7 +31,7 @@
#include "celixbool.h"
#include "driver_loader.h"
#include "device.h"
-#include "constants.h"
+#include "celix_constants.h"
struct driver_attributes {
bundle_pt bundle;
diff --git a/bundles/device_access/device_access/src/driver_matcher.c b/bundles/device_access/device_access/src/driver_matcher.c
index c294605..3d88f6d 100644
--- a/bundles/device_access/device_access/src/driver_matcher.c
+++ b/bundles/device_access/device_access/src/driver_matcher.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include "hash_map.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "driver_matcher.h"
#include "log_helper.h"
diff --git a/bundles/event_admin/event_admin/private/include/event_admin_impl.h b/bundles/event_admin/event_admin/private/include/event_admin_impl.h
index 11b9c0b..85a97e7 100644
--- a/bundles/event_admin/event_admin/private/include/event_admin_impl.h
+++ b/bundles/event_admin/event_admin/private/include/event_admin_impl.h
@@ -30,7 +30,7 @@
#include <string.h>
#include "celix_errno.h"
#include "bundle_context.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "event_constants.h"
#include "event_admin.h"
#include "event_handler.h"
diff --git a/bundles/http_admin/test/test/http_admin_info_tests.cc b/bundles/http_admin/test/test/http_admin_info_tests.cc
index a7625d3..f44aa5d 100644
--- a/bundles/http_admin/test/test/http_admin_info_tests.cc
+++ b/bundles/http_admin/test/test/http_admin_info_tests.cc
@@ -27,7 +27,7 @@
#include <CppUTest/TestHarness.h>
#include <CppUTestExt/MockSupport.h>
-#include <constants.h>
+#include "celix_constants.h"
extern celix_framework_t *fw;
diff --git a/bundles/http_admin/test/test/http_websocket_tests.cc b/bundles/http_admin/test/test/http_websocket_tests.cc
index 04c70fe..937464f 100644
--- a/bundles/http_admin/test/test/http_websocket_tests.cc
+++ b/bundles/http_admin/test/test/http_websocket_tests.cc
@@ -35,7 +35,7 @@
#include <CppUTest/TestHarness.h>
#include <CppUTestExt/MockSupport.h>
-#include <constants.h>
+#include "celix_constants.h"
#define HTTP_PORT 8000
diff --git a/bundles/logging/log_service/src/log_service_activator.c b/bundles/logging/log_service/src/log_service_activator.c
index 13a43b1..08f706e 100644
--- a/bundles/logging/log_service/src/log_service_activator.c
+++ b/bundles/logging/log_service/src/log_service_activator.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <string.h>
-#include <constants.h>
+#include "celix_constants.h"
#include "bundle_activator.h"
#include "log_service_impl.h"
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 bdce2ae..7f4261c 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
@@ -32,7 +32,7 @@
#include "pubsub_tcp_common.h"
#include "pubsub_endpoint.h"
#include <uuid/uuid.h>
-#include <constants.h>
+#include "celix_constants.h"
#include <signal.h>
#define FIRST_SEND_DELAY_IN_SECONDS 2
diff --git a/bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_topic_sender.c b/bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_topic_sender.c
index 4f80829..c79789e 100644
--- a/bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_topic_sender.c
+++ b/bundles/pubsub/pubsub_admin_websocket/src/pubsub_websocket_topic_sender.c
@@ -29,7 +29,7 @@
#include "pubsub_psa_websocket_constants.h"
#include "pubsub_websocket_common.h"
#include <uuid/uuid.h>
-#include <constants.h>
+#include "celix_constants.h"
#include "http_admin/api.h"
#include "civetweb.h"
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 c7bb7ff..2c237e8 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
@@ -31,7 +31,7 @@
#include "pubsub_psa_zmq_constants.h"
#include "pubsub_zmq_common.h"
#include <uuid/uuid.h>
-#include <constants.h>
+#include "celix_constants.h"
#define FIRST_SEND_DELAY_IN_SECONDS 2
#define ZMQ_BIND_MAX_RETRY 10
diff --git a/bundles/pubsub/pubsub_discovery/src/psd_activator.c b/bundles/pubsub/pubsub_discovery/src/psd_activator.c
index 059098e..73f7359 100644
--- a/bundles/pubsub/pubsub_discovery/src/psd_activator.c
+++ b/bundles/pubsub/pubsub_discovery/src/psd_activator.c
@@ -26,7 +26,7 @@
#include "celix_bundle_context.h"
#include "celix_bundle_activator.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_log.h"
#include "pubsub_listeners.h"
diff --git a/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c b/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c
index 791ad3d..6062429 100644
--- a/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c
+++ b/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c
@@ -30,7 +30,7 @@
#include "celix_bundle_context.h"
#include "celix_properties.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_threads.h"
#include "array_list.h"
#include "utils.h"
diff --git a/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c b/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c
index 6805b79..439a283 100644
--- a/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c
+++ b/bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c
@@ -34,7 +34,7 @@
#include "celix_log.h"
#include "pubsub_endpoint.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "pubsub_utils.h"
diff --git a/bundles/pubsub/pubsub_spi/src/pubsub_utils.c b/bundles/pubsub/pubsub_spi/src/pubsub_utils.c
index 4689076..5857e5f 100644
--- a/bundles/pubsub/pubsub_spi/src/pubsub_utils.c
+++ b/bundles/pubsub/pubsub_spi/src/pubsub_utils.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <stdlib.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_filter.h"
#include "filter.h"
diff --git a/bundles/pubsub/pubsub_spi/src/pubsub_utils_match.c b/bundles/pubsub/pubsub_spi/src/pubsub_utils_match.c
index 3d8a0bd..f733789 100644
--- a/bundles/pubsub/pubsub_spi/src/pubsub_utils_match.c
+++ b/bundles/pubsub/pubsub_spi/src/pubsub_utils_match.c
@@ -28,7 +28,7 @@
#include "pubsub_admin.h"
#include "pubsub_utils.h"
-#include "constants.h"
+#include "celix_constants.h"
static double getPSAScore(const char *requested_admin, const char *request_qos, const char *adminType, double sampleScore, double controlScore, double defaultScore) {
double score;
diff --git a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
index 04f69cf..0db25f1 100644
--- a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
+++ b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
@@ -30,7 +30,7 @@
#include "hash_map.h"
#include "celix_array_list.h"
#include "celix_bundle_context.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "utils.h"
#include "log_service.h"
#include "log_helper.h"
diff --git a/bundles/pubsub/test/test/loopback_activator.c b/bundles/pubsub/test/test/loopback_activator.c
index 7c7496f..14d046a 100644
--- a/bundles/pubsub/test/test/loopback_activator.c
+++ b/bundles/pubsub/test/test/loopback_activator.c
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <constants.h>
+#include "celix_constants.h"
#include <unistd.h>
#include "celix_api.h"
diff --git a/bundles/pubsub/test/test/sut_activator.c b/bundles/pubsub/test/test/sut_activator.c
index adb6598..850bb18 100644
--- a/bundles/pubsub/test/test/sut_activator.c
+++ b/bundles/pubsub/test/test/sut_activator.c
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <constants.h>
+#include "celix_constants.h"
#include <unistd.h>
#include "celix_api.h"
diff --git a/bundles/pubsub/test/test/sut_endpoint_activator.c b/bundles/pubsub/test/test/sut_endpoint_activator.c
index 9e80b37..8ef7f2f 100644
--- a/bundles/pubsub/test/test/sut_endpoint_activator.c
+++ b/bundles/pubsub/test/test/sut_endpoint_activator.c
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <constants.h>
+#include "celix_constants.h"
#include <unistd.h>
#include "celix_api.h"
diff --git a/bundles/remote_services/discovery_common/src/discovery_activator.c b/bundles/remote_services/discovery_common/src/discovery_activator.c
index b089ced..128ebe3 100644
--- a/bundles/remote_services/discovery_common/src/discovery_activator.c
+++ b/bundles/remote_services/discovery_common/src/discovery_activator.c
@@ -31,7 +31,7 @@
#include "bundle_activator.h"
#include "service_tracker.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "log_helper.h"
#include "discovery.h"
diff --git a/bundles/remote_services/discovery_common/src/endpoint_descriptor_writer.c b/bundles/remote_services/discovery_common/src/endpoint_descriptor_writer.c
index 78952d9..19add6f 100644
--- a/bundles/remote_services/discovery_common/src/endpoint_descriptor_writer.c
+++ b/bundles/remote_services/discovery_common/src/endpoint_descriptor_writer.c
@@ -28,7 +28,7 @@
#include <string.h>
#include <libxml/xmlwriter.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "remote_constants.h"
#include "endpoint_description.h"
diff --git a/bundles/remote_services/discovery_etcd/src/discovery_impl.c b/bundles/remote_services/discovery_etcd/src/discovery_impl.c
index 7d23186..27f3ebf 100644
--- a/bundles/remote_services/discovery_etcd/src/discovery_impl.c
+++ b/bundles/remote_services/discovery_etcd/src/discovery_impl.c
@@ -30,7 +30,7 @@
#include <netdb.h>
#include <netinet/in.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_threads.h"
#include "bundle_context.h"
#include "array_list.h"
diff --git a/bundles/remote_services/discovery_etcd/src/etcd_watcher.c b/bundles/remote_services/discovery_etcd/src/etcd_watcher.c
index c9dee47..87a2914 100644
--- a/bundles/remote_services/discovery_etcd/src/etcd_watcher.c
+++ b/bundles/remote_services/discovery_etcd/src/etcd_watcher.c
@@ -31,7 +31,7 @@
#include "log_helper.h"
#include "log_service.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "utils.h"
#include "discovery.h"
#include "discovery_impl.h"
diff --git a/bundles/remote_services/discovery_shm/src/discovery_impl.c b/bundles/remote_services/discovery_shm/src/discovery_impl.c
index f8c805a..07f6e4d 100644
--- a/bundles/remote_services/discovery_shm/src/discovery_impl.c
+++ b/bundles/remote_services/discovery_shm/src/discovery_impl.c
@@ -30,7 +30,7 @@
#include <netdb.h>
#include <netinet/in.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_threads.h"
#include "bundle_context.h"
#include "array_list.h"
diff --git a/bundles/remote_services/discovery_shm/src/discovery_shmWatcher.c b/bundles/remote_services/discovery_shm/src/discovery_shmWatcher.c
index c31c968..d626294 100644
--- a/bundles/remote_services/discovery_shm/src/discovery_shmWatcher.c
+++ b/bundles/remote_services/discovery_shm/src/discovery_shmWatcher.c
@@ -32,7 +32,7 @@
#include "celix_log.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "discovery_impl.h"
#include "discovery_shm.h"
diff --git a/bundles/remote_services/remote_service_admin_dfi/src/export_registration_dfi.c b/bundles/remote_services/remote_service_admin_dfi/src/export_registration_dfi.c
index a0bd763..5aa6ba4 100644
--- a/bundles/remote_services/remote_service_admin_dfi/src/export_registration_dfi.c
+++ b/bundles/remote_services/remote_service_admin_dfi/src/export_registration_dfi.c
@@ -25,7 +25,7 @@
#include <service_tracker_customizer.h>
#include <service_tracker.h>
#include <json_rpc.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "export_registration_dfi.h"
#include "dfi_utils.h"
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 df8e8ef..c21fa74 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
@@ -37,7 +37,7 @@
#include "json_rpc.h"
#include "remote_constants.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "civetweb.h"
#include "remote_service_admin_dfi_constants.h"
diff --git a/bundles/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c b/bundles/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
index a20b1e7..c59f586 100644
--- a/bundles/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
+++ b/bundles/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
@@ -41,7 +41,7 @@
#include "export_registration_impl.h"
#include "import_registration_impl.h"
#include "remote_constants.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "utils.h"
#include "bundle_context.h"
#include "bundle.h"
diff --git a/bundles/remote_services/rsa_common/src/endpoint_description.c b/bundles/remote_services/rsa_common/src/endpoint_description.c
index 174accc..24b9ddb 100644
--- a/bundles/remote_services/rsa_common/src/endpoint_description.c
+++ b/bundles/remote_services/rsa_common/src/endpoint_description.c
@@ -31,7 +31,7 @@
#include "endpoint_description.h"
#include "remote_constants.h"
-#include "constants.h"
+#include "celix_constants.h"
static celix_status_t endpointDescription_verifyLongProperty(celix_properties_t *properties, char *propertyName, unsigned long *longProperty);
diff --git a/bundles/remote_services/rsa_common/src/export_registration_impl.c b/bundles/remote_services/rsa_common/src/export_registration_impl.c
index e378a9c..697d4ed 100644
--- a/bundles/remote_services/rsa_common/src/export_registration_impl.c
+++ b/bundles/remote_services/rsa_common/src/export_registration_impl.c
@@ -25,7 +25,7 @@
*/
#include <stdlib.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_errno.h"
diff --git a/bundles/remote_services/rsa_common/src/import_registration_impl.c b/bundles/remote_services/rsa_common/src/import_registration_impl.c
index 82701a0..dc81d7f 100644
--- a/bundles/remote_services/rsa_common/src/import_registration_impl.c
+++ b/bundles/remote_services/rsa_common/src/import_registration_impl.c
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <string.h>
-#include <constants.h>
+#include "celix_constants.h"
#include "celix_errno.h"
diff --git a/bundles/remote_services/topology_manager/src/activator.c b/bundles/remote_services/topology_manager/src/activator.c
index 7e1658b..304bf0e 100644
--- a/bundles/remote_services/topology_manager/src/activator.c
+++ b/bundles/remote_services/topology_manager/src/activator.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "bundle_activator.h"
#include "service_tracker.h"
#include "service_registration.h"
diff --git a/bundles/remote_services/topology_manager/src/topology_manager.c b/bundles/remote_services/topology_manager/src/topology_manager.c
index 906407c..b01866d 100644
--- a/bundles/remote_services/topology_manager/src/topology_manager.c
+++ b/bundles/remote_services/topology_manager/src/topology_manager.c
@@ -30,7 +30,7 @@
#include "celixbool.h"
#include "topology_manager.h"
#include "bundle_context.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "bundle.h"
#include "remote_service_admin.h"
#include "remote_constants.h"
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 06d56fa..a021b1b 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
@@ -29,7 +29,7 @@
#include "celix_errno.h"
#include "disc_mock_service.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "remote_constants.h"
celix_status_t discovery_endpointAdded(void *handle, endpoint_description_t *endpoint, char *matchedFilter);
diff --git a/bundles/remote_services/topology_manager/tms_tst/tms_tests.cpp b/bundles/remote_services/topology_manager/tms_tst/tms_tests.cpp
index 94a2f73..5bbf570 100644
--- a/bundles/remote_services/topology_manager/tms_tst/tms_tests.cpp
+++ b/bundles/remote_services/topology_manager/tms_tst/tms_tests.cpp
@@ -42,7 +42,7 @@ extern "C" {
#include <jansson.h>
#include "celix_launcher.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "endpoint_description.h"
#include "framework.h"
#include "topology_manager.h"
diff --git a/bundles/shell/shell/src/activator.c b/bundles/shell/shell/src/activator.c
index 10749d0..92bdfd1 100644
--- a/bundles/shell/shell/src/activator.c
+++ b/bundles/shell/shell/src/activator.c
@@ -30,7 +30,7 @@
#include "bundle_activator.h"
#include "std_commands.h"
#include "service_tracker.h"
-#include "constants.h"
+#include "celix_constants.h"
#define NUMBER_OF_COMMANDS 11
diff --git a/bundles/shell/shell_bonjour/private/src/activator.c b/bundles/shell/shell_bonjour/private/src/activator.c
index e05211d..3cf6f13 100644
--- a/bundles/shell/shell_bonjour/private/src/activator.c
+++ b/bundles/shell/shell_bonjour/private/src/activator.c
@@ -30,7 +30,7 @@
#include "bundle_activator.h"
#include "bundle_context.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "bonjour_shell.h"
diff --git a/examples/celix-examples/services_example_c/src/dynamic_consumer_example.c b/examples/celix-examples/services_example_c/src/dynamic_consumer_example.c
index 5173efc..62740fc 100644
--- a/examples/celix-examples/services_example_c/src/dynamic_consumer_example.c
+++ b/examples/celix-examples/services_example_c/src/dynamic_consumer_example.c
@@ -21,7 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <constants.h>
+#include "celix_constants.h"
#include "example_calc.h"
#include <celix_api.h>
diff --git a/libs/framework/include/celix/dm/ServiceDependency_Impl.h b/libs/framework/include/celix/dm/ServiceDependency_Impl.h
index 846e0c0..ae13be8 100644
--- a/libs/framework/include/celix/dm/ServiceDependency_Impl.h
+++ b/libs/framework/include/celix/dm/ServiceDependency_Impl.h
@@ -20,7 +20,7 @@
#include <vector>
#include <iostream>
#include <cstring>
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_properties.h"
using namespace celix::dm;
diff --git a/libs/framework/include/celix_api.h b/libs/framework/include/celix_api.h
index 0b8409f..fed284c 100644
--- a/libs/framework/include/celix_api.h
+++ b/libs/framework/include/celix_api.h
@@ -22,7 +22,7 @@
#include "properties.h"
#include "array_list.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "bundle.h"
#include "bundle_context.h"
#include "framework.h"
diff --git a/libs/framework/include/constants.h b/libs/framework/include/celix_constants.h
similarity index 97%
rename from libs/framework/include/constants.h
rename to libs/framework/include/celix_constants.h
index a228665..90b734d 100644
--- a/libs/framework/include/constants.h
+++ b/libs/framework/include/celix_constants.h
@@ -17,15 +17,15 @@
*under the License.
*/
/*
- * constants.h
+ * celix_constants.h
*
* \date Apr 29, 2010
* \author <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
* \copyright Apache License, Version 2.0
*/
-#ifndef CONSTANTS_H_
-#define CONSTANTS_H_
+#ifndef CELIX_CONSTANTS_H_
+#define CELIX_CONSTANTS_H_
#include <stdbool.h>
@@ -91,4 +91,4 @@ static const char *const CELIX_LOAD_BUNDLES_WITH_NODELETE = "CELIX_LOAD_BUNDLES_
}
#endif
-#endif /* CONSTANTS_H_ */
+#endif /* CELIX_CONSTANTS_H_ */
diff --git a/libs/framework/private/test/manifest_parser_test.cpp b/libs/framework/private/test/manifest_parser_test.cpp
index d3fdbbf..97c0b57 100644
--- a/libs/framework/private/test/manifest_parser_test.cpp
+++ b/libs/framework/private/test/manifest_parser_test.cpp
@@ -35,7 +35,7 @@
extern "C" {
#include "capability_private.h"
#include "requirement_private.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "manifest_parser.h"
#include "attribute.h"
#include "celix_log.h"
diff --git a/libs/framework/private/test/service_reference_test.cpp b/libs/framework/private/test/service_reference_test.cpp
index 27a59d5..549c399 100644
--- a/libs/framework/private/test/service_reference_test.cpp
+++ b/libs/framework/private/test/service_reference_test.cpp
@@ -35,7 +35,7 @@
extern "C" {
#include "service_reference_private.h"
#include "service_reference.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_log.h"
#include "service_registry.h"
#include "CppUTestExt/MockSupport_c.h"
diff --git a/libs/framework/private/test/service_registry_test.cpp b/libs/framework/private/test/service_registry_test.cpp
index 8830974..e124693 100644
--- a/libs/framework/private/test/service_registry_test.cpp
+++ b/libs/framework/private/test/service_registry_test.cpp
@@ -34,7 +34,7 @@
#include "CppUTestExt/MockSupport_c.h"
extern "C" {
-#include "constants.h"
+#include "celix_constants.h"
#include "listener_hook_service.h"
#include "service_registry.h"
#include "service_registry_private.h"
diff --git a/libs/framework/src/bundle_cache.c b/libs/framework/src/bundle_cache.c
index 6b419f8..84d70ef 100644
--- a/libs/framework/src/bundle_cache.c
+++ b/libs/framework/src/bundle_cache.c
@@ -28,7 +28,7 @@
#include "bundle_cache_private.h"
#include "bundle_archive.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_log.h"
#include "celix_properties.h"
#include "celix_utils_api.h"
diff --git a/libs/framework/src/bundle_context.c b/libs/framework/src/bundle_context.c
index 506fb1e..47e349f 100644
--- a/libs/framework/src/bundle_context.c
+++ b/libs/framework/src/bundle_context.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <utils.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "bundle_context_private.h"
#include "framework_private.h"
#include "bundle.h"
diff --git a/libs/framework/src/celix_library_loader.c b/libs/framework/src/celix_library_loader.c
index dc7c75f..812ac2a 100644
--- a/libs/framework/src/celix_library_loader.c
+++ b/libs/framework/src/celix_library_loader.c
@@ -17,7 +17,7 @@
*under the License.
*/
-#include "constants.h"
+#include "celix_constants.h"
#include "celix_library_loader.h"
#include <dlfcn.h>
diff --git a/libs/framework/src/dm_component_impl.c b/libs/framework/src/dm_component_impl.c
index 1187928..228a20d 100644
--- a/libs/framework/src/dm_component_impl.c
+++ b/libs/framework/src/dm_component_impl.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "filter.h"
#include "dm_component_impl.h"
diff --git a/libs/framework/src/dm_event.c b/libs/framework/src/dm_event.c
index c1cc4ba..f2f8b31 100644
--- a/libs/framework/src/dm_event.c
+++ b/libs/framework/src/dm_event.c
@@ -26,7 +26,7 @@
*/
#include <stdlib.h>
-#include <constants.h>
+#include "celix_constants.h"
#include <utils.h>
#include "dm_event.h"
diff --git a/libs/framework/src/dm_service_dependency.c b/libs/framework/src/dm_service_dependency.c
index 6d86bb9..638654a 100644
--- a/libs/framework/src/dm_service_dependency.c
+++ b/libs/framework/src/dm_service_dependency.c
@@ -30,7 +30,7 @@
#include <limits.h>
#include <assert.h>
-#include "constants.h"
+#include "celix_constants.h"
#include "dm_service_dependency_impl.h"
#include "dm_component_impl.h"
diff --git a/libs/framework/src/framework.c b/libs/framework/src/framework.c
index 51615a7..57854f3 100644
--- a/libs/framework/src/framework.c
+++ b/libs/framework/src/framework.c
@@ -28,7 +28,7 @@
#include "celix_dependency_manager.h"
#include "framework_private.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "resolver.h"
#include "utils.h"
#include "linked_list_iterator.h"
diff --git a/libs/framework/src/manifest_parser.c b/libs/framework/src/manifest_parser.c
index cab6698..f6224e9 100644
--- a/libs/framework/src/manifest_parser.c
+++ b/libs/framework/src/manifest_parser.c
@@ -27,7 +27,7 @@
#include <string.h>
#include "utils.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "manifest_parser.h"
#include "capability.h"
#include "requirement.h"
diff --git a/libs/framework/src/service_reference.c b/libs/framework/src/service_reference.c
index e6a3c4b..b1f2683 100644
--- a/libs/framework/src/service_reference.c
+++ b/libs/framework/src/service_reference.c
@@ -25,7 +25,7 @@
*/
#include <stdio.h>
#include <stdlib.h>
-#include <constants.h>
+#include "celix_constants.h"
#include <stdint.h>
#include <utils.h>
#include <assert.h>
diff --git a/libs/framework/src/service_registration.c b/libs/framework/src/service_registration.c
index 91fa62c..b86325b 100644
--- a/libs/framework/src/service_registration.c
+++ b/libs/framework/src/service_registration.c
@@ -29,7 +29,7 @@
#include <assert.h>
#include "service_registration_private.h"
-#include "constants.h"
+#include "celix_constants.h"
static celix_status_t serviceRegistration_initializeProperties(service_registration_pt registration, properties_pt properties);
static celix_status_t serviceRegistration_createInternal(registry_callback_t callback, bundle_pt bundle, const char* serviceName, unsigned long serviceId,
diff --git a/libs/framework/src/service_registry.c b/libs/framework/src/service_registry.c
index 703b013..a62d690 100644
--- a/libs/framework/src/service_registry.c
+++ b/libs/framework/src/service_registry.c
@@ -25,7 +25,7 @@
#include "service_registry_private.h"
#include "service_registration_private.h"
#include "listener_hook_service.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "service_reference_private.h"
#include "framework_private.h"
diff --git a/libs/framework/src/service_tracker.c b/libs/framework/src/service_tracker.c
index 66f1c45..653e69e 100644
--- a/libs/framework/src/service_tracker.c
+++ b/libs/framework/src/service_tracker.c
@@ -26,7 +26,7 @@
#include "service_tracker_private.h"
#include "bundle_context.h"
-#include "constants.h"
+#include "celix_constants.h"
#include "service_reference.h"
#include "celix_log.h"
#include "bundle_context_private.h"