celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rlenfer...@apache.org
Subject [celix] 02/03: Refactored properties_pt to celix_properties_t* in RSA
Date Wed, 26 Jun 2019 20:38:55 GMT
This is an automated email from the ASF dual-hosted git repository.

rlenferink pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 2c34546d2e82a3425160455f5d70bebd2574f4d2
Author: Roy Lenferink <lenferinkroy@gmail.com>
AuthorDate: Wed Jun 26 15:30:39 2019 +0200

    Refactored properties_pt to celix_properties_t* in RSA
---
 .../discovery_common/src/discovery_activator.c     |   8 +-
 .../src/endpoint_descriptor_reader.c               | 100 ++++++++++-----------
 .../calculator_api/include/calculator_service.h    |  22 ++---
 .../src/calculator_shell_activator.c               |  12 +--
 .../src/export_registration_dfi.c                  |  14 +--
 .../src/import_registration_dfi.c                  |   3 +-
 .../src/remote_service_admin_dfi.c                 |  59 ++++++------
 .../src/remote_service_admin_dfi.h                 |   2 +-
 .../test/src/rsa_tests.cpp                         |  12 +--
 .../private/src/remote_service_admin_impl.c        |  52 +++++------
 .../rsa_common/src/endpoint_description.c          |  24 ++---
 .../rsa_common/src/remote_proxy_factory_impl.c     |  18 ++--
 .../rsa_common/src/remote_service_admin_impl.h     |   2 +-
 .../rsa_spi/include/endpoint_description.h         |   4 +-
 .../remote_services/rsa_spi/include/remote_proxy.h |   4 +-
 .../rsa_spi/include/remote_service_admin.h         |   2 +-
 .../topology_manager/include/tm_scope.h            |   2 +-
 .../topology_manager/src/activator.c               |   6 +-
 .../remote_services/topology_manager/src/scope.c   |  26 +++---
 .../remote_services/topology_manager/src/scope.h   |   4 +-
 .../topology_manager/src/topology_manager.c        |   6 +-
 .../tms_tst/disc_mock/disc_mock_activator.c        |   8 +-
 .../topology_manager/tms_tst/tms_tests.cpp         |  78 ++++++++--------
 23 files changed, 233 insertions(+), 235 deletions(-)

diff --git a/bundles/remote_services/discovery_common/src/discovery_activator.c b/bundles/remote_services/discovery_common/src/discovery_activator.c
index 30a40b3..a28e39e 100644
--- a/bundles/remote_services/discovery_common/src/discovery_activator.c
+++ b/bundles/remote_services/discovery_common/src/discovery_activator.c
@@ -115,9 +115,9 @@ celix_status_t bundleActivator_start(void * userData, bundle_context_pt context)
 
 	logHelper_log(activator->loghelper, OSGI_LOGSERVICE_DEBUG, "using scope %s.", scope);
 
-	properties_pt props = properties_create();
-	properties_set(props, "DISCOVERY", "true");
-	properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
+	celix_properties_t *props = celix_properties_create();
+	celix_properties_set(props, "DISCOVERY", "true");
+	celix_properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
 
 	if (status == CELIX_SUCCESS) {
 		status = serviceTracker_open(activator->endpointListenerTracker);
@@ -142,7 +142,7 @@ celix_status_t bundleActivator_start(void * userData, bundle_context_pt context)
 			}
 		}
 	}
-	// We can release the scope, as properties_set makes a copy of the key & value...
+	// We can release the scope, as celix_properties_set makes a copy of the key & value...
 	free(scope);
 
 	return status;
diff --git a/bundles/remote_services/discovery_common/src/endpoint_descriptor_reader.c b/bundles/remote_services/discovery_common/src/endpoint_descriptor_reader.c
index 887bc29..f12dfe7 100644
--- a/bundles/remote_services/discovery_common/src/endpoint_descriptor_reader.c
+++ b/bundles/remote_services/discovery_common/src/endpoint_descriptor_reader.c
@@ -66,27 +66,27 @@ celix_status_t endpointDescriptorReader_destroy(endpoint_descriptor_reader_pt re
     return status;
 }
 
-void endpointDescriptorReader_addSingleValuedProperty(properties_pt properties, const xmlChar* name, const xmlChar* value) {
-	properties_set(properties, (char *) name, (char*) value);
+void endpointDescriptorReader_addSingleValuedProperty(celix_properties_t *properties, const xmlChar* name, const xmlChar* value) {
+    celix_properties_set(properties, (char *) name, (char*) value);
 }
 
-void endpointDescriptorReader_addMultiValuedProperty(properties_pt properties, const xmlChar* name, array_list_pt values) {
-	char *value = calloc(256, sizeof(*value));
-	if (value) {
-		unsigned int size = arrayList_size(values);
+void endpointDescriptorReader_addMultiValuedProperty(celix_properties_t *properties, const xmlChar* name, array_list_pt values) {
+    char *value = calloc(256, sizeof(*value));
+    if (value) {
+        unsigned int size = arrayList_size(values);
         unsigned int i;
         for (i = 0; i < size; i++) {
-			char* item = (char*) arrayList_get(values, i);
-			if (i > 0) {
-				value = strcat(value, ",");
-			}
-			value = strcat(value, item);
-		}
+            char* item = (char*) arrayList_get(values, i);
+            if (i > 0) {
+                value = strcat(value, ",");
+            }
+            value = strcat(value, item);
+        }
 
-		properties_set(properties, (char *) name, value);
+        celix_properties_set(properties, (char *) name, value);
 
-		free(value);
-	}
+        free(value);
+    }
 }
 
 celix_status_t endpointDescriptorReader_parseDocument(endpoint_descriptor_reader_pt reader, char *document, array_list_pt *endpoints) {
@@ -114,15 +114,15 @@ celix_status_t endpointDescriptorReader_parseDocument(endpoint_descriptor_reader
 
         array_list_pt endpointDescriptions = NULL;
         if (*endpoints) {
-        	// use the given arraylist...
-        	endpointDescriptions = *endpoints;
+            // use the given arraylist...
+            endpointDescriptions = *endpoints;
         } else {
-			arrayList_create(&endpointDescriptions);
-			// return the read endpoints...
-			*endpoints = endpointDescriptions;
+            arrayList_create(&endpointDescriptions);
+            // return the read endpoints...
+            *endpoints = endpointDescriptions;
         }
 
-        properties_pt endpointProperties = NULL;
+        celix_properties_t *endpointProperties = NULL;
 
         int read = xmlTextReaderRead(reader->reader);
         while (read == XML_TEXTREADER_MODE_INTERACTIVE) {
@@ -152,10 +152,10 @@ celix_status_t endpointDescriptorReader_parseDocument(endpoint_descriptor_reader
                     valueBuffer = xmlStrcat(valueBuffer, BAD_CAST ">");
                 } else if (xmlStrcmp(localname, ENDPOINT_DESCRIPTION) == 0) {
 
-                	if (endpointProperties != NULL)
-                		properties_destroy(endpointProperties);
+                    if (endpointProperties != NULL)
+                        celix_properties_destroy(endpointProperties);
 
-                    endpointProperties = properties_create();
+                    endpointProperties = celix_properties_create();
                 } else if (xmlStrcmp(localname, PROPERTY) == 0) {
                     inProperty = true;
 
@@ -169,7 +169,7 @@ celix_status_t endpointDescriptorReader_parseDocument(endpoint_descriptor_reader
                         inProperty = false;
 
                         if (propertyValue != NULL) {
-                        	endpointDescriptorReader_addSingleValuedProperty(endpointProperties, propertyName, propertyValue);
+                            endpointDescriptorReader_addSingleValuedProperty(endpointProperties, propertyName, propertyValue);
                         }
 
                         xmlFree((void *) propertyName);
@@ -183,15 +183,15 @@ celix_status_t endpointDescriptorReader_parseDocument(endpoint_descriptor_reader
                     inSet |= inProperty && xmlStrcmp(localname, SET) == 0;
                     inXml |= inProperty && xmlStrcmp(localname, XML) == 0;
                     inValue |= inProperty && xmlStrcmp(localname, VALUE) == 0;
-				}
-			} else if (type == XML_READER_TYPE_END_ELEMENT) {
-				const xmlChar *localname = xmlTextReaderConstLocalName(reader->reader);
+                }
+            } else if (type == XML_READER_TYPE_END_ELEMENT) {
+                const xmlChar *localname = xmlTextReaderConstLocalName(reader->reader);
 
                 if (inXml) {
                     if (xmlStrcmp(localname, XML) != 0)  {
-                    	valueBuffer = xmlStrcat(valueBuffer, BAD_CAST "</");
-                    	valueBuffer = xmlStrcat(valueBuffer, localname);
-                    	valueBuffer = xmlStrcat(valueBuffer, BAD_CAST ">");
+                        valueBuffer = xmlStrcat(valueBuffer, BAD_CAST "</");
+                        valueBuffer = xmlStrcat(valueBuffer, localname);
+                        valueBuffer = xmlStrcat(valueBuffer, BAD_CAST ">");
                     }
                     else {
                         inXml = false;
@@ -200,33 +200,33 @@ celix_status_t endpointDescriptorReader_parseDocument(endpoint_descriptor_reader
                     endpoint_description_pt endpointDescription = NULL;
                     // Completely parsed endpoint description, add it to our list of results...
                     if(endpointDescription_create(endpointProperties, &endpointDescription) == CELIX_SUCCESS){
-			arrayList_add(endpointDescriptions, endpointDescription);
+                        arrayList_add(endpointDescriptions, endpointDescription);
                     }
 
-                    endpointProperties = properties_create();
+                    endpointProperties = celix_properties_create();
                 } else if (xmlStrcmp(localname, PROPERTY) == 0) {
                     inProperty = false;
 
                     if (inArray || inList || inSet) {
-						endpointDescriptorReader_addMultiValuedProperty(endpointProperties, propertyName, propertyValues);
+                        endpointDescriptorReader_addMultiValuedProperty(endpointProperties, propertyName, propertyValues);
                     }
                     else if (propertyValue != NULL) {
-                    	if (propertyType != VALUE_TYPE_STRING) {
-                    		logHelper_log(*reader->loghelper, OSGI_LOGSERVICE_WARNING, "ENDPOINT_DESCRIPTOR_READER: Only string support for %s\n", propertyName);
-                    	}
-                    	endpointDescriptorReader_addSingleValuedProperty(endpointProperties, propertyName, propertyValue);
+                        if (propertyType != VALUE_TYPE_STRING) {
+                            logHelper_log(*reader->loghelper, OSGI_LOGSERVICE_WARNING, "ENDPOINT_DESCRIPTOR_READER: Only string support for %s\n", propertyName);
+                        }
+                        endpointDescriptorReader_addSingleValuedProperty(endpointProperties, propertyName, propertyValue);
 
                         xmlFree((void *) propertyValue);
                     }
                     else {
-                    	endpointDescriptorReader_addSingleValuedProperty(endpointProperties, propertyName, valueBuffer);
+                        endpointDescriptorReader_addSingleValuedProperty(endpointProperties, propertyName, valueBuffer);
                     }
 
                     xmlFree((void *) propertyName);
-					unsigned int k=0;
-					for(;k<arrayList_size(propertyValues);k++){
-						free(arrayList_get(propertyValues,k));
-					}
+                    unsigned int k=0;
+                    for(;k<arrayList_size(propertyValues);k++){
+                        free(arrayList_get(propertyValues,k));
+                    }
                     arrayList_clear(propertyValues);
 
                     propertyType = VALUE_TYPE_STRING;
@@ -250,14 +250,14 @@ celix_status_t endpointDescriptorReader_parseDocument(endpoint_descriptor_reader
             read = xmlTextReaderRead(reader->reader);
         }
 
-		if(endpointProperties!=NULL){
-			properties_destroy(endpointProperties);
-		}
+        if(endpointProperties!=NULL){
+            celix_properties_destroy(endpointProperties);
+        }
 
-		unsigned int k=0;
-		for(;k<arrayList_size(propertyValues);k++){
-			free(arrayList_get(propertyValues,k));
-		}
+        unsigned int k=0;
+        for(;k<arrayList_size(propertyValues);k++){
+            free(arrayList_get(propertyValues,k));
+        }
         arrayList_destroy(propertyValues);
         xmlFree(valueBuffer);
 
diff --git a/bundles/remote_services/examples/calculator_api/include/calculator_service.h b/bundles/remote_services/examples/calculator_api/include/calculator_service.h
index a194131..aebbd2a 100644
--- a/bundles/remote_services/examples/calculator_api/include/calculator_service.h
+++ b/bundles/remote_services/examples/calculator_api/include/calculator_service.h
@@ -20,15 +20,15 @@
  * calculator_service.h
  *
  *  \date       Oct 5, 2011
- *  \author    	<a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
- *  \copyright	Apache License, Version 2.0
+ *  \author     <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
+ *  \copyright  Apache License, Version 2.0
  */
 
 #ifndef CALCULATOR_SERVICE_H_
 #define CALCULATOR_SERVICE_H_
 
-#define CALCULATOR_SERVICE "org.apache.celix.calc.api.Calculator"
-
+#define CALCULATOR_SERVICE              "org.apache.celix.calc.api.Calculator"
+#define CALCULATOR_CONFIGURATION_TYPE	"org.amdatu.remote.admin.http"
 
 typedef struct calculator *calculator_pt;
 
@@ -38,16 +38,16 @@ typedef struct calculator_service *calculator_service_pt;
  * The calculator service definition corresponds to the following Java interface:
  *
  * interface Calculator {
- * 	 double add(double a, double b);
- * 	 double sub(double a, double b);
- * 	 double sqrt(double a);
+ *      double add(double a, double b);
+ *      double sub(double a, double b);
+ *      double sqrt(double a);
  * }
  */
 struct calculator_service {
-	calculator_pt calculator;
-	int (*add)(calculator_pt calculator, double a, double b, double *result);
-	int (*sub)(calculator_pt calculator, double a, double b, double *result);
-  int (*sqrt)(calculator_pt calculator, double a, double *result);
+    calculator_pt calculator;
+    int (*add)(calculator_pt calculator, double a, double b, double *result);
+    int (*sub)(calculator_pt calculator, double a, double b, double *result);
+	int (*sqrt)(calculator_pt calculator, double a, double *result);
 };
 
 
diff --git a/bundles/remote_services/examples/calculator_shell/src/calculator_shell_activator.c b/bundles/remote_services/examples/calculator_shell/src/calculator_shell_activator.c
index d6b561b..3a33580 100644
--- a/bundles/remote_services/examples/calculator_shell/src/calculator_shell_activator.c
+++ b/bundles/remote_services/examples/calculator_shell/src/calculator_shell_activator.c
@@ -81,23 +81,23 @@ celix_status_t bundleActivator_start(void * userData, bundle_context_pt context)
 	activator->addCmdSrv = calloc(1, sizeof(*activator->addCmdSrv));
 	activator->addCmdSrv->handle = context;
 	activator->addCmdSrv->executeCommand = (void *)addCommand_execute;
-	properties_pt props = properties_create();
-	properties_set(props, OSGI_SHELL_COMMAND_NAME, "add");
+	celix_properties_t *props = celix_properties_create();
+	celix_properties_set(props, OSGI_SHELL_COMMAND_NAME, "add");
 	bundleContext_registerService(context, (char *)OSGI_SHELL_COMMAND_SERVICE_NAME, activator->addCmdSrv, props, &activator->addCommand);
 
 
 	activator->sqrtCmdSrv = calloc(1, sizeof(*activator->sqrtCmdSrv));
 	activator->sqrtCmdSrv->handle = context;
 	activator->sqrtCmdSrv->executeCommand = (void *)sqrtCommand_execute;
-	props = properties_create();
-	properties_set(props, OSGI_SHELL_COMMAND_NAME, "sqrt");
+	props = celix_properties_create();
+	celix_properties_set(props, OSGI_SHELL_COMMAND_NAME, "sqrt");
 	bundleContext_registerService(context, (char *)OSGI_SHELL_COMMAND_SERVICE_NAME, activator->sqrtCmdSrv, props, &activator->sqrtCommand);
 
 	activator->subCmdSrv = calloc(1, sizeof(*activator->subCmdSrv));
 	activator->subCmdSrv->handle = context;
 	activator->subCmdSrv->executeCommand = (void *)subCommand_execute;
-	props = properties_create();
-	properties_set(props, OSGI_SHELL_COMMAND_NAME, "sub");
+	props = celix_properties_create();
+	celix_properties_set(props, OSGI_SHELL_COMMAND_NAME, "sub");
 	bundleContext_registerService(context, (char *)OSGI_SHELL_COMMAND_SERVICE_NAME, activator->subCmdSrv, props, &activator->subCommand);
 
 	return status;
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 bd027c9..59d6276 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
@@ -105,18 +105,18 @@ celix_status_t exportRegistration_create(log_helper_pt helper, service_reference
             status = CELIX_BUNDLE_EXCEPTION;
             logHelper_log(helper, OSGI_LOGSERVICE_WARNING, "RSA: Error parsing service descriptor.");
         }
-        else{
+        else {
             /* Add the interface version as a property in the properties_map */
             char* intfVersion = NULL;
             dynInterface_getVersionString(reg->intf, &intfVersion);
-            const char *serviceVersion = properties_get(endpoint->properties,(char*) CELIX_FRAMEWORK_SERVICE_VERSION);
-            if(serviceVersion!=NULL){
-            	if(strcmp(serviceVersion,intfVersion)!=0){
-            		logHelper_log(helper, OSGI_LOGSERVICE_WARNING, "Service version (%s) and interface version from the descriptor (%s) are not the same!",serviceVersion,intfVersion);
-            	}
+            const char *serviceVersion = celix_properties_get(endpoint->properties,(char*) CELIX_FRAMEWORK_SERVICE_VERSION, NULL);
+            if (serviceVersion != NULL) {
+                if(strcmp(serviceVersion,intfVersion)!=0){
+                    logHelper_log(helper, OSGI_LOGSERVICE_WARNING, "Service version (%s) and interface version from the descriptor (%s) are not the same!",serviceVersion,intfVersion);
+                }
             }
             else{
-            	properties_set(endpoint->properties, (char*) CELIX_FRAMEWORK_SERVICE_VERSION, intfVersion);
+                celix_properties_set(endpoint->properties, (char*) CELIX_FRAMEWORK_SERVICE_VERSION, intfVersion);
             }
         }
     } 
diff --git a/bundles/remote_services/remote_service_admin_dfi/src/import_registration_dfi.c b/bundles/remote_services/remote_service_admin_dfi/src/import_registration_dfi.c
index af3339f..a40a560 100644
--- a/bundles/remote_services/remote_service_admin_dfi/src/import_registration_dfi.c
+++ b/bundles/remote_services/remote_service_admin_dfi/src/import_registration_dfi.c
@@ -151,8 +151,7 @@ void importRegistration_destroy(import_registration_pt import) {
 celix_status_t importRegistration_start(import_registration_pt import) {
     celix_status_t  status = CELIX_SUCCESS;
     if (import->factoryReg == NULL && import->factory != NULL) {
-        properties_pt props = NULL;
-        properties_copy(import->endpoint->properties, &props);
+        celix_properties_t *props =  celix_properties_copy(import->endpoint->properties);
         status = bundleContext_registerServiceFactory(import->context, (char *)import->classObject, import->factory, props, &import->factoryReg);
     } else {
         status = CELIX_ILLEGAL_STATE;
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 f40a8e2..68096fc 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
@@ -43,7 +43,7 @@
 #include "celix_bundle_context.h"
 
 // defines how often the webserver is restarted (with an increased port number)
-#define MAX_NUMBER_OF_RESTARTS 	5
+#define MAX_NUMBER_OF_RESTARTS 5
 
 
 #define RSA_LOG_ERROR(admin, msg, ...) \
@@ -83,7 +83,7 @@ struct get {
     int size;
 };
 
-#define OSGI_RSA_REMOTE_PROXY_FACTORY 	"remote_proxy_factory"
+#define OSGI_RSA_REMOTE_PROXY_FACTORY   "remote_proxy_factory"
 #define OSGI_RSA_REMOTE_PROXY_TIMEOUT   "remote_proxy_timeout"
 
 static const char *data_response_headers =
@@ -98,7 +98,7 @@ static const char *no_content_response_headers =
 static const unsigned int DEFAULT_TIMEOUT = 0;
 
 static int remoteServiceAdmin_callback(struct mg_connection *conn);
-static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, service_reference_pt reference, properties_pt props, char *interface, endpoint_description_pt *description);
+static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, service_reference_pt reference, celix_properties_t *props, char *interface, endpoint_description_pt *description);
 static celix_status_t remoteServiceAdmin_send(void *handle, endpoint_description_pt endpointDescription, char *request, char **reply, int* replyStatus);
 static celix_status_t remoteServiceAdmin_getIpAddress(char* interface, char** ip);
 static size_t remoteServiceAdmin_readCallback(void *ptr, size_t size, size_t nmemb, void *userp);
@@ -352,7 +352,7 @@ static int remoteServiceAdmin_callback(struct mg_connection *conn) {
     return result;
 }
 
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId, properties_pt properties, array_list_pt *registrations) {
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId, celix_properties_t *properties, array_list_pt *registrations) {
     celix_status_t status;
 
     arrayList_create(registrations);
@@ -419,8 +419,8 @@ celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, c
         celixThreadMutex_unlock(&admin->exportedServicesLock);
     }
     else{
-    	arrayList_destroy(*registrations);
-    	*registrations = NULL;
+        arrayList_destroy(*registrations);
+        *registrations = NULL;
     }
 
     return status;
@@ -435,14 +435,14 @@ celix_status_t remoteServiceAdmin_removeExportedService(remote_service_admin_pt
     status = exportRegistration_getExportReference(registration, &ref);
 
     if (status == CELIX_SUCCESS && ref != NULL) {
-    	service_reference_pt servRef;
+        service_reference_pt servRef;
         celixThreadMutex_lock(&admin->exportedServicesLock);
-    	exportReference_getExportedService(ref, &servRef);
+        exportReference_getExportedService(ref, &servRef);
 
-    	array_list_pt exports = (array_list_pt)hashMap_remove(admin->exportedServices, servRef);
-    	if(exports!=NULL){
-    		arrayList_destroy(exports);
-    	}
+        array_list_pt exports = (array_list_pt)hashMap_remove(admin->exportedServices, servRef);
+        if(exports!=NULL){
+            arrayList_destroy(exports);
+        }
 
         exportRegistration_close(registration);
         exportRegistration_destroy(registration);
@@ -452,17 +452,16 @@ celix_status_t remoteServiceAdmin_removeExportedService(remote_service_admin_pt
         free(ref);
 
     } else {
-    	logHelper_log(admin->loghelper, OSGI_LOGSERVICE_ERROR, "Cannot find reference for registration");
+        logHelper_log(admin->loghelper, OSGI_LOGSERVICE_ERROR, "Cannot find reference for registration");
     }
 
     return status;
 }
 
-static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, service_reference_pt reference, properties_pt props, char *interface, endpoint_description_pt *endpoint) {
+static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, service_reference_pt reference, celix_properties_t *props, char *interface, endpoint_description_pt *endpoint) {
 
     celix_status_t status = CELIX_SUCCESS;
-    properties_pt endpointProperties = properties_create();
-
+    celix_properties_t *endpointProperties = celix_properties_create();
 
     unsigned int size = 0;
     char **keys;
@@ -475,7 +474,7 @@ static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_servic
         if (serviceReference_getProperty(reference, key, &value) == CELIX_SUCCESS
             && strcmp(key, (char*) OSGI_RSA_SERVICE_EXPORTED_INTERFACES) != 0
             && strcmp(key, (char*) OSGI_FRAMEWORK_OBJECTCLASS) != 0) {
-            properties_set(endpointProperties, key, value);
+            celix_properties_set(endpointProperties, key, value);
         }
     }
 
@@ -497,19 +496,19 @@ static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_servic
     uuid_unparse_lower(endpoint_uid, endpoint_uuid);
 
     bundleContext_getProperty(admin->context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
-    properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid);
-    properties_set(endpointProperties, (char*) OSGI_FRAMEWORK_OBJECTCLASS, interface);
-    properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_SERVICE_ID, serviceId);
-    properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_ID, endpoint_uuid);
-    properties_set(endpointProperties, (char*) OSGI_RSA_SERVICE_IMPORTED, "true");
-    properties_set(endpointProperties, (char*) OSGI_RSA_SERVICE_IMPORTED_CONFIGS, (char*) RSA_DFI_CONFIGURATION_TYPE);
-    properties_set(endpointProperties, (char*) RSA_DFI_ENDPOINT_URL, url);
+    celix_properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid);
+    celix_properties_set(endpointProperties, (char*) OSGI_FRAMEWORK_OBJECTCLASS, interface);
+    celix_properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_SERVICE_ID, serviceId);
+    celix_properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_ID, endpoint_uuid);
+    celix_properties_set(endpointProperties, (char*) OSGI_RSA_SERVICE_IMPORTED, "true");
+    celix_properties_set(endpointProperties, (char*) OSGI_RSA_SERVICE_IMPORTED_CONFIGS, (char*) RSA_DFI_CONFIGURATION_TYPE);
+    celix_properties_set(endpointProperties, (char*) RSA_DFI_ENDPOINT_URL, url);
 
     if (props != NULL) {
         hash_map_iterator_pt propIter = hashMapIterator_create(props);
         while (hashMapIterator_hasNext(propIter)) {
-    	    hash_map_entry_pt entry = hashMapIterator_nextEntry(propIter);
-    	    properties_set(endpointProperties, (char*)hashMapEntry_getKey(entry), (char*)hashMapEntry_getValue(entry));
+            hash_map_entry_pt entry = hashMapIterator_nextEntry(propIter);
+            celix_properties_set(endpointProperties, (char*)hashMapEntry_getKey(entry), (char*)hashMapEntry_getValue(entry));
         }
         hashMapIterator_destroy(propIter);
     }
@@ -518,11 +517,11 @@ static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_servic
     if (!*endpoint) {
         status = CELIX_ENOMEM;
     } else {
-        (*endpoint)->id = (char*)properties_get(endpointProperties, (char*) OSGI_RSA_ENDPOINT_ID);
+        (*endpoint)->id = (char*) celix_properties_get(endpointProperties, (char*) OSGI_RSA_ENDPOINT_ID, NULL);
         const char *serviceId = NULL;
         serviceReference_getProperty(reference, (char*) OSGI_FRAMEWORK_SERVICE_ID, &serviceId);
         (*endpoint)->serviceId = strtoull(serviceId, NULL, 0);
-        (*endpoint)->frameworkUUID = (char*) properties_get(endpointProperties, (char*) OSGI_RSA_ENDPOINT_FRAMEWORK_UUID);
+        (*endpoint)->frameworkUUID = (char*) celix_properties_get(endpointProperties, (char*) OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, NULL);
         (*endpoint)->service = strndup(interface, 1024*10);
         (*endpoint)->properties = endpointProperties;
     }
@@ -570,7 +569,7 @@ celix_status_t remoteServiceAdmin_destroyEndpointDescription(endpoint_descriptio
 {
     celix_status_t status = CELIX_SUCCESS;
 
-    properties_destroy((*description)->properties);
+    celix_properties_destroy((*description)->properties);
     free((*description)->service);
     free(*description);
 
@@ -663,7 +662,7 @@ static celix_status_t remoteServiceAdmin_send(void *handle, endpoint_description
 
     const char *timeoutStr = NULL;
     // Check if the endpoint has a timeout, if so, use it.
-    timeoutStr = (char*) properties_get(endpointDescription->properties, (char*) OSGI_RSA_REMOTE_PROXY_TIMEOUT);
+    timeoutStr = (char*) celix_properties_get(endpointDescription->properties, (char*) OSGI_RSA_REMOTE_PROXY_TIMEOUT, NULL);
     if (timeoutStr == NULL) {
         // If not, get the global variable and use that one.
         bundleContext_getProperty(rsa->context, (char*) OSGI_RSA_REMOTE_PROXY_TIMEOUT, &timeoutStr);
diff --git a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.h b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.h
index 86ed5dd..c6ae173 100644
--- a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.h
+++ b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.h
@@ -35,7 +35,7 @@ celix_status_t remoteServiceAdmin_destroy(remote_service_admin_pt *admin);
 
 celix_status_t remoteServiceAdmin_stop(remote_service_admin_pt admin);
 
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId, properties_pt properties, array_list_pt *registrations);
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId, celix_properties_t *properties, array_list_pt *registrations);
 celix_status_t remoteServiceAdmin_removeExportedService(remote_service_admin_pt admin, export_registration_pt registration);
 celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_pt admin, array_list_pt *services);
 celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_pt admin, array_list_pt *services);
diff --git a/bundles/remote_services/remote_service_admin_dfi/test/src/rsa_tests.cpp b/bundles/remote_services/remote_service_admin_dfi/test/src/rsa_tests.cpp
index 1b1c0d5..6ae0b41 100644
--- a/bundles/remote_services/remote_service_admin_dfi/test/src/rsa_tests.cpp
+++ b/bundles/remote_services/remote_service_admin_dfi/test/src/rsa_tests.cpp
@@ -147,12 +147,12 @@ extern "C" {
         import_registration_pt reg = NULL;
         endpoint_description_pt endpoint = NULL;
 
-        properties_pt props = properties_create();
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
-        properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.Example");
-        properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
+        celix_properties_t *props = celix_properties_create();
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
+        celix_properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.Example");
+        celix_properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
 
         rc = endpointDescription_create(props, &endpoint);
         CHECK_EQUAL(CELIX_SUCCESS, rc);
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 018d337..8b60955 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
@@ -53,7 +53,7 @@ static celix_status_t remoteServiceAdmin_unlock(int semId, int semNr);
 static int remoteServiceAdmin_getCount(int semId, int semNr);
 
 celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_pt admin, export_registration_pt registration, service_reference_pt reference, char *interface);
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, service_reference_pt reference, properties_pt endpointProperties, char *interface, endpoint_description_pt *description);
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, service_reference_pt reference, celix_properties_t *endpointProperties, char *interface, endpoint_description_pt *description);
 
 celix_status_t remoteServiceAdmin_createOrAttachShm(hash_map_pt ipcSegment, remote_service_admin_pt admin, endpoint_description_pt endpointDescription, bool createIfNotFound);
 celix_status_t remoteServiceAdmin_getIpcSegment(remote_service_admin_pt admin, endpoint_description_pt endpointDescription, ipc_segment_pt* ipc);
@@ -456,7 +456,7 @@ celix_status_t remoteServiceAdmin_removeSharedIdentityFiles(remote_service_admin
 	return retVal;
 }
 
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId, properties_pt properties, array_list_pt *registrations) {
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId, celix_properties_t *properties, array_list_pt *registrations) {
 	celix_status_t status = CELIX_SUCCESS;
 	arrayList_create(registrations);
 
@@ -646,7 +646,7 @@ celix_status_t remoteServiceAdmin_createOrAttachShm(hash_map_pt ipcSegment, remo
 	/* setup ipc sehment */
 	ipc_segment_pt ipc = NULL;
 
-	properties_pt endpointProperties = endpointDescription->properties;
+	celix_properties_t *endpointProperties = endpointDescription->properties;
 
 	char *shmPath = NULL;
 	char *shmFtokId = NULL;
@@ -726,7 +726,7 @@ celix_status_t remoteServiceAdmin_createOrAttachShm(hash_map_pt ipcSegment, remo
 
 celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_pt admin, export_registration_pt registration, service_reference_pt reference, char *interface) {
 	celix_status_t status = CELIX_SUCCESS;
-	properties_pt endpointProperties = properties_create();
+	celix_properties_t *endpointProperties = celix_properties_create();
 
 	unsigned int size = 0;
 	char **keys;
@@ -737,7 +737,7 @@ celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_pt admin,
 		const char *value = NULL;
 
 		if (serviceReference_getProperty(reference, key, &value) == CELIX_SUCCESS && strcmp(key, (char*) OSGI_RSA_SERVICE_EXPORTED_INTERFACES) != 0 && strcmp(key, (char*) OSGI_FRAMEWORK_OBJECTCLASS) != 0) {
-			properties_set(endpointProperties, key, value);
+			celix_properties_set(endpointProperties, key, value);
 		}
 	}
 
@@ -753,36 +753,36 @@ celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_pt admin,
 	uuid_unparse_lower(endpoint_uid, endpoint_uuid);
 
 	bundleContext_getProperty(admin->context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
-	properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid);
-	properties_set(endpointProperties, (char*) OSGI_FRAMEWORK_OBJECTCLASS, interface);
-	properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_SERVICE_ID, serviceId);
-	properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_ID, endpoint_uuid);
-	properties_set(endpointProperties, (char*) OSGI_RSA_SERVICE_IMPORTED, "true");
-	//    properties_set(endpointProperties, (char*) OSGI_RSA_SERVICE_IMPORTED_CONFIGS, (char*) CONFIGURATION_TYPE);
-
-	if (properties_get(endpointProperties, (char *) RSA_SHM_PATH_PROPERTYNAME) == NULL) {
+	celix_properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid);
+	celix_properties_set(endpointProperties, (char*) OSGI_FRAMEWORK_OBJECTCLASS, interface);
+	celix_properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_SERVICE_ID, serviceId);
+	celix_properties_set(endpointProperties, (char*) OSGI_RSA_ENDPOINT_ID, endpoint_uuid);
+	celix_properties_set(endpointProperties, (char*) OSGI_RSA_SERVICE_IMPORTED, "true");
+//    celix_properties_set(endpointProperties, (char*) OSGI_RSA_SERVICE_IMPORTED_CONFIGS, (char*) CONFIGURATION_TYPE);
+
+	if (celix_properties_get(endpointProperties, (char *) RSA_SHM_PATH_PROPERTYNAME, NULL) == NULL) {
 		char sharedIdentifierFile[RSA_FILEPATH_LENGTH];
 
 		if (remoteServiceAdmin_getSharedIdentifierFile(admin, (char*)uuid, interface, sharedIdentifierFile) == CELIX_SUCCESS) {
-			properties_set(endpointProperties, RSA_SHM_PATH_PROPERTYNAME, sharedIdentifierFile);
+			celix_properties_set(endpointProperties, RSA_SHM_PATH_PROPERTYNAME, sharedIdentifierFile);
 		} else {
-			properties_set(endpointProperties, (char *) RSA_SHM_PATH_PROPERTYNAME, (char *) RSA_SHM_DEFAULTPATH);
+			celix_properties_set(endpointProperties, (char *) RSA_SHM_PATH_PROPERTYNAME, (char *) RSA_SHM_DEFAULTPATH);
 		}
 	}
-	if (properties_get(endpointProperties, (char *) RSA_SHM_FTOK_ID_PROPERTYNAME) == NULL) {
-		properties_set(endpointProperties, (char *) RSA_SHM_FTOK_ID_PROPERTYNAME, (char *) RSA_SHM_DEFAULT_FTOK_ID);
+	if (celix_properties_get(endpointProperties, (char *) RSA_SHM_FTOK_ID_PROPERTYNAME, NULL) == NULL) {
+		celix_properties_set(endpointProperties, (char *) RSA_SHM_FTOK_ID_PROPERTYNAME, (char *) RSA_SHM_DEFAULT_FTOK_ID);
 	}
-	if (properties_get(endpointProperties, (char *) RSA_SEM_PATH_PROPERTYNAME) == NULL) {
+	if (celix_properties_get(endpointProperties, (char *) RSA_SEM_PATH_PROPERTYNAME, NULL) == NULL) {
 		char sharedIdentifierFile[RSA_FILEPATH_LENGTH];
 
 		if (remoteServiceAdmin_getSharedIdentifierFile(admin, (char*)uuid, interface, sharedIdentifierFile) == CELIX_SUCCESS) {
-			properties_set(endpointProperties, (char *) RSA_SEM_PATH_PROPERTYNAME, sharedIdentifierFile);
+			celix_properties_set(endpointProperties, (char *) RSA_SEM_PATH_PROPERTYNAME, sharedIdentifierFile);
 		} else {
-			properties_set(endpointProperties, (char *) RSA_SEM_PATH_PROPERTYNAME, (char *) RSA_SEM_DEFAULTPATH);
+			celix_properties_set(endpointProperties, (char *) RSA_SEM_PATH_PROPERTYNAME, (char *) RSA_SEM_DEFAULTPATH);
 		}
 	}
-	if (properties_get(endpointProperties, (char *) RSA_SEM_FTOK_ID_PROPERTYNAME) == NULL) {
-		properties_set(endpointProperties, (char *) RSA_SEM_FTOK_ID_PROPERTYNAME, (char *) RSA_SEM_DEFAULT_FTOK_ID);
+	if (celix_properties_get(endpointProperties, (char *) RSA_SEM_FTOK_ID_PROPERTYNAME, NULL) == NULL) {
+		celix_properties_set(endpointProperties, (char *) RSA_SEM_FTOK_ID_PROPERTYNAME, (char *) RSA_SEM_DEFAULT_FTOK_ID);
 	}
 
 	endpoint_description_pt endpointDescription = NULL;
@@ -796,7 +796,7 @@ celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_pt admin,
 	return status;
 }
 
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, service_reference_pt reference, properties_pt endpointProperties, char *interface, endpoint_description_pt *description) {
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, service_reference_pt reference, celix_properties_t *endpointProperties, char *interface, endpoint_description_pt *description) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*description = calloc(1, sizeof(**description));
@@ -805,11 +805,11 @@ celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin
 	} else {
 		if (status == CELIX_SUCCESS) {
 			(*description)->properties = endpointProperties;
-			(*description)->frameworkUUID = (char*)properties_get(endpointProperties, (char*) OSGI_RSA_ENDPOINT_FRAMEWORK_UUID);
+			(*description)->frameworkUUID = (char*)celix_properties_get(endpointProperties, (char*) OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, NULL);
 			const char *serviceId = NULL;
 			serviceReference_getProperty(reference, (char*)OSGI_FRAMEWORK_SERVICE_ID, &serviceId);
 			(*description)->serviceId = strtoull(serviceId, NULL, 0);
-			(*description)->id = (char*)properties_get(endpointProperties, (char*) OSGI_RSA_ENDPOINT_ID);
+			(*description)->id = (char*)celix_properties_get(endpointProperties, (char*) OSGI_RSA_ENDPOINT_ID, NULL);
 			(*description)->service = strndup(interface, 1024*10);
 		}
 	}
@@ -820,7 +820,7 @@ celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin
 celix_status_t remoteServiceAdmin_destroyEndpointDescription(endpoint_description_pt *description) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	properties_destroy((*description)->properties);
+	celix_properties_destroy((*description)->properties);
 	free((*description)->service);
 	free(*description);
 
diff --git a/bundles/remote_services/rsa_common/src/endpoint_description.c b/bundles/remote_services/rsa_common/src/endpoint_description.c
index 0d8b684..616e5f9 100644
--- a/bundles/remote_services/rsa_common/src/endpoint_description.c
+++ b/bundles/remote_services/rsa_common/src/endpoint_description.c
@@ -33,9 +33,9 @@
 #include "remote_constants.h"
 #include "constants.h"
 
-static celix_status_t endpointDescription_verifyLongProperty(properties_pt properties, char *propertyName, unsigned long *longProperty);
+static celix_status_t endpointDescription_verifyLongProperty(celix_properties_t *properties, char *propertyName, unsigned long *longProperty);
 
-celix_status_t endpointDescription_create(properties_pt properties, endpoint_description_pt *endpointDescription) {
+celix_status_t endpointDescription_create(celix_properties_t *properties, endpoint_description_pt *endpointDescription) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	unsigned long serviceId = 0UL;
@@ -47,9 +47,9 @@ celix_status_t endpointDescription_create(properties_pt properties, endpoint_des
 	endpoint_description_pt ep = calloc(1,sizeof(*ep));
 
     ep->properties = properties;
-    ep->frameworkUUID = (char*)properties_get(properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID);
-    ep->id = (char*)properties_get(properties, OSGI_RSA_ENDPOINT_ID);
-    ep->service = strndup(properties_get(properties, OSGI_FRAMEWORK_OBJECTCLASS), 1024*10);
+    ep->frameworkUUID = (char*)celix_properties_get(properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, NULL);
+    ep->id = (char*)celix_properties_get(properties, OSGI_RSA_ENDPOINT_ID, NULL);
+    ep->service = strndup(celix_properties_get(properties, OSGI_FRAMEWORK_OBJECTCLASS, NULL), 1024*10);
     ep->serviceId = serviceId;
 
     if (!(ep->frameworkUUID) || !(ep->id) || !(ep->service) ) {
@@ -58,31 +58,31 @@ celix_status_t endpointDescription_create(properties_pt properties, endpoint_des
     }
 
     if(status == CELIX_SUCCESS){
-	*endpointDescription = ep;
+        *endpointDescription = ep;
     }
     else{
-	*endpointDescription = NULL;
-	free(ep);
+        *endpointDescription = NULL;
+        free(ep);
     }
 
     return status;
 }
 
 celix_status_t endpointDescription_destroy(endpoint_description_pt description) {
-    properties_destroy(description->properties);
+    celix_properties_destroy(description->properties);
     free(description->service);
     free(description);
     return CELIX_SUCCESS;
 }
 
-static celix_status_t endpointDescription_verifyLongProperty(properties_pt properties, char *propertyName, unsigned long *longProperty) {
+static celix_status_t endpointDescription_verifyLongProperty(celix_properties_t *properties, char *propertyName, unsigned long *longProperty) {
     celix_status_t status = CELIX_SUCCESS;
 
-    const char *value = properties_get(properties, propertyName);
+    const char *value = celix_properties_get(properties, propertyName, NULL);
     if (value == NULL) {
         *longProperty = 0UL;
     } else {
-        *longProperty = strtoul(value,NULL,10);
+        *longProperty = strtoul(value, NULL, 10);
     }
 
     return status;
diff --git a/bundles/remote_services/rsa_common/src/remote_proxy_factory_impl.c b/bundles/remote_services/rsa_common/src/remote_proxy_factory_impl.c
index 9f996d6..64e5116 100644
--- a/bundles/remote_services/rsa_common/src/remote_proxy_factory_impl.c
+++ b/bundles/remote_services/rsa_common/src/remote_proxy_factory_impl.c
@@ -33,7 +33,7 @@
 typedef struct proxy_instance {
 	service_registration_pt registration_ptr;
 	void *service;
-	properties_pt properties;
+	celix_properties_t *properties;
 } *proxy_instance_pt;
 
 static celix_status_t remoteProxyFactory_registerProxyService(remote_proxy_factory_pt remote_proxy_factory_ptr, endpoint_description_pt endpointDescription, remote_service_admin_pt rsa, sendToHandle sendToCallback);
@@ -104,11 +104,11 @@ celix_status_t remoteProxyFactory_register(remote_proxy_factory_pt remote_proxy_
 		remote_proxy_factory_ptr->remote_proxy_factory_service_ptr->registerProxyService = remoteProxyFactory_registerProxyService;
 		remote_proxy_factory_ptr->remote_proxy_factory_service_ptr->unregisterProxyService = remoteProxyFactory_unregisterProxyService;
 
-		remote_proxy_factory_ptr->properties = properties_create();
+		remote_proxy_factory_ptr->properties = celix_properties_create();
 		if (!remote_proxy_factory_ptr->properties) {
 			status = CELIX_BUNDLE_EXCEPTION;
 		} else {
-			properties_set(remote_proxy_factory_ptr->properties, "proxy.interface", remote_proxy_factory_ptr->service);
+			celix_properties_set(remote_proxy_factory_ptr->properties, "proxy.interface", remote_proxy_factory_ptr->service);
 		}
 	}
 
@@ -146,7 +146,7 @@ celix_status_t remoteProxyFactory_unregister(remote_proxy_factory_pt remote_prox
 			remote_proxy_factory_ptr->properties = NULL;
 		}
 		if (remote_proxy_factory_ptr->properties) {
-			properties_destroy(remote_proxy_factory_ptr->properties);
+			celix_properties_destroy(remote_proxy_factory_ptr->properties);
 		}
 		if (remote_proxy_factory_ptr->remote_proxy_factory_service_ptr) {
 			free(remote_proxy_factory_ptr->remote_proxy_factory_service_ptr);
@@ -173,7 +173,7 @@ static celix_status_t remoteProxyFactory_registerProxyService(remote_proxy_facto
 	}
 
 	if (status == CELIX_SUCCESS) {
-		proxy_instance_ptr->properties = properties_create();
+		proxy_instance_ptr->properties = celix_properties_create();
 		if (!proxy_instance_ptr->properties) {
 			status = CELIX_ENOMEM;
 		}
@@ -184,7 +184,7 @@ static celix_status_t remoteProxyFactory_registerProxyService(remote_proxy_facto
 	}
 
 	if (status == CELIX_SUCCESS) {
-		properties_set(proxy_instance_ptr->properties, "proxy.interface", remote_proxy_factory_ptr->service);
+		celix_properties_set(proxy_instance_ptr->properties, "proxy.interface", remote_proxy_factory_ptr->service);
 
 		hash_map_iterator_pt iter = hashMapIterator_create(endpointDescription->properties);
 		while (hashMapIterator_hasNext(iter)) {
@@ -192,7 +192,7 @@ static celix_status_t remoteProxyFactory_registerProxyService(remote_proxy_facto
 			char *key = hashMapEntry_getKey(entry);
 			char *value = hashMapEntry_getValue(entry);
 
-			properties_set(proxy_instance_ptr->properties, key, value);
+			celix_properties_set(proxy_instance_ptr->properties, key, value);
 		}
 		hashMapIterator_destroy(iter);
 	}
@@ -208,7 +208,7 @@ static celix_status_t remoteProxyFactory_registerProxyService(remote_proxy_facto
 	if(status!=CELIX_SUCCESS){
 		if(proxy_instance_ptr != NULL){
 			if(proxy_instance_ptr->properties != NULL){
-				properties_destroy(proxy_instance_ptr->properties);
+				celix_properties_destroy(proxy_instance_ptr->properties);
 			}
 			free(proxy_instance_ptr);
 		}
@@ -241,7 +241,7 @@ static celix_status_t remoteProxyFactory_unregisterProxyService(remote_proxy_fac
 			status = remote_proxy_factory_ptr->destroy_proxy_service_ptr(remote_proxy_factory_ptr->handle, proxy_instance_ptr->service);
 		}
 		if (proxy_instance_ptr->properties) {
-			properties_destroy(proxy_instance_ptr->properties);
+			celix_properties_destroy(proxy_instance_ptr->properties);
 		}
         free(proxy_instance_ptr);
 	}
diff --git a/bundles/remote_services/rsa_common/src/remote_service_admin_impl.h b/bundles/remote_services/rsa_common/src/remote_service_admin_impl.h
index e8a5e1f..528e813 100644
--- a/bundles/remote_services/rsa_common/src/remote_service_admin_impl.h
+++ b/bundles/remote_services/rsa_common/src/remote_service_admin_impl.h
@@ -37,7 +37,7 @@ celix_status_t remoteServiceAdmin_destroy(remote_service_admin_pt *admin);
 
 celix_status_t remoteServiceAdmin_send(remote_service_admin_pt rsa, endpoint_description_pt endpointDescription, char *methodSignature, char **reply, int* replyStatus);
 
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId, properties_pt properties, array_list_pt *registrations);
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId, celix_properties_t *properties, array_list_pt *registrations);
 celix_status_t remoteServiceAdmin_removeExportedService(remote_service_admin_pt admin, export_registration_pt registration);
 celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_pt admin, array_list_pt *services);
 celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_pt admin, array_list_pt *services);
diff --git a/bundles/remote_services/rsa_spi/include/endpoint_description.h b/bundles/remote_services/rsa_spi/include/endpoint_description.h
index de27d2e..2b12b6d 100644
--- a/bundles/remote_services/rsa_spi/include/endpoint_description.h
+++ b/bundles/remote_services/rsa_spi/include/endpoint_description.h
@@ -36,14 +36,14 @@ struct endpoint_description {
     // array_list_pt intents;
     char *service;
     // HASH_MAP packageVersions;
-    properties_pt properties;
+    celix_properties_t *properties;
     unsigned long serviceId;
 };
 
 typedef struct endpoint_description endpoint_description_t;
 typedef endpoint_description_t* endpoint_description_pt;
 
-celix_status_t endpointDescription_create(properties_pt properties, endpoint_description_pt *endpointDescription);
+celix_status_t endpointDescription_create(celix_properties_t *properties, endpoint_description_pt *endpointDescription);
 celix_status_t endpointDescription_destroy(endpoint_description_pt description);
 
 
diff --git a/bundles/remote_services/rsa_spi/include/remote_proxy.h b/bundles/remote_services/rsa_spi/include/remote_proxy.h
index 4c3f5c3..a024ef8 100644
--- a/bundles/remote_services/rsa_spi/include/remote_proxy.h
+++ b/bundles/remote_services/rsa_spi/include/remote_proxy.h
@@ -34,7 +34,7 @@
 #define OSGI_RSA_REMOTE_PROXY_TIMEOUT   "remote_proxy_timeout"
 
 typedef celix_status_t (*sendToHandle)(remote_service_admin_pt remote_service_admin_ptr, endpoint_description_pt endpointDescription, char *request, char **reply, int* replyStatus);
-typedef celix_status_t (*createProxyService)(void *handle, endpoint_description_pt endpointDescription, remote_service_admin_pt rsa, sendToHandle sendToCallback, properties_pt properties, void **service);
+typedef celix_status_t (*createProxyService)(void *handle, endpoint_description_pt endpointDescription, remote_service_admin_pt rsa, sendToHandle sendToCallback, celix_properties_t *properties, void **service);
 typedef celix_status_t (*destroyProxyService)(void *handle, void *service);
 
 typedef struct remote_proxy_factory *remote_proxy_factory_pt;
@@ -45,7 +45,7 @@ struct remote_proxy_factory {
 	char *service;
 
 	remote_proxy_factory_service_pt remote_proxy_factory_service_ptr;
-	properties_pt properties;
+	celix_properties_t *properties;
 	service_registration_pt registration;
 
 	hash_map_pt proxy_instances;
diff --git a/bundles/remote_services/rsa_spi/include/remote_service_admin.h b/bundles/remote_services/rsa_spi/include/remote_service_admin.h
index c2d543e..c195469 100644
--- a/bundles/remote_services/rsa_spi/include/remote_service_admin.h
+++ b/bundles/remote_services/rsa_spi/include/remote_service_admin.h
@@ -43,7 +43,7 @@ typedef remote_service_admin_t* remote_service_admin_pt;
 
 struct remote_service_admin_service {
 	remote_service_admin_pt admin;
-	celix_status_t (*exportService)(remote_service_admin_pt admin, char *serviceId, properties_pt properties, array_list_pt *registrations);
+	celix_status_t (*exportService)(remote_service_admin_pt admin, char *serviceId, celix_properties_t *properties, array_list_pt *registrations);
 	celix_status_t (*removeExportedService)(remote_service_admin_pt admin, export_registration_pt registration);
 	celix_status_t (*getExportedServices)(remote_service_admin_pt admin, array_list_pt *services);
 	celix_status_t (*getImportedEndpoints)(remote_service_admin_pt admin, array_list_pt *services);
diff --git a/bundles/remote_services/topology_manager/include/tm_scope.h b/bundles/remote_services/topology_manager/include/tm_scope.h
index d4f60ca..1683fdf 100644
--- a/bundles/remote_services/topology_manager/include/tm_scope.h
+++ b/bundles/remote_services/topology_manager/include/tm_scope.h
@@ -34,7 +34,7 @@
 
 struct tm_scope_service {
     void *handle;	// scope_pt
-    celix_status_t (*addExportScope)(void *handle, char *filter, properties_pt props);
+    celix_status_t (*addExportScope)(void *handle, char *filter, celix_properties_t *props);
     celix_status_t (*removeExportScope)(void *handle, char *filter);
     celix_status_t (*addImportScope)(void *handle, char *filter);
     celix_status_t (*removeImportScope)(void *handle, char *filter);
diff --git a/bundles/remote_services/topology_manager/src/activator.c b/bundles/remote_services/topology_manager/src/activator.c
index f292e7e..699752b 100644
--- a/bundles/remote_services/topology_manager/src/activator.c
+++ b/bundles/remote_services/topology_manager/src/activator.c
@@ -196,10 +196,10 @@ celix_status_t bundleActivator_start(void * userData, bundle_context_pt context)
 
 	logHelper_log(activator->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: endpoint listener scope is %s", scope);
 
-	properties_pt props = properties_create();
-	properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
+	celix_properties_t *props = celix_properties_create();
+	celix_properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
 
-	// We can release the scope, as properties_set makes a copy of the key & value...
+	// We can release the scope, as celix_properties_set makes a copy of the key & value...
 	free(scope);
 
 	bundleContext_registerService(context, (char *) OSGI_ENDPOINT_LISTENER_SERVICE, endpointListener, props, &activator->endpointListenerService);
diff --git a/bundles/remote_services/topology_manager/src/scope.c b/bundles/remote_services/topology_manager/src/scope.c
index c6f2c27..4128c6d 100644
--- a/bundles/remote_services/topology_manager/src/scope.c
+++ b/bundles/remote_services/topology_manager/src/scope.c
@@ -27,7 +27,7 @@
 #include "filter.h"
 
 struct scope_item {
-    properties_pt props;
+    celix_properties_t *props;
 };
 
 struct scope {
@@ -48,10 +48,10 @@ static celix_status_t import_equal(const void *, const void *, bool *equals);
  * SERVICES
  */
 
-celix_status_t tm_addExportScope(void *handle, char *filter, properties_pt props) {
+celix_status_t tm_addExportScope(void *handle, char *filter, celix_properties_t *props) {
     celix_status_t status = CELIX_SUCCESS;
     scope_pt scope = (scope_pt) handle;
-    properties_pt present;
+    celix_properties_t *present;
 
     if (handle == NULL)
         return CELIX_ILLEGAL_ARGUMENT;
@@ -62,7 +62,7 @@ celix_status_t tm_addExportScope(void *handle, char *filter, properties_pt props
         // If part of the new filter is already present in any of the filters in exportScopes
         // we have to assure that the new filter defines other property keys than the property keys
         // in the already defined filter!
-        present = (properties_pt) hashMap_get(scope->exportScopes, filter);
+        present = (celix_properties_t *) hashMap_get(scope->exportScopes, filter);
         if (present == NULL) {
             struct scope_item *item = calloc(1, sizeof(*item));
             if (item == NULL) {
@@ -73,7 +73,7 @@ celix_status_t tm_addExportScope(void *handle, char *filter, properties_pt props
             }
         } else {
             // don't allow the same filter twice
-            properties_destroy(props);
+            celix_properties_destroy(props);
             status = CELIX_ILLEGAL_ARGUMENT;
         }
         celixThreadMutex_unlock(&scope->exportScopeLock);
@@ -98,7 +98,7 @@ celix_status_t tm_removeExportScope(void *handle, char *filter) {
         if (present == NULL) {
             status = CELIX_ILLEGAL_ARGUMENT;
         } else {
-            properties_destroy(present->props);
+            celix_properties_destroy(present->props);
             hashMap_remove(scope->exportScopes, filter); // frees also the item!
         }
         celixThreadMutex_unlock(&scope->exportScopeLock);
@@ -210,7 +210,7 @@ celix_status_t scope_scopeDestroy(scope_pt scope) {
         while (hashMapIterator_hasNext(iter)) {
             hash_map_entry_pt scopedEntry = hashMapIterator_nextEntry(iter);
             struct scope_item *item = (struct scope_item*) hashMapEntry_getValue(scopedEntry);
-            properties_destroy(item->props);
+            celix_properties_destroy(item->props);
         }
         hashMapIterator_destroy(iter);
         hashMap_destroy(scope->exportScopes, true, true); // free keys, free values
@@ -267,16 +267,16 @@ bool scope_allowImport(scope_pt scope, endpoint_description_pt endpoint) {
     return allowImport;
 }
 
-celix_status_t scope_getExportProperties(scope_pt scope, service_reference_pt reference, properties_pt *props) {
+celix_status_t scope_getExportProperties(scope_pt scope, service_reference_pt reference, celix_properties_t **props) {
     celix_status_t status = CELIX_SUCCESS;
     unsigned int size = 0;
     char **keys;
     bool found = false;
 
     *props = NULL;
-    properties_pt serviceProperties = properties_create();  // GB: not sure if a copy is needed
-                                                            // or serviceReference_getProperties() is
-                                                            // is acceptable
+    celix_properties_t *serviceProperties = celix_properties_create();  // GB: not sure if a copy is needed
+                                                                        // or serviceReference_getProperties() is
+                                                                        // is acceptable
 
     serviceReference_getPropertyKeys(reference, &keys, &size);
     for (int i = 0; i < size; i++) {
@@ -286,7 +286,7 @@ celix_status_t scope_getExportProperties(scope_pt scope, service_reference_pt re
         if (serviceReference_getProperty(reference, key, &value) == CELIX_SUCCESS) {
 //        		&& strcmp(key, (char*) OSGI_RSA_SERVICE_EXPORTED_INTERFACES) != 0
 //        		&& strcmp(key, (char*) OSGI_FRAMEWORK_OBJECTCLASS) != 0) {
-            properties_set(serviceProperties, key, value);
+            celix_properties_set(serviceProperties, key, value);
         }
 
     }
@@ -312,7 +312,7 @@ celix_status_t scope_getExportProperties(scope_pt scope, service_reference_pt re
             filter_destroy(filter);
         }
         hashMapIterator_destroy(scopedPropIter);
-        properties_destroy(serviceProperties);
+        celix_properties_destroy(serviceProperties);
 
         celixThreadMutex_unlock(&(scope->exportScopeLock));
     }
diff --git a/bundles/remote_services/topology_manager/src/scope.h b/bundles/remote_services/topology_manager/src/scope.h
index 4035e2c..c9dc6d7 100644
--- a/bundles/remote_services/topology_manager/src/scope.h
+++ b/bundles/remote_services/topology_manager/src/scope.h
@@ -97,7 +97,7 @@ bool scope_allowImport(scope_pt scope, endpoint_description_pt endpoint);
  * \return CELIX_SUCCESS
  *
  */
-celix_status_t scope_getExportProperties(scope_pt scope, service_reference_pt reference, properties_pt *props);
+celix_status_t scope_getExportProperties(scope_pt scope, service_reference_pt reference, celix_properties_t **props);
 
 /* \brief  add restricted scope for specified exported service
  *
@@ -109,7 +109,7 @@ celix_status_t scope_getExportProperties(scope_pt scope, service_reference_pt re
  *         CELIX_ILLEGAL_ARGUMENT if service scope is already restricted before
  *
  */
-celix_status_t tm_addExportScope(void *handle, char *filter, properties_pt props);
+celix_status_t tm_addExportScope(void *handle, char *filter, celix_properties_t *props);
 
 /* \brief  remove restricted scope for specified exported service
  *
diff --git a/bundles/remote_services/topology_manager/src/topology_manager.c b/bundles/remote_services/topology_manager/src/topology_manager.c
index eee9e5d..d1e5352 100644
--- a/bundles/remote_services/topology_manager/src/topology_manager.c
+++ b/bundles/remote_services/topology_manager/src/topology_manager.c
@@ -203,7 +203,7 @@ celix_status_t topologyManager_rsaAdding(void * handle, service_reference_pt ref
 celix_status_t topologyManager_rsaAdded(void * handle, service_reference_pt reference, void * service) {
 	celix_status_t status;
 	topology_manager_pt manager = (topology_manager_pt) handle;
-	properties_pt serviceProperties = NULL;
+	celix_properties_t *serviceProperties = NULL;
 	remote_service_admin_service_pt rsa = (remote_service_admin_service_pt) service;
 	logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Added RSA");
 
@@ -418,7 +418,7 @@ celix_status_t topologyManager_exportScopeChanged(void *handle, char *filterStr)
 	service_registration_pt reg = NULL;
 	const char* serviceId = NULL;
 	bool found;
-	properties_pt props;
+	celix_properties_t *props;
 	filter_pt filter = filter_create(filterStr);
 
 	if (filter == NULL) {
@@ -603,7 +603,7 @@ celix_status_t topologyManager_removeImportedService(void *handle, endpoint_desc
 
 celix_status_t topologyManager_addExportedService(topology_manager_pt manager, service_reference_pt reference, char *serviceId) {
 	celix_status_t status = CELIX_SUCCESS;
-	properties_pt serviceProperties = NULL;
+	celix_properties_t *serviceProperties = NULL;
 
 	logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Add exported service (%s).", serviceId);
 
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 d07ce02..b74210a 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
@@ -80,9 +80,9 @@ celix_status_t bundleActivator_start(void * userData, bundle_context_pt context)
     sprintf(scope, "(&(%s=*)(%s=%s))", OSGI_FRAMEWORK_OBJECTCLASS, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid);
     scope[len] = 0;
 
-    properties_pt props = properties_create();
-    properties_set(props, "DISCOVERY", "true");
-    properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
+    celix_properties_t *props = celix_properties_create();
+    celix_properties_set(props, "DISCOVERY", "true");
+    celix_properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
 
     if (status == CELIX_SUCCESS) {
         endpoint_listener_pt endpointListener = calloc(1, sizeof(struct endpoint_listener));
@@ -101,7 +101,7 @@ celix_status_t bundleActivator_start(void * userData, bundle_context_pt context)
             }
         }
     }
-    // We can release the scope, as properties_set makes a copy of the key & value...
+    // We can release the scope, as celix_properties_set makes a copy of the key & value...
     free(scope);
 
     return status;
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 a0486c9..ebe515b 100644
--- a/bundles/remote_services/topology_manager/tms_tst/tms_tests.cpp
+++ b/bundles/remote_services/topology_manager/tms_tst/tms_tests.cpp
@@ -298,7 +298,7 @@ extern "C" {
 
         json_t *js_root;
         json_error_t error;
-        properties_pt properties;
+        celix_properties_t *properties;
 
         *nr_exported = 0;
         *nr_imported = 0;
@@ -324,16 +324,16 @@ extern "C" {
 
                             properties=properties_create();
                             if (js_serviceZone != NULL) {
-                                properties_set(properties, (char*)JSON_SERVICE_ZONE,
-                                                           (char*)json_string_value(js_serviceZone));
+                                celix_properties_set(properties, (char*)JSON_SERVICE_ZONE,
+                                                                 (char*)json_string_value(js_serviceZone));
                             }
                             if (js_key1 != NULL) {
-                                properties_set(properties, (char*)JSON_SERVICE_KEY1,
-                                                           (char*)json_string_value(js_key1));
+                                celix_properties_set(properties, (char*)JSON_SERVICE_KEY1,
+                                                                 (char*)json_string_value(js_key1));
                             }
                             if (js_key2 != NULL) {
-                                properties_set(properties, (char*)JSON_SERVICE_KEY2,
-                                                           (char*)json_string_value(js_key2));
+                                celix_properties_set(properties, (char*)JSON_SERVICE_KEY2,
+                                                                 (char*)json_string_value(js_key2));
                             }
 
                             added = tmScopeService->addExportScope(tmScopeService->handle, (char*)json_string_value(js_filter), properties);
@@ -396,7 +396,7 @@ extern "C" {
         CHECK_EQUAL(1, arrayList_size(epList));
         for (unsigned int i = 0; i < arrayList_size(epList); i++) {
             endpoint_description_pt ep = (endpoint_description_pt) arrayList_get(epList, i);
-            properties_pt props = ep->properties;
+            celix_properties_t *props = ep->properties;
             hash_map_entry_pt entry = hashMap_getEntry(props, (void*)"key2");
             char* value = (char*) hashMapEntry_getValue(entry);
             STRCMP_EQUAL("inaetics", value);
@@ -432,7 +432,7 @@ extern "C" {
         CHECK_EQUAL(1, arrayList_size(epList));
         for (unsigned int i = 0; i < arrayList_size(epList); i++) {
             endpoint_description_pt ep = (endpoint_description_pt) arrayList_get(epList, i);
-            properties_pt props = ep->properties;
+            celix_properties_t *props = ep->properties;
             hash_map_entry_pt entry = hashMap_getEntry(props, (void*)"key2");
             char* value = (char*) hashMapEntry_getValue(entry);
             STRCMP_EQUAL("inaetics", value);
@@ -456,7 +456,7 @@ extern "C" {
         CHECK_EQUAL(1, arrayList_size(epList));
         for (unsigned int i = 0; i < arrayList_size(epList); i++) {
             endpoint_description_pt ep = (endpoint_description_pt) arrayList_get(epList, i);
-            properties_pt props = ep->properties;
+            celix_properties_t *props = ep->properties;
             hash_map_entry_pt entry = hashMap_getEntry(props, (void *)"key2");
             char* value = (char*) hashMapEntry_getValue(entry);
             STRCMP_EQUAL("inaetics", value);
@@ -481,7 +481,7 @@ extern "C" {
         CHECK_EQUAL(1, arrayList_size(epList));
         for (unsigned int i = 0; i < arrayList_size(epList); i++) {
             endpoint_description_pt ep = (endpoint_description_pt) arrayList_get(epList, i);
-            properties_pt props = ep->properties;
+            celix_properties_t *props = ep->properties;
             hash_map_entry_pt entry = hashMap_getEntry(props, (void*)"zone");
             char* value = (char*) hashMapEntry_getValue(entry);
             STRCMP_EQUAL("inaetics", value);
@@ -505,13 +505,13 @@ extern "C" {
 
         endpoint_description_pt endpoint = NULL;
 
-        properties_pt props = properties_create();
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
-        properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.test.MyBundle");
-        properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
-        properties_set(props, (char *)"zone", (char *)"thales");
+        celix_properties_t *props = celix_properties_create();
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
+        celix_properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.test.MyBundle");
+        celix_properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
+        celix_properties_set(props, (char *)"zone", (char *)"thales");
 
         rc = endpointDescription_create(props, &endpoint);
         CHECK_EQUAL(CELIX_SUCCESS, rc);
@@ -547,13 +547,13 @@ extern "C" {
 
         endpoint_description_pt endpoint = NULL;
 
-        properties_pt props = properties_create();
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
-        properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.test.MyBundle");
-        properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
-        properties_set(props, (char *)"zone", (char *)"thales");
+        celix_properties_t *props = celix_properties_create();
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
+        celix_properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.test.MyBundle");
+        celix_properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
+        celix_properties_set(props, (char *)"zone", (char *)"thales");
 
         rc = endpointDescription_create(props, &endpoint);
         CHECK_EQUAL(CELIX_SUCCESS, rc);
@@ -588,13 +588,13 @@ extern "C" {
 
         endpoint_description_pt endpoint = NULL;
 
-        properties_pt props = properties_create();
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
-        properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.test.MyBundle");
-        properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
-        properties_set(props, (char *)"zone", (char *)"thales");
+        celix_properties_t *props = celix_properties_create();
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
+        celix_properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.test.MyBundle");
+        celix_properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
+        celix_properties_set(props, (char *)"zone", (char *)"thales");
 
         rc = endpointDescription_create(props, &endpoint);
         CHECK_EQUAL(CELIX_SUCCESS, rc);
@@ -629,13 +629,13 @@ extern "C" {
 
         endpoint_description_pt endpoint = NULL;
 
-        properties_pt props = properties_create();
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
-        properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
-        properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.test.MyBundle");
-        properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
-        properties_set(props, (char *)"zone", (char *)"thales");
+        celix_properties_t *props = celix_properties_create();
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_SERVICE_ID, (char *)"42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42");
+        celix_properties_set(props, (char *)OSGI_RSA_ENDPOINT_ID, (char *)"eec5404d-51d0-47ef-8d86-c825a8beda42-42");
+        celix_properties_set(props, (char *)OSGI_FRAMEWORK_OBJECTCLASS,(char *)"org.apache.celix.test.MyBundle");
+        celix_properties_set(props, (char *)"service.version",(char *)"1.0.0"); //TODO find out standard in osgi spec
+        celix_properties_set(props, (char *)"zone", (char *)"thales");
 
         rc = endpointDescription_create(props, &endpoint);
         CHECK_EQUAL(CELIX_SUCCESS, rc);


Mime
View raw message