incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1417320 [6/7] - in /incubator/celix/trunk: dependency_manager/private/src/ dependency_manager/public/include/ deployment_admin/private/include/ deployment_admin/private/src/ device_access/device_access/private/include/ device_access/device...
Date Wed, 05 Dec 2012 09:06:34 GMT
Modified: incubator/celix/trunk/remote_services/discovery/private/src/discovery.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/private/src/discovery.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/private/src/discovery.c (original)
+++ incubator/celix/trunk/remote_services/discovery/private/src/discovery.c Wed Dec  5 09:05:46 2012
@@ -43,17 +43,17 @@ struct discovery {
 	bundle_context_t context;
 	apr_pool_t *pool;
 
-	HASH_MAP listenerReferences;
+	hash_map_t listenerReferences;
 
 	bool running;
 	apr_thread_t *slpPoll;
 
-	HASH_MAP slpServices;
+	hash_map_t slpServices;
 
 	char *rsaPort;
 
-	ARRAY_LIST handled;
-	ARRAY_LIST registered;
+	array_list_t handled;
+	array_list_t registered;
 };
 
 struct slp_service {
@@ -150,10 +150,10 @@ celix_status_t discovery_removeService(d
 	printf("DISCOVERY: Remove service (%s)\n", endpoint->service);
 
 	// Inform listeners of new endpoint
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(discovery->listenerReferences);
+	hash_map_iterator_t iter = hashMapIterator_create(discovery->listenerReferences);
 	while (hashMapIterator_hasNext(iter)) {
-		HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
-		SERVICE_REFERENCE reference = hashMapEntry_getKey(entry);
+		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+		service_reference_t reference = hashMapEntry_getKey(entry);
 		endpoint_listener_t listener = NULL;
 		bundleContext_getService(discovery->context, reference, (void**)&listener);
 		discovery_informListenerOfRemoval(discovery, listener, endpoint);
@@ -166,15 +166,15 @@ celix_status_t discovery_addService(disc
 	celix_status_t status = CELIX_SUCCESS;
 
 	// Inform listeners of new endpoint
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(discovery->listenerReferences);
+	hash_map_iterator_t iter = hashMapIterator_create(discovery->listenerReferences);
 	while (hashMapIterator_hasNext(iter)) {
-		HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
-		SERVICE_REFERENCE reference = hashMapEntry_getKey(entry);
+		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+		service_reference_t reference = hashMapEntry_getKey(entry);
 		endpoint_listener_t listener = NULL;
 
-		SERVICE_REGISTRATION registration = NULL;
+		service_registration_t registration = NULL;
 		serviceReference_getServiceRegistration(reference, &registration);
-		PROPERTIES serviceProperties = NULL;
+		properties_t serviceProperties = NULL;
 		serviceRegistration_getProperties(registration, &serviceProperties);
 		char *scope = properties_get(serviceProperties, (char *) ENDPOINT_LISTENER_SCOPE);
 		filter_t filter = filter_create(scope, discovery->pool);
@@ -253,9 +253,9 @@ celix_status_t discovery_endpointAdded(v
 		status = discovery_constructServiceUrl(discovery, endpoint, &serviceUrl);
 		if (status == CELIX_SUCCESS) {
 			char *attributes = "";
-			HASH_MAP_ITERATOR iter = hashMapIterator_create(endpoint->properties);
+			hash_map_iterator_t iter = hashMapIterator_create(endpoint->properties);
 			while (hashMapIterator_hasNext(iter)) {
-				HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
+				hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
 				char *key = hashMapEntry_getKey(entry);
 				char *value = hashMapEntry_getValue(entry);
 				if (strlen(attributes) != 0) {
@@ -310,7 +310,7 @@ celix_status_t discovery_endpointRemoved
 	return status;
 }
 
-celix_status_t discovery_endpointListenerAdding(void * handle, SERVICE_REFERENCE reference, void **service) {
+celix_status_t discovery_endpointListenerAdding(void * handle, service_reference_t reference, void **service) {
 	celix_status_t status = CELIX_SUCCESS;
 	discovery_t discovery = handle;
 
@@ -319,13 +319,13 @@ celix_status_t discovery_endpointListene
 	return status;
 }
 
-celix_status_t discovery_endpointListenerAdded(void * handle, SERVICE_REFERENCE reference, void * service) {
+celix_status_t discovery_endpointListenerAdded(void * handle, service_reference_t reference, void * service) {
 	celix_status_t status = CELIX_SUCCESS;
 	discovery_t discovery = handle;
 
-	SERVICE_REGISTRATION registration = NULL;
+	service_registration_t registration = NULL;
 	serviceReference_getServiceRegistration(reference, &registration);
-	PROPERTIES serviceProperties = NULL;
+	properties_t serviceProperties = NULL;
 	serviceRegistration_getProperties(registration, &serviceProperties);
 	char *discoveryListener = properties_get(serviceProperties, "DISCOVERY");
 
@@ -339,7 +339,7 @@ celix_status_t discovery_endpointListene
 	return status;
 }
 
-celix_status_t discovery_endpointListenerModified(void * handle, SERVICE_REFERENCE reference, void * service) {
+celix_status_t discovery_endpointListenerModified(void * handle, service_reference_t reference, void * service) {
 	celix_status_t status = CELIX_SUCCESS;
 	discovery_t discovery = handle;
 
@@ -349,11 +349,11 @@ celix_status_t discovery_endpointListene
 	return status;
 }
 
-celix_status_t discovery_updateEndpointListener(discovery_t discovery, SERVICE_REFERENCE reference, endpoint_listener_t service) {
+celix_status_t discovery_updateEndpointListener(discovery_t discovery, service_reference_t reference, endpoint_listener_t service) {
 	celix_status_t status = CELIX_SUCCESS;
 	char *scope = "createScopeHere";
 
-	ARRAY_LIST scopes = hashMap_get(discovery->listenerReferences, reference);
+	array_list_t scopes = hashMap_get(discovery->listenerReferences, reference);
 	if (scopes == NULL) {
 		scopes = NULL;
 		arrayList_create(discovery->pool, &scopes);
@@ -364,9 +364,9 @@ celix_status_t discovery_updateEndpointL
 		arrayList_add(scopes, scope);
 	}
 
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(discovery->slpServices);
+	hash_map_iterator_t iter = hashMapIterator_create(discovery->slpServices);
 	while (hashMapIterator_hasNext(iter)) {
-		HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
+		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
 		char *key = hashMapEntry_getKey(entry);
 		endpoint_description_t value = hashMapEntry_getValue(entry);
 		discovery_informListener(discovery, service, value);
@@ -375,7 +375,7 @@ celix_status_t discovery_updateEndpointL
 	return status;
 }
 
-celix_status_t discovery_endpointListenerRemoved(void * handle, SERVICE_REFERENCE reference, void * service) {
+celix_status_t discovery_endpointListenerRemoved(void * handle, service_reference_t reference, void * service) {
 	celix_status_t status = CELIX_SUCCESS;
 	discovery_t discovery = handle;
 
@@ -400,9 +400,9 @@ static void *APR_THREAD_FUNC discovery_p
 			err = SLPFindSrvs(slp, "osgi.remote", 0, 0, discovery_pollSLPCallback, data);
 		}
 
-		HASH_MAP_ITERATOR iter = hashMapIterator_create(discovery->slpServices);
+		hash_map_iterator_t iter = hashMapIterator_create(discovery->slpServices);
 		while (hashMapIterator_hasNext(iter)) {
-			HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
+			hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
 			char *key = hashMapEntry_getKey(entry);
 			endpoint_description_t value = hashMapEntry_getValue(entry);
 
@@ -450,7 +450,7 @@ SLPBoolean discovery_pollSLPCallback(SLP
 					err = SLPFindAttrs(handle, srvurl, "", "", discovery_attributesCallback, slpService);
 				}
 
-				PROPERTIES props = properties_create();
+				properties_t props = properties_create();
 				char *track;
 				char *token = apr_strtok(slpService->attributes, ",", &track);
 				while (token != NULL) {

Modified: incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c (original)
+++ incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c Wed Dec  5 09:05:46 2012
@@ -46,7 +46,7 @@ struct activator {
 	discovery_t discovery;
 
 	service_tracker_t endpointListenerTracker;
-	SERVICE_REGISTRATION endpointListenerService;
+	service_registration_t endpointListenerService;
 };
 
 celix_status_t discoveryActivator_createEPLTracker(struct activator *activator, service_tracker_t *tracker);
@@ -106,7 +106,7 @@ celix_status_t bundleActivator_start(voi
 	endpointListener->endpointAdded = discovery_endpointAdded;
 	endpointListener->endpointRemoved = discovery_endpointRemoved;
 
-	PROPERTIES props = properties_create();
+	properties_t props = properties_create();
 	properties_set(props, "DISCOVERY", "true");
 	char *uuid = NULL;
 	discoveryActivator_getUUID(activator, &uuid);

Modified: incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h (original)
+++ incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h Wed Dec  5 09:05:46 2012
@@ -31,13 +31,13 @@
 #include "properties.h"
 
 struct endpoint_description {
-	ARRAY_LIST configurationTypes;
+	array_list_t configurationTypes;
 	char *frameworkUUID;
 	char *id;
-	// ARRAY_LIST intents;
+	// array_list_t intents;
 	char *service;
 	// HASH_MAP packageVersions;
-	PROPERTIES properties;
+	properties_t properties;
 	long serviceId;
 };
 

Modified: incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c (original)
+++ incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c Wed Dec  5 09:05:46 2012
@@ -33,7 +33,7 @@
 struct activator {
 	apr_pool_t *pool;
 
-	SERVICE_REGISTRATION endpoint;
+	service_registration_t endpoint;
 };
 
 celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {

Modified: incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c (original)
+++ incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c Wed Dec  5 09:05:46 2012
@@ -34,8 +34,8 @@
 struct activator {
 	apr_pool_t *pool;
 
-	SERVICE_REGISTRATION proxy;
-	SERVICE_REGISTRATION service;
+	service_registration_t proxy;
+	service_registration_t service;
 };
 
 celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
@@ -89,7 +89,7 @@ celix_status_t bundleActivator_start(voi
 
 	bundleContext_registerService(context, EXAMPLE_SERVICE, exampleService, NULL, &activator->service);
 
-	PROPERTIES props = properties_create();
+	properties_t props = properties_create();
 	properties_set(props, (char *) "proxy.interface", (char *) EXAMPLE_SERVICE);
 	bundleContext_registerService(context, REMOTE_PROXY, exampleProxy, props, &activator->proxy);
 

Modified: incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c (original)
+++ incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c Wed Dec  5 09:05:46 2012
@@ -34,7 +34,7 @@
 
 struct activator {
 	apr_pool_t *pool;
-	SERVICE_REGISTRATION exampleReg;
+	service_registration_t exampleReg;
 };
 
 celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
@@ -64,7 +64,7 @@ celix_status_t bundleActivator_start(voi
 	struct activator *activator = userData;
 	example_t example = NULL;
 	example_service_t service = NULL;
-	PROPERTIES properties = NULL;
+	properties_t properties = NULL;
 
 	status = example_create(activator->pool, &example);
 	if (status == CELIX_SUCCESS) {

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h Wed Dec  5 09:05:46 2012
@@ -36,7 +36,7 @@ struct export_registration {
 	bundle_context_t context;
 	remote_service_admin_t rsa;
 	endpoint_description_t endpointDescription;
-	SERVICE_REFERENCE reference;
+	service_reference_t reference;
 
 	service_tracker_t tracker;
 	service_tracker_t endpointTracker;
@@ -44,12 +44,12 @@ struct export_registration {
 	remote_endpoint_service_t endpoint;
 
 	export_reference_t exportReference;
-	BUNDLE bundle;
+	bundle_t bundle;
 
 	bool closed;
 };
 
-celix_status_t exportRegistration_create(apr_pool_t *pool, SERVICE_REFERENCE reference, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, export_registration_t *registration);
+celix_status_t exportRegistration_create(apr_pool_t *pool, service_reference_t reference, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, export_registration_t *registration);
 celix_status_t exportRegistration_open(export_registration_t registration);
 celix_status_t exportRegistration_close(export_registration_t registration);
 celix_status_t exportRegistration_getException(export_registration_t registration);

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h Wed Dec  5 09:05:46 2012
@@ -39,10 +39,10 @@ struct import_registration {
 
 	service_tracker_t proxyTracker;
 
-	SERVICE_REFERENCE reference;
+	service_reference_t reference;
 	remote_proxy_service_t proxy;
 	import_reference_t importReference;
-	BUNDLE bundle;
+	bundle_t bundle;
 
 	bool closed;
 };

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h Wed Dec  5 09:05:46 2012
@@ -35,20 +35,20 @@
 
 struct export_reference {
 	endpoint_description_t endpoint;
-	SERVICE_REFERENCE reference;
+	service_reference_t reference;
 };
 
 struct import_reference {
 	endpoint_description_t endpoint;
-	SERVICE_REFERENCE reference;
+	service_reference_t reference;
 };
 
 struct remote_service_admin {
 	apr_pool_t *pool;
 	bundle_context_t context;
 
-	HASH_MAP exportedServices;
-	HASH_MAP importedServices;
+	hash_map_t exportedServices;
+	hash_map_t importedServices;
 
 	struct mg_context *ctx;
 };
@@ -56,9 +56,9 @@ struct remote_service_admin {
 celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_t *admin);
 celix_status_t remoteServiceAdmin_stop(remote_service_admin_t admin);
 
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, SERVICE_REFERENCE reference, PROPERTIES properties, ARRAY_LIST *registrations);
-celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_t admin, ARRAY_LIST *services);
-celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_t admin, ARRAY_LIST *services);
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, service_reference_t reference, properties_t properties, array_list_t *registrations);
+celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_t admin, array_list_t *services);
+celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_t admin, array_list_t *services);
 celix_status_t remoteServiceAdmin_importService(remote_service_admin_t admin, endpoint_description_t endpoint, import_registration_t *registration);
 
 

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c Wed Dec  5 09:05:46 2012
@@ -37,14 +37,14 @@
 #include "bundle.h"
 #include "celix_log.h"
 
-celix_status_t exportRegistration_endpointAdding(void * handle, SERVICE_REFERENCE reference, void **service);
-celix_status_t exportRegistration_endpointAdded(void * handle, SERVICE_REFERENCE reference, void *service);
-celix_status_t exportRegistration_endpointModified(void * handle, SERVICE_REFERENCE reference, void *service);
-celix_status_t exportRegistration_endpointRemoved(void * handle, SERVICE_REFERENCE reference, void *service);
+celix_status_t exportRegistration_endpointAdding(void * handle, service_reference_t reference, void **service);
+celix_status_t exportRegistration_endpointAdded(void * handle, service_reference_t reference, void *service);
+celix_status_t exportRegistration_endpointModified(void * handle, service_reference_t reference, void *service);
+celix_status_t exportRegistration_endpointRemoved(void * handle, service_reference_t reference, void *service);
 
 celix_status_t exportRegistration_createEndpointTracker(export_registration_t registration, service_tracker_t *tracker);
 
-celix_status_t exportRegistration_create(apr_pool_t *pool, SERVICE_REFERENCE reference, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, export_registration_t *registration) {
+celix_status_t exportRegistration_create(apr_pool_t *pool, service_reference_t reference, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, export_registration_t *registration) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *mypool = NULL;
 	apr_pool_create(&mypool, pool);
@@ -116,7 +116,7 @@ celix_status_t exportRegistration_create
 	return status;
 }
 
-celix_status_t exportRegistration_endpointAdding(void * handle, SERVICE_REFERENCE reference, void **service) {
+celix_status_t exportRegistration_endpointAdding(void * handle, service_reference_t reference, void **service) {
 	celix_status_t status = CELIX_SUCCESS;
 	export_registration_t registration = handle;
 
@@ -125,7 +125,7 @@ celix_status_t exportRegistration_endpoi
 	return status;
 }
 
-celix_status_t exportRegistration_endpointAdded(void * handle, SERVICE_REFERENCE reference, void *service) {
+celix_status_t exportRegistration_endpointAdded(void * handle, service_reference_t reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
 	export_registration_t registration = handle;
 
@@ -142,14 +142,14 @@ celix_status_t exportRegistration_endpoi
 	return status;
 }
 
-celix_status_t exportRegistration_endpointModified(void * handle, SERVICE_REFERENCE reference, void *service) {
+celix_status_t exportRegistration_endpointModified(void * handle, service_reference_t reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
 	export_registration_t registration = handle;
 
 	return status;
 }
 
-celix_status_t exportRegistration_endpointRemoved(void * handle, SERVICE_REFERENCE reference, void *service) {
+celix_status_t exportRegistration_endpointRemoved(void * handle, service_reference_t reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
 	export_registration_t registration = handle;
 

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c Wed Dec  5 09:05:46 2012
@@ -39,10 +39,10 @@
 #include "bundle_context.h"
 #include "bundle.h"
 
-celix_status_t importRegistration_proxyAdding(void * handle, SERVICE_REFERENCE reference, void **service);
-celix_status_t importRegistration_proxyAdded(void * handle, SERVICE_REFERENCE reference, void *service);
-celix_status_t importRegistration_proxyModified(void * handle, SERVICE_REFERENCE reference, void *service);
-celix_status_t importRegistration_proxyRemoved(void * handle, SERVICE_REFERENCE reference, void *service);
+celix_status_t importRegistration_proxyAdding(void * handle, service_reference_t reference, void **service);
+celix_status_t importRegistration_proxyAdded(void * handle, service_reference_t reference, void *service);
+celix_status_t importRegistration_proxyModified(void * handle, service_reference_t reference, void *service);
+celix_status_t importRegistration_proxyRemoved(void * handle, service_reference_t reference, void *service);
 
 celix_status_t importRegistration_createProxyTracker(import_registration_t registration, service_tracker_t *tracker);
 
@@ -108,7 +108,7 @@ celix_status_t importRegistration_create
 	return status;
 }
 
-celix_status_t importRegistration_proxyAdding(void * handle, SERVICE_REFERENCE reference, void **service) {
+celix_status_t importRegistration_proxyAdding(void * handle, service_reference_t reference, void **service) {
 	celix_status_t status = CELIX_SUCCESS;
 	import_registration_t registration = handle;
 
@@ -117,7 +117,7 @@ celix_status_t importRegistration_proxyA
 	return status;
 }
 
-celix_status_t importRegistration_proxyAdded(void * handle, SERVICE_REFERENCE reference, void *service) {
+celix_status_t importRegistration_proxyAdded(void * handle, service_reference_t reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
 	import_registration_t registration = handle;
 
@@ -133,7 +133,7 @@ celix_status_t importRegistration_proxyA
 	return status;
 }
 
-celix_status_t importRegistration_proxyModified(void * handle, SERVICE_REFERENCE reference, void *service) {
+celix_status_t importRegistration_proxyModified(void * handle, service_reference_t reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
 	import_registration_t registration = handle;
 
@@ -146,7 +146,7 @@ celix_status_t importRegistration_proxyM
 	return status;
 }
 
-celix_status_t importRegistration_proxyRemoved(void * handle, SERVICE_REFERENCE reference, void *service) {
+celix_status_t importRegistration_proxyRemoved(void * handle, service_reference_t reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
 	import_registration_t registration = handle;
 

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c Wed Dec  5 09:05:46 2012
@@ -35,7 +35,7 @@
 struct activator {
 	apr_pool_t *pool;
 	remote_service_admin_t admin;
-	SERVICE_REGISTRATION registration;
+	service_registration_t registration;
 };
 
 celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c Wed Dec  5 09:05:46 2012
@@ -47,8 +47,8 @@ static const char *ajax_reply_start =
   "\r\n";
 
 void *remoteServiceAdmin_callback(enum mg_event event, struct mg_connection *conn, const struct mg_request_info *request_info);
-celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, SERVICE_REFERENCE reference, char *interface);
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, PROPERTIES serviceProperties, PROPERTIES endpointProperties, char *interface, endpoint_description_t *description);
+celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, service_reference_t reference, char *interface);
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, properties_t serviceProperties, properties_t endpointProperties, char *interface, endpoint_description_t *description);
 celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_t rsa, char **uuidStr);
 
 celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_t *admin) {
@@ -79,9 +79,9 @@ celix_status_t remoteServiceAdmin_create
 celix_status_t remoteServiceAdmin_stop(remote_service_admin_t admin) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(admin->exportedServices);
+	hash_map_iterator_t iter = hashMapIterator_create(admin->exportedServices);
 	while (hashMapIterator_hasNext(iter)) {
-		ARRAY_LIST exports = hashMapIterator_nextValue(iter);
+		array_list_t exports = hashMapIterator_nextValue(iter);
 		int i;
 		for (i = 0; i < arrayList_size(exports); i++) {
 			export_registration_t export = arrayList_get(exports, i);
@@ -90,7 +90,7 @@ celix_status_t remoteServiceAdmin_stop(r
 	}
 	iter = hashMapIterator_create(admin->importedServices);
 	while (hashMapIterator_hasNext(iter)) {
-		ARRAY_LIST exports = hashMapIterator_nextValue(iter);
+		array_list_t exports = hashMapIterator_nextValue(iter);
 		int i;
 		for (i = 0; i < arrayList_size(exports); i++) {
 			import_registration_t export = arrayList_get(exports, i);
@@ -130,10 +130,10 @@ void *remoteServiceAdmin_callback(enum m
 			mg_read(conn, data, datalength);
 			data[datalength] = '\0';
 
-			HASH_MAP_ITERATOR iter = hashMapIterator_create(rsa->exportedServices);
+			hash_map_iterator_t iter = hashMapIterator_create(rsa->exportedServices);
 			while (hashMapIterator_hasNext(iter)) {
-				HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
-				ARRAY_LIST exports = hashMapEntry_getValue(entry);
+				hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+				array_list_t exports = hashMapEntry_getValue(entry);
 				int expIt = 0;
 				for (expIt = 0; expIt < arrayList_size(exports); expIt++) {
 					export_registration_t export = arrayList_get(exports, expIt);
@@ -154,10 +154,10 @@ void *remoteServiceAdmin_callback(enum m
 }
 
 celix_status_t remoteServiceAdmin_handleRequest(remote_service_admin_t rsa, char *service, char *request, char *data, char **reply) {
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(rsa->exportedServices);
+	hash_map_iterator_t iter = hashMapIterator_create(rsa->exportedServices);
 	while (hashMapIterator_hasNext(iter)) {
-		HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
-		ARRAY_LIST exports = hashMapEntry_getValue(entry);
+		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+		array_list_t exports = hashMapEntry_getValue(entry);
 		int expIt = 0;
 		for (expIt = 0; expIt < arrayList_size(exports); expIt++) {
 			export_registration_t export = arrayList_get(exports, expIt);
@@ -169,13 +169,13 @@ celix_status_t remoteServiceAdmin_handle
 	return CELIX_SUCCESS;
 }
 
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, SERVICE_REFERENCE reference, PROPERTIES properties, ARRAY_LIST *registrations) {
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, service_reference_t reference, properties_t properties, array_list_t *registrations) {
 	celix_status_t status = CELIX_SUCCESS;
 	arrayList_create(admin->pool, registrations);
 
-	SERVICE_REGISTRATION registration = NULL;
+	service_registration_t registration = NULL;
 	serviceReference_getServiceRegistration(reference, &registration);
-	PROPERTIES serviceProperties = NULL;
+	properties_t serviceProperties = NULL;
 	serviceRegistration_getProperties(registration, &serviceProperties);
 	char *exports = properties_get(serviceProperties, (char *) SERVICE_EXPORTED_INTERFACES);
 	char *provided = properties_get(serviceProperties, (char *) OBJECTCLASS);
@@ -184,7 +184,7 @@ celix_status_t remoteServiceAdmin_export
 		printf("RSA: No Services to export.\n");
 	} else {
 		printf("RSA: Export services (%s)\n", exports);
-		ARRAY_LIST interfaces = NULL;
+		array_list_t interfaces = NULL;
 		arrayList_create(admin->pool, &interfaces);
 		if (strcmp(string_trim(exports), "*") == 0) {
 			char *token;
@@ -230,19 +230,19 @@ celix_status_t remoteServiceAdmin_export
 	return status;
 }
 
-celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, SERVICE_REFERENCE reference, char *interface) {
+celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, service_reference_t reference, char *interface) {
 	celix_status_t status = CELIX_SUCCESS;
-	PROPERTIES endpointProperties = properties_create();
-	PROPERTIES serviceProperties = NULL;
+	properties_t endpointProperties = properties_create();
+	properties_t serviceProperties = NULL;
 
-	SERVICE_REGISTRATION sRegistration = NULL;
+	service_registration_t sRegistration = NULL;
 	serviceReference_getServiceRegistration(reference, &sRegistration);
 
 	serviceRegistration_getProperties(sRegistration, &serviceProperties);
 
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(serviceProperties);
+	hash_map_iterator_t iter = hashMapIterator_create(serviceProperties);
 	while (hashMapIterator_hasNext(iter)) {
-		HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
+		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
 		char *key = (char *) hashMapEntry_getKey(entry);
 		char *value = (char *) hashMapEntry_getValue(entry);
 
@@ -264,8 +264,8 @@ celix_status_t remoteServiceAdmin_instal
 	return status;
 }
 
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, PROPERTIES serviceProperties,
-		PROPERTIES endpointProperties, char *interface, endpoint_description_t *description) {
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, properties_t serviceProperties,
+		properties_t endpointProperties, char *interface, endpoint_description_t *description) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	apr_pool_t *childPool = NULL;
@@ -290,12 +290,12 @@ celix_status_t remoteServiceAdmin_create
 	return status;
 }
 
-celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_t admin, ARRAY_LIST *services) {
+celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_t admin, array_list_t *services) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }
 
-celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_t admin, ARRAY_LIST *services) {
+celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_t admin, array_list_t *services) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }
@@ -306,7 +306,7 @@ celix_status_t remoteServiceAdmin_import
 	printf("RSA: Import service %s\n", endpoint->service);
 	importRegistration_create(admin->pool, endpoint, admin, admin->context, registration);
 
-	ARRAY_LIST importedRegs = hashMap_get(admin->importedServices, endpoint);
+	array_list_t importedRegs = hashMap_get(admin->importedServices, endpoint);
 	if (importedRegs == NULL) {
 		arrayList_create(admin->pool, &importedRegs);
 		hashMap_put(admin->importedServices, endpoint, importedRegs);

Modified: incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h Wed Dec  5 09:05:46 2012
@@ -40,9 +40,9 @@ typedef struct remote_service_admin *rem
 
 struct remote_service_admin_service {
 	remote_service_admin_t admin;
-	celix_status_t (*exportService)(remote_service_admin_t admin, SERVICE_REFERENCE reference, PROPERTIES properties, ARRAY_LIST *registrations);
-	celix_status_t (*getExportedServices)(remote_service_admin_t admin, ARRAY_LIST *services);
-	celix_status_t (*getImportedEndpoints)(remote_service_admin_t admin, ARRAY_LIST *services);
+	celix_status_t (*exportService)(remote_service_admin_t admin, service_reference_t reference, properties_t properties, array_list_t *registrations);
+	celix_status_t (*getExportedServices)(remote_service_admin_t admin, array_list_t *services);
+	celix_status_t (*getImportedEndpoints)(remote_service_admin_t admin, array_list_t *services);
 	celix_status_t (*importService)(remote_service_admin_t admin, endpoint_description_t endpoint, import_registration_t *registration);
 
 

Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c Wed Dec  5 09:05:46 2012
@@ -35,7 +35,7 @@
 struct activator {
 	apr_pool_t *pool;
 	remote_service_admin_t admin;
-	SERVICE_REGISTRATION registration;
+	service_registration_t registration;
 };
 
 celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {

Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c Wed Dec  5 09:05:46 2012
@@ -100,10 +100,10 @@ void *remoteServiceAdminHttp_callback(en
 			char *reply = NULL;
 			remoteServiceAdmin_handleRequest(rsa, service, request, data, &reply);
 
-			HASH_MAP_ITERATOR iter = hashMapIterator_create(rsa->exportedServices);
+			hash_map_iterator_t iter = hashMapIterator_create(rsa->exportedServices);
 			while (hashMapIterator_hasNext(iter)) {
-				HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
-				ARRAY_LIST exports = hashMapEntry_getValue(entry);
+				hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+				array_list_t exports = hashMapEntry_getValue(entry);
 				int expIt = 0;
 				for (expIt = 0; expIt < arrayList_size(exports); expIt++) {
 					export_registration_t export = arrayList_get(exports, expIt);

Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c Wed Dec  5 09:05:46 2012
@@ -43,8 +43,8 @@
 
 
 void *remoteServiceAdmin_callback(enum mg_event event, struct mg_connection *conn, const struct mg_request_info *request_info);
-celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, SERVICE_REFERENCE reference, char *interface);
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, PROPERTIES serviceProperties, PROPERTIES endpointProperties, char *interface, endpoint_description_t *description);
+celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, service_reference_t reference, char *interface);
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, properties_t serviceProperties, properties_t endpointProperties, char *interface, endpoint_description_t *description);
 celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_t rsa, char **uuidStr);
 
 celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_t *admin) {
@@ -75,9 +75,9 @@ celix_status_t remoteServiceAdmin_create
 celix_status_t remoteServiceAdmin_stop(remote_service_admin_t admin) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(admin->exportedServices);
+	hash_map_iterator_t iter = hashMapIterator_create(admin->exportedServices);
 	while (hashMapIterator_hasNext(iter)) {
-		ARRAY_LIST exports = hashMapIterator_nextValue(iter);
+		array_list_t exports = hashMapIterator_nextValue(iter);
 		int i;
 		for (i = 0; i < arrayList_size(exports); i++) {
 			export_registration_t export = arrayList_get(exports, i);
@@ -86,7 +86,7 @@ celix_status_t remoteServiceAdmin_stop(r
 	}
 	iter = hashMapIterator_create(admin->importedServices);
 	while (hashMapIterator_hasNext(iter)) {
-		ARRAY_LIST exports = hashMapIterator_nextValue(iter);
+		array_list_t exports = hashMapIterator_nextValue(iter);
 		int i;
 		for (i = 0; i < arrayList_size(exports); i++) {
 			import_registration_t export = arrayList_get(exports, i);
@@ -100,10 +100,10 @@ celix_status_t remoteServiceAdmin_stop(r
 
 
 celix_status_t remoteServiceAdmin_handleRequest(remote_service_admin_t rsa, char *service, char *request, char *data, char **reply) {
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(rsa->exportedServices);
+	hash_map_iterator_t iter = hashMapIterator_create(rsa->exportedServices);
 	while (hashMapIterator_hasNext(iter)) {
-		HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
-		ARRAY_LIST exports = hashMapEntry_getValue(entry);
+		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+		array_list_t exports = hashMapEntry_getValue(entry);
 		int expIt = 0;
 		for (expIt = 0; expIt < arrayList_size(exports); expIt++) {
 			export_registration_t export = arrayList_get(exports, expIt);
@@ -115,13 +115,13 @@ celix_status_t remoteServiceAdmin_handle
 	return CELIX_SUCCESS;
 }
 
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, SERVICE_REFERENCE reference, PROPERTIES properties, ARRAY_LIST *registrations) {
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, service_reference_t reference, properties_t properties, array_list_t *registrations) {
 	celix_status_t status = CELIX_SUCCESS;
 	arrayList_create(admin->pool, registrations);
 
-	SERVICE_REGISTRATION registration = NULL;
+	service_registration_t registration = NULL;
 	serviceReference_getServiceRegistration(reference, &registration);
-	PROPERTIES serviceProperties = NULL;
+	properties_t serviceProperties = NULL;
 	serviceRegistration_getProperties(registration, &serviceProperties);
 	char *exports = properties_get(serviceProperties, (char *) SERVICE_EXPORTED_INTERFACES);
 	char *provided = properties_get(serviceProperties, (char *) OBJECTCLASS);
@@ -130,7 +130,7 @@ celix_status_t remoteServiceAdmin_export
 		printf("RSA: No Services to export.\n");
 	} else {
 		printf("RSA: Export services (%s)\n", exports);
-		ARRAY_LIST interfaces = NULL;
+		array_list_t interfaces = NULL;
 		arrayList_create(admin->pool, &interfaces);
 		if (strcmp(string_trim(exports), "*") == 0) {
 			char *token;
@@ -176,19 +176,19 @@ celix_status_t remoteServiceAdmin_export
 	return status;
 }
 
-celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, SERVICE_REFERENCE reference, char *interface) {
+celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, service_reference_t reference, char *interface) {
 	celix_status_t status = CELIX_SUCCESS;
-	PROPERTIES endpointProperties = properties_create();
-	PROPERTIES serviceProperties = NULL;
+	properties_t endpointProperties = properties_create();
+	properties_t serviceProperties = NULL;
 
-	SERVICE_REGISTRATION sRegistration = NULL;
+	service_registration_t sRegistration = NULL;
 	serviceReference_getServiceRegistration(reference, &sRegistration);
 
 	serviceRegistration_getProperties(sRegistration, &serviceProperties);
 
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(serviceProperties);
+	hash_map_iterator_t iter = hashMapIterator_create(serviceProperties);
 	while (hashMapIterator_hasNext(iter)) {
-		HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
+		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
 		char *key = (char *) hashMapEntry_getKey(entry);
 		char *value = (char *) hashMapEntry_getValue(entry);
 
@@ -210,8 +210,8 @@ celix_status_t remoteServiceAdmin_instal
 	return status;
 }
 
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, PROPERTIES serviceProperties,
-		PROPERTIES endpointProperties, char *interface, endpoint_description_t *description) {
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, properties_t serviceProperties,
+		properties_t endpointProperties, char *interface, endpoint_description_t *description) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*description = apr_palloc(admin->pool, sizeof(*description));
@@ -233,12 +233,12 @@ celix_status_t remoteServiceAdmin_create
 	return status;
 }
 
-celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_t admin, ARRAY_LIST *services) {
+celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_t admin, array_list_t *services) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }
 
-celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_t admin, ARRAY_LIST *services) {
+celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_t admin, array_list_t *services) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }
@@ -249,7 +249,7 @@ celix_status_t remoteServiceAdmin_import
 	printf("RSA: Import service %s\n", endpoint->service);
 	importRegistration_create(admin->pool, endpoint, admin, admin->context, registration);
 
-	ARRAY_LIST importedRegs = hashMap_get(admin->importedServices, endpoint);
+	array_list_t importedRegs = hashMap_get(admin->importedServices, endpoint);
 	if (importedRegs == NULL) {
 		arrayList_create(admin->pool, &importedRegs);
 		hashMap_put(admin->importedServices, endpoint, importedRegs);

Modified: incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h Wed Dec  5 09:05:46 2012
@@ -35,21 +35,21 @@ typedef struct topology_manager *topolog
 
 celix_status_t topologyManager_create(bundle_context_t context, apr_pool_t *pool, topology_manager_t *manager);
 
-celix_status_t topologyManager_rsaAdding(void *handle, SERVICE_REFERENCE reference, void **service);
-celix_status_t topologyManager_rsaAdded(void *handle, SERVICE_REFERENCE reference, void *service);
-celix_status_t topologyManager_rsaModified(void *handle, SERVICE_REFERENCE reference, void *service);
-celix_status_t topologyManager_rsaRemoved(void *handle, SERVICE_REFERENCE reference, void *service);
+celix_status_t topologyManager_rsaAdding(void *handle, service_reference_t reference, void **service);
+celix_status_t topologyManager_rsaAdded(void *handle, service_reference_t reference, void *service);
+celix_status_t topologyManager_rsaModified(void *handle, service_reference_t reference, void *service);
+celix_status_t topologyManager_rsaRemoved(void *handle, service_reference_t reference, void *service);
 
-celix_status_t topologyManager_serviceChanged(void *listener, SERVICE_EVENT event);
+celix_status_t topologyManager_serviceChanged(void *listener, service_event_t event);
 
 celix_status_t topologyManager_endpointAdded(void *handle, endpoint_description_t endpoint, char *machtedFilter);
 celix_status_t topologyManager_endpointRemoved(void *handle, endpoint_description_t endpoint, char *machtedFilter);
 
 celix_status_t topologyManager_importService(topology_manager_t manager, endpoint_description_t endpoint);
-celix_status_t topologyManager_exportService(topology_manager_t manager, SERVICE_REFERENCE reference);
-celix_status_t topologyManager_removeService(topology_manager_t manager, SERVICE_REFERENCE reference);
+celix_status_t topologyManager_exportService(topology_manager_t manager, service_reference_t reference);
+celix_status_t topologyManager_removeService(topology_manager_t manager, service_reference_t reference);
 
-celix_status_t topologyManager_listenerAdded(void *handle, ARRAY_LIST listeners);
-celix_status_t topologyManager_listenerRemoved(void *handle, ARRAY_LIST listeners);
+celix_status_t topologyManager_listenerAdded(void *handle, array_list_t listeners);
+celix_status_t topologyManager_listenerRemoved(void *handle, array_list_t listeners);
 
 #endif /* TOPOLOGY_MANAGER_H_ */

Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c Wed Dec  5 09:05:46 2012
@@ -48,14 +48,14 @@ struct activator {
 	topology_manager_t manager;
 
 	service_tracker_t remoteServiceAdminTracker;
-	SERVICE_LISTENER serviceListener;
+	service_listener_t serviceListener;
 
-	SERVICE_REGISTRATION endpointListenerService;
-	SERVICE_REGISTRATION hook;
+	service_registration_t endpointListenerService;
+	service_registration_t hook;
 };
 
 static celix_status_t bundleActivator_createRSATracker(struct activator *activator, service_tracker_t *tracker);
-static celix_status_t bundleActivator_createServiceListener(struct activator *activator, SERVICE_LISTENER *listener);
+static celix_status_t bundleActivator_createServiceListener(struct activator *activator, service_listener_t *listener);
 
 celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
@@ -110,7 +110,7 @@ static celix_status_t bundleActivator_cr
 	return status;
 }
 
-static celix_status_t bundleActivator_createServiceListener(struct activator *activator, SERVICE_LISTENER *listener) {
+static celix_status_t bundleActivator_createServiceListener(struct activator *activator, service_listener_t *listener) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *pool;
 	apr_pool_create(&pool, activator->pool);
@@ -137,7 +137,7 @@ celix_status_t bundleActivator_start(voi
 	endpointListener->endpointAdded = topologyManager_endpointAdded;
 	endpointListener->endpointRemoved = topologyManager_endpointRemoved;
 
-	PROPERTIES props = properties_create();
+	properties_t props = properties_create();
 	char *uuid = NULL;
 	remoteServicesUtils_getUUID(pool, context, &uuid);
 	char *scope = apr_pstrcat(pool, "(&(", OBJECTCLASS, "=*)(!(", ENDPOINT_FRAMEWORK_UUID, "=", uuid, ")))", NULL);

Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c Wed Dec  5 09:05:46 2012
@@ -46,11 +46,11 @@ struct topology_manager {
 	apr_pool_t *pool;
 	bundle_context_t context;
 
-	ARRAY_LIST rsaList;
-	HASH_MAP exportedServices;
-	HASH_MAP importedServices;
+	array_list_t rsaList;
+	hash_map_t exportedServices;
+	hash_map_t importedServices;
 
-	HASH_MAP importInterests;
+	hash_map_t importInterests;
 };
 
 struct import_interest {
@@ -58,7 +58,7 @@ struct import_interest {
 	int refs;
 };
 
-celix_status_t topologyManager_notifyListeners(topology_manager_t manager, remote_service_admin_service_t rsa,  ARRAY_LIST registrations);
+celix_status_t topologyManager_notifyListeners(topology_manager_t manager, remote_service_admin_service_t rsa,  array_list_t registrations);
 celix_status_t topologyManager_notifyListenersOfRemoval(topology_manager_t manager, remote_service_admin_service_t rsa,  export_registration_t export);
 
 celix_status_t topologyManager_getUUID(topology_manager_t manager, char **uuidStr);
@@ -82,7 +82,7 @@ celix_status_t topologyManager_create(bu
 	return status;
 }
 
-celix_status_t topologyManager_rsaAdding(void * handle, SERVICE_REFERENCE reference, void **service) {
+celix_status_t topologyManager_rsaAdding(void * handle, service_reference_t reference, void **service) {
 	celix_status_t status = CELIX_SUCCESS;
 	topology_manager_t manager = handle;
 
@@ -91,7 +91,7 @@ celix_status_t topologyManager_rsaAdding
 	return status;
 }
 
-celix_status_t topologyManager_rsaAdded(void * handle, SERVICE_REFERENCE reference, void * service) {
+celix_status_t topologyManager_rsaAdded(void * handle, service_reference_t reference, void * service) {
 	celix_status_t status = CELIX_SUCCESS;
 	topology_manager_t manager = handle;
 
@@ -101,13 +101,13 @@ celix_status_t topologyManager_rsaAdded(
 	return status;
 }
 
-celix_status_t topologyManager_rsaModified(void * handle, SERVICE_REFERENCE reference, void * service) {
+celix_status_t topologyManager_rsaModified(void * handle, service_reference_t reference, void * service) {
 	celix_status_t status = CELIX_SUCCESS;
 	topology_manager_t manager = handle;
 	return status;
 }
 
-celix_status_t topologyManager_rsaRemoved(void * handle, SERVICE_REFERENCE reference, void * service) {
+celix_status_t topologyManager_rsaRemoved(void * handle, service_reference_t reference, void * service) {
 	celix_status_t status = CELIX_SUCCESS;
 	topology_manager_t manager = handle;
 
@@ -117,13 +117,13 @@ celix_status_t topologyManager_rsaRemove
 	return status;
 }
 
-celix_status_t topologyManager_serviceChanged(void *listener, SERVICE_EVENT event) {
+celix_status_t topologyManager_serviceChanged(void *listener, service_event_t event) {
 	celix_status_t status = CELIX_SUCCESS;
-	SERVICE_LISTENER listen = listener;
+	service_listener_t listen = listener;
 	topology_manager_t manager = listen->handle;
-	SERVICE_REGISTRATION registration = NULL;
+	service_registration_t registration = NULL;
 	serviceReference_getServiceRegistration(event->reference, &registration);
-	PROPERTIES props = NULL;
+	properties_t props = NULL;
 	serviceRegistration_getProperties(registration, &props);
 	char *name = properties_get(props, (char *) OBJECTCLASS);
 	char *export = properties_get(props, (char *) SERVICE_EXPORTED_INTERFACES);
@@ -159,10 +159,10 @@ celix_status_t topologyManager_endpointR
 	printf("TOPOLOGY_MANAGER: Endpoint removed\n");
 
 	if (hashMap_containsKey(manager->importedServices, endpoint)) {
-		HASH_MAP imports = hashMap_get(manager->importedServices, endpoint);
-		HASH_MAP_ITERATOR iter = hashMapIterator_create(imports);
+		hash_map_t imports = hashMap_get(manager->importedServices, endpoint);
+		hash_map_iterator_t iter = hashMapIterator_create(imports);
 		while (hashMapIterator_hasNext(iter)) {
-			HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
+			hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
 			remote_service_admin_service_t rsa = hashMapEntry_getKey(entry);
 			import_registration_t import = hashMapEntry_getValue(entry);
 			rsa->importRegistration_close(import);
@@ -172,16 +172,16 @@ celix_status_t topologyManager_endpointR
 	return status;
 }
 
-celix_status_t topologyManager_exportService(topology_manager_t manager, SERVICE_REFERENCE reference) {
+celix_status_t topologyManager_exportService(topology_manager_t manager, service_reference_t reference) {
 	celix_status_t status = CELIX_SUCCESS;
-	HASH_MAP exports = hashMap_create(NULL, NULL, NULL, NULL);
+	hash_map_t exports = hashMap_create(NULL, NULL, NULL, NULL);
 
 	hashMap_put(manager->exportedServices, reference, exports);
 
 	if (arrayList_size(manager->rsaList) == 0) {
 		char *symbolicName = NULL;
-		MODULE module = NULL;
-		BUNDLE bundle = NULL;
+		module_t module = NULL;
+		bundle_t bundle = NULL;
 		serviceReference_getBundle(reference, &bundle);
 		status = bundle_getCurrentModule(bundle, &module);
 		if (status == CELIX_SUCCESS) {
@@ -196,7 +196,7 @@ celix_status_t topologyManager_exportSer
 		for (iter = 0; iter < size; iter++) {
 			remote_service_admin_service_t rsa = arrayList_get(manager->rsaList, iter);
 
-			ARRAY_LIST endpoints = NULL;
+			array_list_t endpoints = NULL;
 			status = rsa->exportService(rsa->admin, reference, NULL, &endpoints);
 			if (status == CELIX_SUCCESS) {
 				hashMap_put(exports, rsa, endpoints);
@@ -208,19 +208,19 @@ celix_status_t topologyManager_exportSer
 	return status;
 }
 
-celix_status_t topologyManager_notifyListeners(topology_manager_t manager, remote_service_admin_service_t rsa,  ARRAY_LIST registrations) {
+celix_status_t topologyManager_notifyListeners(topology_manager_t manager, remote_service_admin_service_t rsa,  array_list_t registrations) {
 	celix_status_t status = CELIX_SUCCESS;
-	ARRAY_LIST endpointListeners = NULL;
+	array_list_t endpointListeners = NULL;
 
 	status = bundleContext_getServiceReferences(manager->context, endpoint_listener_service, NULL, &endpointListeners);
 	if (status == CELIX_SUCCESS) {
 		if (endpointListeners != NULL) {
 			int eplIt;
 			for (eplIt = 0; eplIt < arrayList_size(endpointListeners); eplIt++) {
-				SERVICE_REFERENCE eplRef = arrayList_get(endpointListeners, eplIt);
-				SERVICE_REGISTRATION registration = NULL;
+				service_reference_t eplRef = arrayList_get(endpointListeners, eplIt);
+				service_registration_t registration = NULL;
 				serviceReference_getServiceRegistration(eplRef, &registration);
-				PROPERTIES props = NULL;
+				properties_t props = NULL;
 				serviceRegistration_getProperties(registration, &props);
 				char *scope = properties_get(props, (char *) ENDPOINT_LISTENER_SCOPE);
 				filter_t filter = filter_create(scope, manager->pool);
@@ -254,7 +254,7 @@ celix_status_t topologyManager_notifyLis
 
 celix_status_t topologyManager_importService(topology_manager_t manager, endpoint_description_t endpoint) {
 	celix_status_t status = CELIX_SUCCESS;
-	HASH_MAP imports = hashMap_create(NULL, NULL, NULL, NULL);
+	hash_map_t imports = hashMap_create(NULL, NULL, NULL, NULL);
 
 	hashMap_put(manager->importedServices, endpoint, imports);
 
@@ -277,24 +277,24 @@ celix_status_t topologyManager_importSer
 	return status;
 }
 
-celix_status_t topologyManager_removeService(topology_manager_t manager, SERVICE_REFERENCE reference) {
+celix_status_t topologyManager_removeService(topology_manager_t manager, service_reference_t reference) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	SERVICE_REGISTRATION registration = NULL;
+	service_registration_t registration = NULL;
 	serviceReference_getServiceRegistration(reference, &registration);
-	PROPERTIES props = NULL;
+	properties_t props = NULL;
 	serviceRegistration_getProperties(registration, &props);
 	char *name = properties_get(props, (char *) OBJECTCLASS);
 
 	printf("TOPOLOGY_MANAGER: Remove Service: %s.\n", name);
 
 	if (hashMap_containsKey(manager->exportedServices, reference)) {
-		HASH_MAP exports = hashMap_get(manager->exportedServices, reference);
-		HASH_MAP_ITERATOR iter = hashMapIterator_create(exports);
+		hash_map_t exports = hashMap_get(manager->exportedServices, reference);
+		hash_map_iterator_t iter = hashMapIterator_create(exports);
 		while (hashMapIterator_hasNext(iter)) {
-			HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
+			hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
 			remote_service_admin_service_t rsa = hashMapEntry_getKey(entry);
-			ARRAY_LIST exports = hashMapEntry_getValue(entry);
+			array_list_t exports = hashMapEntry_getValue(entry);
 			int exportsIter = 0;
 			for (exportsIter = 0; exportsIter < arrayList_size(exports); exportsIter++) {
 				export_registration_t export = arrayList_get(exports, exportsIter);
@@ -310,14 +310,14 @@ celix_status_t topologyManager_removeSer
 
 celix_status_t topologyManager_notifyListenersOfRemoval(topology_manager_t manager, remote_service_admin_service_t rsa,  export_registration_t export) {
 	celix_status_t status = CELIX_SUCCESS;
-	ARRAY_LIST endpointListeners = NULL;
+	array_list_t endpointListeners = NULL;
 
 	status = bundleContext_getServiceReferences(manager->context, endpoint_listener_service, NULL, &endpointListeners);
 	if (status == CELIX_SUCCESS) {
 		if (endpointListeners != NULL) {
 			int eplIt;
 			for (eplIt = 0; eplIt < arrayList_size(endpointListeners); eplIt++) {
-				SERVICE_REFERENCE eplRef = arrayList_get(endpointListeners, eplIt);
+				service_reference_t eplRef = arrayList_get(endpointListeners, eplIt);
 				endpoint_listener_t epl = NULL;
 				status = bundleContext_getService(manager->context, eplRef, (void **) &epl);
 				if (status == CELIX_SUCCESS) {
@@ -350,7 +350,7 @@ celix_status_t topologyManager_extendFil
 	return status;
 }
 
-celix_status_t topologyManager_listenerAdded(void *handle, ARRAY_LIST listeners) {
+celix_status_t topologyManager_listenerAdded(void *handle, array_list_t listeners) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	topology_manager_t manager = handle;
@@ -359,7 +359,7 @@ celix_status_t topologyManager_listenerA
 		listener_hook_info_t info = arrayList_get(listeners, i);
 		printf("TOPOLOGY_MANAGER: listener with filter \"%s\" added\n", info->filter);
 
-		BUNDLE bundle, self;
+		bundle_t bundle, self;
 		bundleContext_getBundle(info->context, &bundle);
 		bundleContext_getBundle(manager->context, &self);
 		if (bundle == self) {
@@ -387,7 +387,7 @@ celix_status_t topologyManager_listenerA
 	return status;
 }
 
-celix_status_t topologyManager_listenerRemoved(void *handle, ARRAY_LIST listeners) {
+celix_status_t topologyManager_listenerRemoved(void *handle, array_list_t listeners) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	topology_manager_t manager = handle;

Modified: incubator/celix/trunk/shell/private/include/shell_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/shell_private.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/shell_private.h (original)
+++ incubator/celix/trunk/shell/private/include/shell_private.h Wed Dec  5 09:05:46 2012
@@ -34,14 +34,14 @@
 struct shell {
 	apr_pool_t *pool;
 	bundle_context_t bundleContext;
-	HASH_MAP commandReferenceMap;
-	HASH_MAP commandNameMap;
+	hash_map_t commandReferenceMap;
+	hash_map_t commandNameMap;
 };
 
 SHELL shell_create();
 char * shell_getCommandUsage(SHELL shell, char * commandName);
 char * shell_getCommandDescription(SHELL shell, char * commandName);
-SERVICE_REFERENCE shell_getCommandReference(SHELL shell, char * command);
+service_reference_t shell_getCommandReference(SHELL shell, char * command);
 void shell_executeCommand(SHELL shell, char * commandLine, void (*out)(char *), void (*error)(char *));
 
 COMMAND shell_getCommand(SHELL shell, char * commandName);

Modified: incubator/celix/trunk/shell/private/src/inspect_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/inspect_command.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/inspect_command.c (original)
+++ incubator/celix/trunk/shell/private/src/inspect_command.c Wed Dec  5 09:05:46 2012
@@ -38,11 +38,11 @@
 #include "service_reference.h"
 
 #define SERVICE_TYPE "service"
-#define CAPABILITY "capability"
+#define capability_t "capability"
 #define REQUIREMENT "requirement"
 
 void inspectCommand_execute(COMMAND command, char * commandline, void (*out)(char *), void (*err)(char *));
-celix_status_t inspectCommand_printExportedServices(COMMAND command, ARRAY_LIST ids, void (*out)(char *), void (*err)(char *));
+celix_status_t inspectCommand_printExportedServices(COMMAND command, array_list_t ids, void (*out)(char *), void (*err)(char *));
 
 COMMAND inspectCommand_create(bundle_context_t context) {
 	COMMAND command = (COMMAND) malloc(sizeof(*command));
@@ -67,7 +67,7 @@ void inspectCommand_execute(COMMAND comm
 		char *direction = apr_strtok(NULL, " ", &token);
 		if (direction != NULL) {
 			apr_pool_t *pool = NULL;
-			ARRAY_LIST ids = NULL;
+			array_list_t ids = NULL;
 			char *id = apr_strtok(NULL, " ", &token);
 
 			bundleContext_getMemoryPool(command->bundleContext, &pool);
@@ -78,7 +78,7 @@ void inspectCommand_execute(COMMAND comm
 			}
 
 			if (strcmp(type, SERVICE_TYPE) == 0) {
-				if (strcmp(direction, CAPABILITY) == 0) {
+				if (strcmp(direction, capability_t) == 0) {
 					status = inspectCommand_printExportedServices(command, ids, out, err);
 					if (status != CELIX_SUCCESS) {
 						out("INSPECT: Error\n");
@@ -97,9 +97,9 @@ void inspectCommand_execute(COMMAND comm
 	}
 }
 
-celix_status_t inspectCommand_printExportedServices(COMMAND command, ARRAY_LIST ids, void (*out)(char *), void (*err)(char *)) {
+celix_status_t inspectCommand_printExportedServices(COMMAND command, array_list_t ids, void (*out)(char *), void (*err)(char *)) {
 	celix_status_t status = CELIX_SUCCESS;
-	ARRAY_LIST bundles = NULL;
+	array_list_t bundles = NULL;
 
 	if (arrayList_isEmpty(ids)) {
 		celix_status_t status = bundleContext_getBundles(command->bundleContext, &bundles);
@@ -112,7 +112,7 @@ celix_status_t inspectCommand_printExpor
 		for (i = 0; i < arrayList_size(ids); i++) {
 			char *idStr = (char *) arrayList_get(ids, i);
 			long id = atol(idStr);
-			BUNDLE b = NULL;
+			bundle_t b = NULL;
 			celix_status_t st = bundleContext_getBundleById(command->bundleContext, id, &b);
 			if (st == CELIX_SUCCESS) {
 				arrayList_add(bundles, b);
@@ -127,7 +127,7 @@ celix_status_t inspectCommand_printExpor
 	if (status == CELIX_SUCCESS) {
 		unsigned int i = 0;
 		for (i = 0; i < arrayList_size(bundles); i++) {
-			BUNDLE bundle = (BUNDLE) arrayList_get(bundles, i);
+			bundle_t bundle = (bundle_t) arrayList_get(bundles, i);
 
 			if (i > 0) {
 				out("\n");
@@ -135,12 +135,12 @@ celix_status_t inspectCommand_printExpor
 
 			if (bundle != NULL) {
 				apr_pool_t *pool;
-				ARRAY_LIST refs = NULL;
+				array_list_t refs = NULL;
 
 				bundleContext_getMemoryPool(command->bundleContext, &pool);
 				if (bundle_getRegisteredServices(bundle, pool, &refs) == CELIX_SUCCESS) {
 					char line[256];
-					MODULE module = NULL;
+					module_t module = NULL;
 					char * name = NULL;
 					status = bundle_getCurrentModule(bundle, &module);
 					if (status == CELIX_SUCCESS) {
@@ -155,9 +155,9 @@ celix_status_t inspectCommand_printExpor
 							} else {
 								unsigned int j = 0;
 								for (j = 0; j < arrayList_size(refs); j++) {
-									SERVICE_REFERENCE ref = (SERVICE_REFERENCE) arrayList_get(refs, j);
-									SERVICE_REGISTRATION reg = NULL;
-									PROPERTIES props = NULL;
+									service_reference_t ref = (service_reference_t) arrayList_get(refs, j);
+									service_registration_t reg = NULL;
+									properties_t props = NULL;
 									char line[256];
 									char *objectClass = NULL;
 

Modified: incubator/celix/trunk/shell/private/src/install_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/install_command.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/install_command.c (original)
+++ incubator/celix/trunk/shell/private/src/install_command.c Wed Dec  5 09:05:46 2012
@@ -34,7 +34,7 @@
 #include "install_command.h"
 
 void installCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
-void installCommand_install(COMMAND command, BUNDLE *bundle, char * location, void (*out)(char *), void (*err)(char *));
+void installCommand_install(COMMAND command, bundle_t *bundle, char * location, void (*out)(char *), void (*err)(char *));
 
 COMMAND installCommand_create(bundle_context_t context) {
 	COMMAND command = (COMMAND) malloc(sizeof(*command));
@@ -61,7 +61,7 @@ void installCommand_execute(COMMAND comm
 	
 	info[0] = '\0';
 	while (sub != NULL) {
-		BUNDLE bundle = NULL;
+		bundle_t bundle = NULL;
 		installCommand_install(command, &bundle, strdup(sub), out, err);
 		if (bundle != NULL) {
 			long id;
@@ -89,6 +89,6 @@ void installCommand_execute(COMMAND comm
 	}
 }
 
-void installCommand_install(COMMAND command, BUNDLE *bundle, char * location, void (*out)(char *), void (*err)(char *)) {
+void installCommand_install(COMMAND command, bundle_t *bundle, char * location, void (*out)(char *), void (*err)(char *)) {
 	bundleContext_installBundle(command->bundleContext, location, bundle);
 }

Modified: incubator/celix/trunk/shell/private/src/log_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/log_command.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/log_command.c (original)
+++ incubator/celix/trunk/shell/private/src/log_command.c Wed Dec  5 09:05:46 2012
@@ -50,16 +50,16 @@ void logCommand_destroy(COMMAND command)
 }
 
 void logCommand_execute(COMMAND command, char *line, void (*out)(char *), void (*err)(char *)) {
-    SERVICE_REFERENCE readerService = NULL;
-    SERVICE_REFERENCE logService = NULL;
+    service_reference_t readerService = NULL;
+    service_reference_t logService = NULL;
     apr_pool_t *memory_pool = NULL;
     apr_pool_t *bundle_memory_pool = NULL;
 
     bundleContext_getServiceReference(command->bundleContext, (char *) LOG_READER_SERVICE_NAME, &readerService);
     if (readerService != NULL) {
         char line[256];
-        LINKED_LIST list = NULL;
-        LINKED_LIST_ITERATOR iter = NULL;
+        linked_list_t list = NULL;
+        linked_list_iterator_t iter = NULL;
         log_reader_service_t reader = NULL;
 
         bundleContext_getMemoryPool(command->bundleContext, &bundle_memory_pool);

Modified: incubator/celix/trunk/shell/private/src/ps_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/ps_command.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/ps_command.c (original)
+++ incubator/celix/trunk/shell/private/src/ps_command.c Wed Dec  5 09:05:46 2012
@@ -32,7 +32,7 @@
 #include "module.h"
 #include "bundle.h"
 
-char * psCommand_stateString(BUNDLE_STATE state);
+char * psCommand_stateString(bundle_state_e state);
 void psCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
 
 COMMAND psCommand_create(bundle_context_t context) {
@@ -50,7 +50,7 @@ void psCommand_destroy(COMMAND command) 
 }
 
 void psCommand_execute(COMMAND command, char * commandline, void (*out)(char *), void (*err)(char *)) {
-	ARRAY_LIST bundles = NULL;
+	array_list_t bundles = NULL;
 	celix_status_t status = bundleContext_getBundles(command->bundleContext, &bundles);
 
 	if (status == CELIX_SUCCESS) {
@@ -82,12 +82,12 @@ void psCommand_execute(COMMAND command, 
 		sprintf(line, "  %-5s %-12s %s\n", "ID", "State", msg);
 		out(line);
 		for (i = 0; i < arrayList_size(bundles); i++) {
-			BUNDLE bundle = (BUNDLE) arrayList_get(bundles, i);
+			bundle_t bundle = (bundle_t) arrayList_get(bundles, i);
 			bundle_archive_t archive = NULL;
 			long id;
-			BUNDLE_STATE state;
+			bundle_state_e state;
 			char * stateString = NULL;
-			MODULE module = NULL;
+			module_t module = NULL;
 			char * name = NULL;
 
 			bundle_getArchive(bundle, &archive);
@@ -111,7 +111,7 @@ void psCommand_execute(COMMAND command, 
 	}
 }
 
-char * psCommand_stateString(BUNDLE_STATE state) {
+char * psCommand_stateString(bundle_state_e state) {
 	switch (state) {
 		case BUNDLE_ACTIVE:
 			return "Active      ";

Modified: incubator/celix/trunk/shell/private/src/shell.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/shell.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/shell.c (original)
+++ incubator/celix/trunk/shell/private/src/shell.c Wed Dec  5 09:05:46 2012
@@ -47,31 +47,31 @@
 struct shellServiceActivator {
 	SHELL shell;
 	SHELL_SERVICE shellService;
-	SERVICE_REGISTRATION registration;
-	SERVICE_LISTENER listener;
+	service_registration_t registration;
+	service_listener_t listener;
 
-	SERVICE_REGISTRATION psCommand;
+	service_registration_t psCommand;
 	COMMAND psCmd;
 
-	SERVICE_REGISTRATION startCommand;
+	service_registration_t startCommand;
 	COMMAND startCmd;
 
-	SERVICE_REGISTRATION stopCommand;
+	service_registration_t stopCommand;
 	COMMAND stopCmd;
 
-	SERVICE_REGISTRATION installCommand;
+	service_registration_t installCommand;
 	COMMAND installCmd;
 
-	SERVICE_REGISTRATION uninstallCommand;
+	service_registration_t uninstallCommand;
     COMMAND uninstallCmd;
 
-	SERVICE_REGISTRATION updateCommand;
+	service_registration_t updateCommand;
 	COMMAND updateCmd;
 
-	SERVICE_REGISTRATION logCommand;
+	service_registration_t logCommand;
     COMMAND logCmd;
 
-    SERVICE_REGISTRATION inspectCommand;
+    service_registration_t inspectCommand;
 	COMMAND inspectCmd;
 };
 
@@ -89,9 +89,9 @@ void shell_destroy(SHELL shell) {
 	free(shell);
 }
 
-ARRAY_LIST shell_getCommands(SHELL shell) {
-	ARRAY_LIST commands = NULL;
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(shell->commandNameMap);
+array_list_t shell_getCommands(SHELL shell) {
+	array_list_t commands = NULL;
+	hash_map_iterator_t iter = hashMapIterator_create(shell->commandNameMap);
 
 	arrayList_create(shell->pool, &commands);
 	while (hashMapIterator_hasNext(iter)) {
@@ -111,13 +111,13 @@ char * shell_getCommandDescription(SHELL
 	return (command == NULL) ? NULL : command->shortDescription;
 }
 
-SERVICE_REFERENCE shell_getCommandReference(SHELL shell, char * command) {
-	HASH_MAP_ITERATOR iter = hashMapIterator_create(shell->commandReferenceMap);
+service_reference_t shell_getCommandReference(SHELL shell, char * command) {
+	hash_map_iterator_t iter = hashMapIterator_create(shell->commandReferenceMap);
 	while (hashMapIterator_hasNext(iter)) {
-		HASH_MAP_ENTRY entry = hashMapIterator_nextEntry(iter);
+		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
 		COMMAND cmd = (COMMAND) hashMapEntry_getValue(entry);
 		if (strcmp(cmd->name, command) == 0) {
-			return (SERVICE_REFERENCE) hashMapEntry_getValue(entry);
+			return (service_reference_t) hashMapEntry_getValue(entry);
 		}
 	}
 	return NULL;
@@ -140,7 +140,7 @@ COMMAND shell_getCommand(SHELL shell, ch
 	return (command == NULL) ? NULL : command;
 }
 
-void shell_addCommand(SHELL shell, SERVICE_REFERENCE reference) {
+void shell_addCommand(SHELL shell, service_reference_t reference) {
     COMMAND command = NULL;
 	void *cmd = NULL;
 	bundleContext_getService(shell->bundleContext, reference, &cmd);
@@ -149,14 +149,14 @@ void shell_addCommand(SHELL shell, SERVI
 	hashMap_put(shell->commandReferenceMap, reference, command);
 }
 
-void shell_removeCommand(SHELL shell, SERVICE_REFERENCE reference) {
+void shell_removeCommand(SHELL shell, service_reference_t reference) {
 	COMMAND command = (COMMAND) hashMap_remove(shell->commandReferenceMap, reference);
 	if (command != NULL) {
 		hashMap_remove(shell->commandNameMap, command->name);
 	}
 }
 
-void shell_serviceChanged(SERVICE_LISTENER listener, SERVICE_EVENT event) {
+void shell_serviceChanged(service_listener_t listener, service_event_t event) {
 	SHELL shell = (SHELL) listener->handle;
 	if (event->type == SERVICE_EVENT_REGISTERED) {
 		shell_addCommand(shell, event->reference);
@@ -206,7 +206,7 @@ celix_status_t bundleActivator_start(voi
 
 	bundleContext_getMemoryPool(context, &pool);
 	if (status == CELIX_SUCCESS) {
-	    SERVICE_LISTENER listener = (SERVICE_LISTENER) malloc(sizeof(*listener));
+	    service_listener_t listener = (service_listener_t) malloc(sizeof(*listener));
 	    activator->listener = listener;
 	    listener->pool = pool;
 	    listener->handle = activator->shell;

Modified: incubator/celix/trunk/shell/private/src/start_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/start_command.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/start_command.c (original)
+++ incubator/celix/trunk/shell/private/src/start_command.c Wed Dec  5 09:05:46 2012
@@ -55,7 +55,7 @@ void startCommand_execute(COMMAND comman
 	sub = strtok(NULL, delims);
 	while (sub != NULL) {
 		long id = atol(sub);
-        BUNDLE bundle = NULL;
+        bundle_t bundle = NULL;
 		bundleContext_getBundleById(command->bundleContext, id, &bundle);
 		if (bundle != NULL) {
 			bundle_start(bundle, 0);

Modified: incubator/celix/trunk/shell/private/src/stop_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/stop_command.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/stop_command.c (original)
+++ incubator/celix/trunk/shell/private/src/stop_command.c Wed Dec  5 09:05:46 2012
@@ -58,7 +58,7 @@ void stopCommand_execute(COMMAND command
 		utils_isNumeric(sub, &numeric);
 		if (numeric) {
 			long id = atol(sub);
-			BUNDLE bundle = NULL;
+			bundle_t bundle = NULL;
 			bundleContext_getBundleById(command->bundleContext, id, &bundle);
 			if (bundle != NULL) {
 				bundle_stop(bundle, 0);

Modified: incubator/celix/trunk/shell/private/src/uninstall_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/uninstall_command.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/uninstall_command.c (original)
+++ incubator/celix/trunk/shell/private/src/uninstall_command.c Wed Dec  5 09:05:46 2012
@@ -56,7 +56,7 @@ void uninstallCommand_execute(COMMAND co
 	sub = strtok(NULL, delims);
 	while (sub != NULL) {
 		long id = atol(sub);
-		BUNDLE bundle = NULL;
+		bundle_t bundle = NULL;
 		bundleContext_getBundleById(command->bundleContext, id, &bundle);
 		if (bundle != NULL) {
 		    bundle_uninstall(bundle);

Modified: incubator/celix/trunk/shell/private/src/update_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/update_command.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/update_command.c (original)
+++ incubator/celix/trunk/shell/private/src/update_command.c Wed Dec  5 09:05:46 2012
@@ -55,7 +55,7 @@ void updateCommand_destroy(COMMAND comma
 
 
 void updateCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *)) {
-    BUNDLE bundle = NULL;
+    bundle_t bundle = NULL;
 	char delims[] = " ";
 	char * sub = NULL;
 	sub = strtok(line, delims);

Modified: incubator/celix/trunk/shell/public/include/shell.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/public/include/shell.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell/public/include/shell.h (original)
+++ incubator/celix/trunk/shell/public/include/shell.h Wed Dec  5 09:05:46 2012
@@ -36,10 +36,10 @@ typedef struct shell * SHELL;
 
 struct shellService {
 	SHELL shell;
-	ARRAY_LIST (*getCommands)(SHELL shell);
+	array_list_t (*getCommands)(SHELL shell);
 	char * (*getCommandUsage)(SHELL shell, char * commandName);
 	char * (*getCommandDescription)(SHELL shell, char * commandName);
-	SERVICE_REFERENCE (*getCommandReference)(SHELL shell, char * command);
+	service_reference_t (*getCommandReference)(SHELL shell, char * command);
 	void (*executeCommand)(SHELL shell, char * commandLine, void (*out)(char *), void (*error)(char *));
 };
 

Modified: incubator/celix/trunk/shell_tui/private/src/shell_tui.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell_tui/private/src/shell_tui.c?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/private/src/shell_tui.c (original)
+++ incubator/celix/trunk/shell_tui/private/src/shell_tui.c Wed Dec  5 09:05:46 2012
@@ -35,7 +35,7 @@
 struct shellTuiActivator {
 	bundle_context_t context;
 	SHELL_SERVICE shell;
-	SERVICE_REFERENCE reference;
+	service_reference_t reference;
 	struct serviceListener * listener;
 	bool running;
 	apr_thread_t *runnable;
@@ -87,7 +87,7 @@ void shellTui_initializeService(SHELL_TU
 	}
 }
 
-void shellTui_serviceChanged(SERVICE_LISTENER listener, SERVICE_EVENT event) {
+void shellTui_serviceChanged(service_listener_t listener, service_event_t event) {
 	bool result = NULL;
     SHELL_TUI_ACTIVATOR act = (SHELL_TUI_ACTIVATOR) listener->handle;
 
@@ -117,7 +117,7 @@ celix_status_t bundleActivator_start(voi
 	apr_pool_t *pool = NULL;
 
 	SHELL_TUI_ACTIVATOR act = (SHELL_TUI_ACTIVATOR) userData;
-	SERVICE_LISTENER listener = (SERVICE_LISTENER) malloc(sizeof(*listener));
+	service_listener_t listener = (service_listener_t) malloc(sizeof(*listener));
 
 	act->context = context;
 	act->running = true;

Modified: incubator/celix/trunk/utils/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/CMakeLists.txt?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/utils/CMakeLists.txt (original)
+++ incubator/celix/trunk/utils/CMakeLists.txt Wed Dec  5 09:05:46 2012
@@ -50,24 +50,24 @@ if (UTILS) 
     FILE(GLOB files "public/include/*.h")
     INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
     
-    #include_directories(${CUNIT_INCLUDE_DIRS})
-    #include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-    #include_directories("${PROJECT_SOURCE_DIR}/utils/private/include")
-    
-    #add_executable(hash_map_test private/test/hash_map_test.c)
-    #target_link_libraries(hash_map_test celix_utils ${CUNIT_LIBRARIES})
-    
-    #add_executable(hash_map_test_hash private/test/hash_map_test_hash.c)
-    #target_link_libraries(hash_map_test_hash celix_utils ${CUNIT_LIBRARIES})
-    
-    #add_executable(array_list_test private/test/array_list_test.c)
-    #target_link_libraries(array_list_test celix_utils ${CUNIT_LIBRARIES})
-    
-    #add_executable(linked_list_test private/test/linked_list_test.c)
-    #target_link_libraries(linked_list_test celix_utils ${CUNIT_LIBRARIES})
-    
-    #run_test(array_list_test)
-    #run_test(hash_map_test)
-    #run_test(hash_map_test_hash)
-    #run_test(linked_list_test)
-endif (UTILS)
\ No newline at end of file
+    include_directories(${CUNIT_INCLUDE_DIRS})
+    include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+    include_directories("${PROJECT_SOURCE_DIR}/utils/private/include")
+    
+    add_executable(hash_map_test private/test/hash_map_test.c)
+    target_link_libraries(hash_map_test celix_utils ${CUNIT_LIBRARIES})
+    
+    add_executable(hash_map_test_hash private/test/hash_map_test_hash.c)
+    target_link_libraries(hash_map_test_hash celix_utils ${CUNIT_LIBRARIES})
+    
+    add_executable(array_list_test private/test/array_list_test.c)
+    target_link_libraries(array_list_test celix_utils ${CUNIT_LIBRARIES})
+    
+    add_executable(linked_list_test private/test/linked_list_test.c)
+    target_link_libraries(linked_list_test celix_utils ${CUNIT_LIBRARIES})
+    
+    run_test(array_list_test)
+    run_test(hash_map_test)
+    run_test(hash_map_test_hash)
+    run_test(linked_list_test)
+endif (UTILS)

Modified: incubator/celix/trunk/utils/private/include/array_list_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/include/array_list_private.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/include/array_list_private.h (original)
+++ incubator/celix/trunk/utils/private/include/array_list_private.h Wed Dec  5 09:05:46 2012
@@ -24,8 +24,8 @@
  *  \copyright	Apache License, Version 2.0
  */
 
-#ifndef ARRAY_LIST_PRIVATE_H_
-#define ARRAY_LIST_PRIVATE_H_
+#ifndef array_list_t_PRIVATE_H_
+#define array_list_t_PRIVATE_H_
 
 #include "array_list.h"
 
@@ -35,16 +35,18 @@ struct arrayList {
 	unsigned int capacity;
 
 	unsigned int modCount;
+
+	arrayListElementEqualsFunction equals;
 };
 
 struct arrayListIterator {
-	ARRAY_LIST list;
+	array_list_t list;
 	unsigned int cursor;
 	int lastReturned;
 	unsigned int expectedModificationCount;
 };
 
-void * arrayList_remove(ARRAY_LIST list, unsigned int index);
+void * arrayList_remove(array_list_t list, unsigned int index);
 
 
-#endif /* ARRAY_LIST_PRIVATE_H_ */
+#endif /* array_list_t_PRIVATE_H_ */

Modified: incubator/celix/trunk/utils/private/include/hash_map_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/include/hash_map_private.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/include/hash_map_private.h (original)
+++ incubator/celix/trunk/utils/private/include/hash_map_private.h Wed Dec  5 09:05:46 2012
@@ -33,20 +33,20 @@
 UTILS_EXPORT unsigned int hashMap_hashCode(void * toHash);
 UTILS_EXPORT int hashMap_equals(void * toCompare, void * compare);
 
-void hashMap_resize(HASH_MAP map, int newCapacity);
-void * hashMap_removeEntryForKey(HASH_MAP map, void * key);
-UTILS_EXPORT HASH_MAP_ENTRY hashMap_removeMapping(HASH_MAP map, HASH_MAP_ENTRY entry);
-void hashMap_addEntry(HASH_MAP map, int hash, void * key, void * value, int bucketIndex);
+void hashMap_resize(hash_map_t map, int newCapacity);
+void * hashMap_removeEntryForKey(hash_map_t map, void * key);
+UTILS_EXPORT hash_map_entry_t hashMap_removeMapping(hash_map_t map, hash_map_entry_t entry);
+void hashMap_addEntry(hash_map_t map, int hash, void * key, void * value, int bucketIndex);
 
 struct hashMapEntry {
 	void * key;
 	void * value;
-	HASH_MAP_ENTRY next;
+	hash_map_entry_t next;
 	unsigned int hash;
 };
 
 struct hashMap {
-	HASH_MAP_ENTRY * table;
+	hash_map_entry_t * table;
 	unsigned int size;
 	unsigned int treshold;
 	unsigned int modificationCount;
@@ -59,23 +59,23 @@ struct hashMap {
 };
 
 struct hashMapIterator {
-	HASH_MAP map;
-	HASH_MAP_ENTRY next;
-	HASH_MAP_ENTRY current;
+	hash_map_t map;
+	hash_map_entry_t next;
+	hash_map_entry_t current;
 	int expectedModCount;
 	int index;
 };
 
 struct hashMapKeySet {
-	HASH_MAP map;
+	hash_map_t map;
 };
 
 struct hashMapValues {
-	HASH_MAP map;
+	hash_map_t map;
 };
 
 struct hashMapEntrySet {
-	HASH_MAP map;
+	hash_map_t map;
 };
 
 

Modified: incubator/celix/trunk/utils/private/include/linked_list_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/include/linked_list_private.h?rev=1417320&r1=1417319&r2=1417320&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/include/linked_list_private.h (original)
+++ incubator/celix/trunk/utils/private/include/linked_list_private.h Wed Dec  5 09:05:46 2012
@@ -38,7 +38,7 @@ struct linkedListEntry {
 
 struct linkedList {
     apr_pool_t *memory_pool;
-	LINKED_LIST_ENTRY header;
+	linked_list_entry_t header;
 	size_t size;
 	int modificationCount;
 };



Mime
View raw message