incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1413494 [3/3] - 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 Mon, 26 Nov 2012 07:48:02 GMT
Modified: incubator/celix/trunk/framework/private/src/service_registry.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_registry.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_registry.c (original)
+++ incubator/celix/trunk/framework/private/src/service_registry.c Mon Nov 26 07:47:47 2012
@@ -312,7 +312,7 @@ celix_status_t serviceRegistry_createSer
 	return status;
 }
 
-celix_status_t serviceRegistry_getServiceReferences(SERVICE_REGISTRY registry, apr_pool_t *pool, const char *serviceName, FILTER filter, ARRAY_LIST *references) {
+celix_status_t serviceRegistry_getServiceReferences(SERVICE_REGISTRY registry, apr_pool_t *pool, const char *serviceName, filter_t filter, ARRAY_LIST *references) {
 	celix_status_t status = CELIX_SUCCESS;
 	HASH_MAP_VALUES registrations;
 	HASH_MAP_ITERATOR iterator;
@@ -330,12 +330,20 @@ celix_status_t serviceRegistry_getServic
 			status = serviceRegistration_getProperties(registration, &props);
 			if (status == CELIX_SUCCESS) {
 				bool matched = false;
-				if ((serviceName == NULL) && ((filter == NULL) || filter_match(filter, props))) {
+				bool matchResult = false;
+				if (filter != NULL) {
+					filter_match(filter, props, &matchResult);
+				}
+				if ((serviceName == NULL) && ((filter == NULL) || matchResult)) {
 					matched = true;
 				} else if (serviceName != NULL) {
 					char *className = NULL;
+					bool matchResult = false;
 					serviceRegistration_getServiceName(registration, &className);
-					if ((strcmp(className, serviceName) == 0) && ((filter == NULL) || filter_match(filter, props))) {
+					if (filter != NULL) {
+						filter_match(filter, props, &matchResult);
+					}
+					if ((strcmp(className, serviceName) == 0) && ((filter == NULL) || matchResult)) {
 						matched = true;
 					}
 				}

Modified: incubator/celix/trunk/framework/private/src/service_tracker.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_tracker.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_tracker.c (original)
+++ incubator/celix/trunk/framework/private/src/service_tracker.c Mon Nov 26 07:47:47 2012
@@ -35,7 +35,7 @@
 #include "service_reference.h"
 
 struct serviceTracker {
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	char * filter;
 
 	apr_pool_t *pool;
@@ -57,7 +57,7 @@ static void * serviceTracker_addingServi
 static celix_status_t serviceTracker_track(service_tracker_t tracker, SERVICE_REFERENCE reference, SERVICE_EVENT event);
 static celix_status_t serviceTracker_untrack(service_tracker_t tracker, SERVICE_REFERENCE reference, SERVICE_EVENT event);
 
-celix_status_t serviceTracker_create(apr_pool_t *pool, BUNDLE_CONTEXT context, char * service, service_tracker_customizer_t customizer, service_tracker_t *tracker) {
+celix_status_t serviceTracker_create(apr_pool_t *pool, bundle_context_t context, char * service, service_tracker_customizer_t customizer, service_tracker_t *tracker) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (service == NULL || *tracker != NULL) {
@@ -78,7 +78,7 @@ celix_status_t serviceTracker_create(apr
 	return status;
 }
 
-celix_status_t serviceTracker_createWithFilter(apr_pool_t *pool, BUNDLE_CONTEXT context, char * filter, service_tracker_customizer_t customizer, service_tracker_t *tracker) {
+celix_status_t serviceTracker_createWithFilter(apr_pool_t *pool, bundle_context_t context, char * filter, service_tracker_customizer_t customizer, service_tracker_t *tracker) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*tracker = (service_tracker_t) apr_palloc(pool, sizeof(**tracker));
@@ -327,7 +327,11 @@ celix_status_t serviceTracker_untrack(se
 					serviceTrackerCustomizer_getHandle(tracker->customizer, &handle);
 					serviceTrackerCustomizer_getRemovedFunction(tracker->customizer, &function);
 
-					function(handle, reference, tracked->service);
+					if (function != NULL) {
+						status = function(handle, reference, tracked->service);
+					} else {
+						status = bundleContext_ungetService(tracker->tracker->context, reference, &result);
+					}
 				} else {
 					status = bundleContext_ungetService(tracker->tracker->context, reference, &result);
 				}

Modified: incubator/celix/trunk/framework/public/include/bundle.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle.h Mon Nov 26 07:47:47 2012
@@ -40,11 +40,11 @@ typedef struct bundle * BUNDLE;
 #include "bundle_context.h"
 
 celix_status_t bundle_create(BUNDLE * bundle, apr_pool_t *mp);
-celix_status_t bundle_createFromArchive(BUNDLE * bundle, FRAMEWORK framework, BUNDLE_ARCHIVE archive, apr_pool_t *bundlePool);
+celix_status_t bundle_createFromArchive(BUNDLE * bundle, FRAMEWORK framework, bundle_archive_t archive, apr_pool_t *bundlePool);
 celix_status_t bundle_destroy(BUNDLE bundle);
 
 celix_status_t bundle_isSystemBundle(BUNDLE bundle, bool *systemBundle);
-celix_status_t bundle_getArchive(BUNDLE bundle, BUNDLE_ARCHIVE *archive);
+celix_status_t bundle_getArchive(BUNDLE bundle, bundle_archive_t *archive);
 celix_status_t bundle_getCurrentModule(BUNDLE bundle, MODULE *module);
 ARRAY_LIST bundle_getModules(BUNDLE bundle);
 void * bundle_getHandle(BUNDLE bundle);
@@ -53,8 +53,8 @@ ACTIVATOR bundle_getActivator(BUNDLE bun
 celix_status_t bundle_setActivator(BUNDLE bundle, ACTIVATOR activator);
 celix_status_t bundle_getManifest(BUNDLE bundle, MANIFEST *manifest);
 celix_status_t bundle_setManifest(BUNDLE bundle, MANIFEST manifest);
-celix_status_t bundle_getContext(BUNDLE bundle, BUNDLE_CONTEXT *context);
-celix_status_t bundle_setContext(BUNDLE bundle, BUNDLE_CONTEXT context);
+celix_status_t bundle_getContext(BUNDLE bundle, bundle_context_t *context);
+celix_status_t bundle_setContext(BUNDLE bundle, bundle_context_t context);
 celix_status_t bundle_getEntry(BUNDLE bundle, char * name, apr_pool_t *pool, char **entry);
 
 celix_status_t bundle_start(BUNDLE bundle, int options);

Modified: incubator/celix/trunk/framework/public/include/bundle_activator.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle_activator.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle_activator.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle_activator.h Mon Nov 26 07:47:47 2012
@@ -53,7 +53,7 @@
  * 		- Any other status code will mark the bundle as stopped and the framework will remove this
  * 		  bundle's listeners, unregister all services, and release all services used by this bundle.
  */
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData);
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData);
 
 /**
  * Called when this bundle is started so the Framework can perform the bundle-specific activities necessary
@@ -71,7 +71,7 @@ celix_status_t bundleActivator_create(BU
  * 		- Any other status code will mark the bundle as stopped and the framework will remove this
  * 		  bundle's listeners, unregister all services, and release all services used by this bundle.
  */
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context);
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context);
 
 /**
  * Called when this bundle is stopped so the Framework can perform the bundle-specific activities necessary
@@ -90,7 +90,7 @@ celix_status_t bundleActivator_start(voi
  * 		- Any other status code will mark the bundle as stopped and the framework will remove this
  * 		  bundle's listeners, unregister all services, and release all services used by this bundle.
  */
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context);
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context);
 
 /**
  * Called when this bundle is stopped so the bundle can destroy the instance of its activator. In general, this
@@ -107,7 +107,7 @@ celix_status_t bundleActivator_stop(void
  * 		- Any other status code will mark the bundle as stopped and the framework will remove this
  * 		  bundle's listeners, unregister all services, and release all services used by this bundle.
  */
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context);
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context);
 
 #endif /* BUNDLE_ACTIVATOR_H_ */
 

Modified: incubator/celix/trunk/framework/public/include/bundle_archive.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle_archive.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle_archive.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle_archive.h Mon Nov 26 07:47:47 2012
@@ -34,30 +34,30 @@
 #include "celix_errno.h"
 #include "celixbool.h"
 
-typedef struct bundleArchive * BUNDLE_ARCHIVE;
+typedef struct bundleArchive * bundle_archive_t;
 
-celix_status_t bundleArchive_create(char * archiveRoot, long id, char * location, char *inputFile, apr_pool_t *mp, BUNDLE_ARCHIVE *bundle_archive);
-celix_status_t bundleArchive_createSystemBundleArchive(apr_pool_t *mp, BUNDLE_ARCHIVE *bundle_archive);
-celix_status_t bundleArchive_recreate(char * archiveRoot, apr_pool_t *mp, BUNDLE_ARCHIVE *bundle_archive);
-celix_status_t bundleArchive_getId(BUNDLE_ARCHIVE archive, long *id);
-celix_status_t bundleArchive_getLocation(BUNDLE_ARCHIVE archive, char **location);
-celix_status_t bundleArchive_getArchiveRoot(BUNDLE_ARCHIVE archive, char **archiveRoot);
-
-celix_status_t bundleArchive_revise(BUNDLE_ARCHIVE archive, char * location, char *inputFile);
-celix_status_t bundleArchive_rollbackRevise(BUNDLE_ARCHIVE archive, bool *rolledback);
-celix_status_t bundleArchive_getRevision(BUNDLE_ARCHIVE archive, long revNr, BUNDLE_REVISION *revision);
-celix_status_t bundleArchive_getCurrentRevision(BUNDLE_ARCHIVE archive, BUNDLE_REVISION *revision);
-celix_status_t bundleArchive_getCurrentRevisionNumber(BUNDLE_ARCHIVE archive, long *revisionNumber);
-
-celix_status_t bundleArchive_getRefreshCount(BUNDLE_ARCHIVE archive, long *refreshCount);
-celix_status_t bundleArchive_setRefreshCount(BUNDLE_ARCHIVE archive);
-
-celix_status_t bundleArchive_close(BUNDLE_ARCHIVE archive);
-celix_status_t bundleArchive_closeAndDelete(BUNDLE_ARCHIVE archive);
-
-celix_status_t bundleArchive_setLastModified(BUNDLE_ARCHIVE archive, time_t lastModifiedTime);
-celix_status_t bundleArchive_getLastModified(BUNDLE_ARCHIVE archive, time_t *lastModified);
-celix_status_t bundleArchive_setPersistentState(BUNDLE_ARCHIVE archive, BUNDLE_STATE state);
-celix_status_t bundleArchive_getPersistentState(BUNDLE_ARCHIVE archive, BUNDLE_STATE *state);
+celix_status_t bundleArchive_create(char * archiveRoot, long id, char * location, char *inputFile, apr_pool_t *mp, bundle_archive_t *bundle_archive);
+celix_status_t bundleArchive_createSystemBundleArchive(apr_pool_t *mp, bundle_archive_t *bundle_archive);
+celix_status_t bundleArchive_recreate(char * archiveRoot, apr_pool_t *mp, bundle_archive_t *bundle_archive);
+celix_status_t bundleArchive_getId(bundle_archive_t archive, long *id);
+celix_status_t bundleArchive_getLocation(bundle_archive_t archive, char **location);
+celix_status_t bundleArchive_getArchiveRoot(bundle_archive_t archive, char **archiveRoot);
+
+celix_status_t bundleArchive_revise(bundle_archive_t archive, char * location, char *inputFile);
+celix_status_t bundleArchive_rollbackRevise(bundle_archive_t archive, bool *rolledback);
+celix_status_t bundleArchive_getRevision(bundle_archive_t archive, long revNr, BUNDLE_REVISION *revision);
+celix_status_t bundleArchive_getCurrentRevision(bundle_archive_t archive, BUNDLE_REVISION *revision);
+celix_status_t bundleArchive_getCurrentRevisionNumber(bundle_archive_t archive, long *revisionNumber);
+
+celix_status_t bundleArchive_getRefreshCount(bundle_archive_t archive, long *refreshCount);
+celix_status_t bundleArchive_setRefreshCount(bundle_archive_t archive);
+
+celix_status_t bundleArchive_close(bundle_archive_t archive);
+celix_status_t bundleArchive_closeAndDelete(bundle_archive_t archive);
+
+celix_status_t bundleArchive_setLastModified(bundle_archive_t archive, time_t lastModifiedTime);
+celix_status_t bundleArchive_getLastModified(bundle_archive_t archive, time_t *lastModified);
+celix_status_t bundleArchive_setPersistentState(bundle_archive_t archive, BUNDLE_STATE state);
+celix_status_t bundleArchive_getPersistentState(bundle_archive_t archive, BUNDLE_STATE *state);
 
 #endif /* BUNDLE_ARCHIVE_H_ */

Modified: incubator/celix/trunk/framework/public/include/bundle_context.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle_context.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle_context.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle_context.h Mon Nov 26 07:47:47 2012
@@ -32,7 +32,7 @@
  * grant access to other methods so that this bundle can interact with the
  * Framework.
  */
-typedef struct bundleContext *BUNDLE_CONTEXT;
+typedef struct bundleContext *bundle_context_t;
 
 #include "service_factory.h"
 #include "service_listener.h"
@@ -40,36 +40,36 @@ typedef struct bundleContext *BUNDLE_CON
 #include "properties.h"
 #include "array_list.h"
 
-celix_status_t bundleContext_create(FRAMEWORK framework, BUNDLE bundle, BUNDLE_CONTEXT *bundle_context);
-celix_status_t bundleContext_destroy(BUNDLE_CONTEXT context);
+celix_status_t bundleContext_create(FRAMEWORK framework, BUNDLE bundle, bundle_context_t *bundle_context);
+celix_status_t bundleContext_destroy(bundle_context_t context);
 
-celix_status_t bundleContext_getBundle(BUNDLE_CONTEXT context, BUNDLE *bundle);
-celix_status_t bundleContext_getFramework(BUNDLE_CONTEXT context, FRAMEWORK *framework);
-celix_status_t bundleContext_getMemoryPool(BUNDLE_CONTEXT context, apr_pool_t **memory_pool);
+celix_status_t bundleContext_getBundle(bundle_context_t context, BUNDLE *bundle);
+celix_status_t bundleContext_getFramework(bundle_context_t context, FRAMEWORK *framework);
+celix_status_t bundleContext_getMemoryPool(bundle_context_t context, apr_pool_t **memory_pool);
 
-celix_status_t bundleContext_installBundle(BUNDLE_CONTEXT context, char * location, BUNDLE *bundle);
-celix_status_t bundleContext_installBundle2(BUNDLE_CONTEXT context, char * location, char *inputFile, BUNDLE *bundle);
+celix_status_t bundleContext_installBundle(bundle_context_t context, char * location, BUNDLE *bundle);
+celix_status_t bundleContext_installBundle2(bundle_context_t context, char * location, char *inputFile, BUNDLE *bundle);
 
-celix_status_t bundleContext_registerService(BUNDLE_CONTEXT context, char * serviceName, void * svcObj,
+celix_status_t bundleContext_registerService(bundle_context_t context, char * serviceName, void * svcObj,
         PROPERTIES properties, SERVICE_REGISTRATION *service_registration);
-celix_status_t bundleContext_registerServiceFactory(BUNDLE_CONTEXT context, char * serviceName, service_factory_t factory,
+celix_status_t bundleContext_registerServiceFactory(bundle_context_t context, char * serviceName, service_factory_t factory,
         PROPERTIES properties, SERVICE_REGISTRATION *service_registration);
 
-celix_status_t bundleContext_getServiceReferences(BUNDLE_CONTEXT context, const char * serviceName, char * filter, ARRAY_LIST *service_references);
-celix_status_t bundleContext_getServiceReference(BUNDLE_CONTEXT context, char * serviceName, SERVICE_REFERENCE *service_reference);
+celix_status_t bundleContext_getServiceReferences(bundle_context_t context, const char * serviceName, char * filter, ARRAY_LIST *service_references);
+celix_status_t bundleContext_getServiceReference(bundle_context_t context, char * serviceName, SERVICE_REFERENCE *service_reference);
 
-celix_status_t bundleContext_getService(BUNDLE_CONTEXT context, SERVICE_REFERENCE reference, void **service_instance);
-celix_status_t bundleContext_ungetService(BUNDLE_CONTEXT context, SERVICE_REFERENCE reference, bool *result);
+celix_status_t bundleContext_getService(bundle_context_t context, SERVICE_REFERENCE reference, void **service_instance);
+celix_status_t bundleContext_ungetService(bundle_context_t context, SERVICE_REFERENCE reference, bool *result);
 
-celix_status_t bundleContext_getBundles(BUNDLE_CONTEXT context, ARRAY_LIST *bundles);
-celix_status_t bundleContext_getBundleById(BUNDLE_CONTEXT context, long id, BUNDLE *bundle);
+celix_status_t bundleContext_getBundles(bundle_context_t context, ARRAY_LIST *bundles);
+celix_status_t bundleContext_getBundleById(bundle_context_t context, long id, BUNDLE *bundle);
 
-celix_status_t bundleContext_addServiceListener(BUNDLE_CONTEXT context, SERVICE_LISTENER listener, char * filter);
-celix_status_t bundleContext_removeServiceListener(BUNDLE_CONTEXT context, SERVICE_LISTENER listener);
+celix_status_t bundleContext_addServiceListener(bundle_context_t context, SERVICE_LISTENER listener, char * filter);
+celix_status_t bundleContext_removeServiceListener(bundle_context_t context, SERVICE_LISTENER listener);
 
-celix_status_t bundleContext_addBundleListener(BUNDLE_CONTEXT context, bundle_listener_t listener);
-celix_status_t bundleContext_removeBundleListener(BUNDLE_CONTEXT context, bundle_listener_t listener);
+celix_status_t bundleContext_addBundleListener(bundle_context_t context, bundle_listener_t listener);
+celix_status_t bundleContext_removeBundleListener(bundle_context_t context, bundle_listener_t listener);
 
-celix_status_t bundleContext_getProperty(BUNDLE_CONTEXT context, const char *name, char **value);
+celix_status_t bundleContext_getProperty(bundle_context_t context, const char *name, char **value);
 
 #endif /* BUNDLE_CONTEXT_H_ */

Modified: incubator/celix/trunk/framework/public/include/filter.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/filter.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/filter.h (original)
+++ incubator/celix/trunk/framework/public/include/filter.h Mon Nov 26 07:47:47 2012
@@ -31,14 +31,15 @@
 
 #include "celix_errno.h"
 #include "properties.h"
+#include "celixbool.h"
 
-typedef struct filter * FILTER;
+typedef struct filter * filter_t;
 
-FILTER filter_create(char * filterString, apr_pool_t *pool);
-void filter_destroy(FILTER filter);
+filter_t filter_create(char * filterString, apr_pool_t *pool);
+void filter_destroy(filter_t filter);
 
-int filter_match(FILTER filter, PROPERTIES properties);
+celix_status_t filter_match(filter_t filter, PROPERTIES properties, bool *result);
 
-celix_status_t filter_getString(FILTER filter, char **filterStr);
+celix_status_t filter_getString(filter_t filter, char **filterStr);
 
 #endif /* FILTER_H_ */

Modified: incubator/celix/trunk/framework/public/include/framework.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/framework.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/framework.h (original)
+++ incubator/celix/trunk/framework/public/include/framework.h Mon Nov 26 07:47:47 2012
@@ -80,11 +80,11 @@ void fw_serviceChanged(FRAMEWORK framewo
 
 celix_status_t fw_isServiceAssignable(FRAMEWORK fw, BUNDLE requester, SERVICE_REFERENCE reference, bool *assignable);
 
-//BUNDLE_ARCHIVE fw_createArchive(long id, char * location);
-//void revise(BUNDLE_ARCHIVE archive, char * location);
-celix_status_t getManifest(BUNDLE_ARCHIVE archive, apr_pool_t *pool, MANIFEST *manifest);
+//bundle_archive_t fw_createArchive(long id, char * location);
+//void revise(bundle_archive_t archive, char * location);
+celix_status_t getManifest(bundle_archive_t archive, apr_pool_t *pool, MANIFEST *manifest);
 
-BUNDLE findBundle(BUNDLE_CONTEXT context);
+BUNDLE findBundle(bundle_context_t context);
 SERVICE_REGISTRATION findRegistration(SERVICE_REFERENCE reference);
 
 SERVICE_REFERENCE listToArray(ARRAY_LIST list);

Modified: incubator/celix/trunk/framework/public/include/listener_hook_service.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/listener_hook_service.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/listener_hook_service.h (original)
+++ incubator/celix/trunk/framework/public/include/listener_hook_service.h Mon Nov 26 07:47:47 2012
@@ -37,7 +37,7 @@ typedef struct listener_hook_service *li
 #define listener_hook_service_name "listener_hook_service"
 
 struct listener_hook_info {
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	char *filter;
 	bool removed;
 };

Modified: incubator/celix/trunk/framework/public/include/service_registry.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_registry.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_registry.h (original)
+++ incubator/celix/trunk/framework/public/include/service_registry.h Mon Nov 26 07:47:47 2012
@@ -46,7 +46,7 @@ SERVICE_REGISTRATION serviceRegistry_reg
 SERVICE_REGISTRATION serviceRegistry_registerServiceFactory(SERVICE_REGISTRY registry, BUNDLE bundle, char * serviceName, service_factory_t factory, PROPERTIES dictionary);
 void serviceRegistry_unregisterService(SERVICE_REGISTRY registry, BUNDLE bundle, SERVICE_REGISTRATION registration);
 void serviceRegistry_unregisterServices(SERVICE_REGISTRY registry, BUNDLE bundle);
-celix_status_t serviceRegistry_getServiceReferences(SERVICE_REGISTRY registry, apr_pool_t *pool, const char *serviceName, FILTER filter, ARRAY_LIST *references);
+celix_status_t serviceRegistry_getServiceReferences(SERVICE_REGISTRY registry, apr_pool_t *pool, const char *serviceName, filter_t filter, ARRAY_LIST *references);
 void * serviceRegistry_getService(SERVICE_REGISTRY registry, BUNDLE bundle, SERVICE_REFERENCE reference);
 bool serviceRegistry_ungetService(SERVICE_REGISTRY registry, BUNDLE bundle, SERVICE_REFERENCE reference);
 void serviceRegistry_ungetServices(SERVICE_REGISTRY registry, BUNDLE bundle);

Modified: incubator/celix/trunk/framework/public/include/service_tracker.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_tracker.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_tracker.h (original)
+++ incubator/celix/trunk/framework/public/include/service_tracker.h Mon Nov 26 07:47:47 2012
@@ -34,8 +34,8 @@
 
 typedef struct serviceTracker * service_tracker_t;
 
-celix_status_t serviceTracker_create(apr_pool_t *pool, BUNDLE_CONTEXT context, char * service, service_tracker_customizer_t customizer, service_tracker_t *tracker);
-celix_status_t serviceTracker_createWithFilter(apr_pool_t *pool, BUNDLE_CONTEXT context, char * filter, service_tracker_customizer_t customizer, service_tracker_t *tracker);
+celix_status_t serviceTracker_create(apr_pool_t *pool, bundle_context_t context, char * service, service_tracker_customizer_t customizer, service_tracker_t *tracker);
+celix_status_t serviceTracker_createWithFilter(apr_pool_t *pool, bundle_context_t context, char * filter, service_tracker_customizer_t customizer, service_tracker_t *tracker);
 
 celix_status_t serviceTracker_open(service_tracker_t tracker);
 celix_status_t serviceTracker_close(service_tracker_t tracker);

Modified: incubator/celix/trunk/launcher/private/src/launcher.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/launcher/private/src/launcher.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/launcher/private/src/launcher.c (original)
+++ incubator/celix/trunk/launcher/private/src/launcher.c Mon Nov 26 07:47:47 2012
@@ -83,7 +83,7 @@ int main(void) {
         // Afterwards start them
         ARRAY_LIST installed = NULL;
         arrayList_create(pool, &installed);
-        BUNDLE_CONTEXT context = NULL;
+        bundle_context_t context = NULL;
         BUNDLE bundle = NULL;
         framework_getFrameworkBundle(framework, &bundle);
         bundle_getContext(bundle, &context);

Modified: incubator/celix/trunk/log_service/private/src/log_service_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log_service_activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log_service_activator.c (original)
+++ incubator/celix/trunk/log_service/private/src/log_service_activator.c Mon Nov 26 07:47:47 2012
@@ -35,13 +35,13 @@
 #include "service_registration.h"
 
 struct logActivator {
-    BUNDLE_CONTEXT bundleContext;
+    bundle_context_t bundleContext;
     SERVICE_REGISTRATION logServiceFactoryReg;
     SERVICE_REGISTRATION logReaderServiceReg;
 
 };
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
     celix_status_t status = CELIX_SUCCESS;
     apr_pool_t *mp = NULL;
 
@@ -61,7 +61,7 @@ celix_status_t bundleActivator_create(BU
     return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
     struct logActivator * activator = (struct logActivator *) userData;
     celix_status_t status = CELIX_SUCCESS;
     apr_pool_t *mp = NULL;
@@ -92,7 +92,7 @@ celix_status_t bundleActivator_start(voi
     return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	struct logActivator * activator = (struct logActivator *) userData;
 
 	serviceRegistration_unregister(activator->logReaderServiceReg);
@@ -103,6 +103,6 @@ celix_status_t bundleActivator_stop(void
     return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
     return CELIX_SUCCESS;
 }

Modified: incubator/celix/trunk/log_writer/private/src/dependency_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/private/src/dependency_activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/private/src/dependency_activator.c (original)
+++ incubator/celix/trunk/log_writer/private/src/dependency_activator.c Mon Nov 26 07:47:47 2012
@@ -33,7 +33,7 @@
 #include "log_service.h"
 #include "bundle_context.h"
 
-void * dm_create(BUNDLE_CONTEXT context) {
+void * dm_create(bundle_context_t context) {
     apr_pool_t *pool;
 
     bundleContext_getMemoryPool(context, &pool);
@@ -43,7 +43,7 @@ void * dm_create(BUNDLE_CONTEXT context)
 	return writer;
 }
 
-void dm_init(void * userData, BUNDLE_CONTEXT context, DEPENDENCY_MANAGER manager) {
+void dm_init(void * userData, bundle_context_t context, DEPENDENCY_MANAGER manager) {
 	log_writer_t data = (log_writer_t) userData;
 
 	SERVICE service = dependencyActivatorBase_createService(manager);
@@ -59,7 +59,7 @@ void dm_init(void * userData, BUNDLE_CON
 	dependencyManager_add(manager, service);
 }
 
-void dm_destroy(void * userData, BUNDLE_CONTEXT context, DEPENDENCY_MANAGER manager) {
+void dm_destroy(void * userData, bundle_context_t context, DEPENDENCY_MANAGER manager) {
     log_writer_t data = (log_writer_t) userData;
 //    serviceComponent_removeServiceDependency(data->service, data->dep);
 	dependencyManager_remove(manager, data->service);

Modified: incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef ADD_COMMAND_H_
 #define ADD_COMMAND_H_
 
-COMMAND addCommand_create(BUNDLE_CONTEXT context);
+COMMAND addCommand_create(bundle_context_t context);
 void addCommand_destroy(COMMAND command);
 
 #endif /* ADD_COMMAND_H_ */

Modified: incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef SQRT_COMMAND_H_
 #define SQRT_COMMAND_H_
 
-COMMAND sqrtCommand_create(BUNDLE_CONTEXT context);
+COMMAND sqrtCommand_create(bundle_context_t context);
 void sqrtCommand_destroy(COMMAND command);
 
 #endif /* SQRT_COMMAND_H_ */

Modified: incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef SUB_COMMAND_H_
 #define SUB_COMMAND_H_
 
-COMMAND subCommand_create(BUNDLE_CONTEXT context);
+COMMAND subCommand_create(bundle_context_t context);
 void subCommand_destroy(COMMAND command);
 
 #endif /* SUB_COMMAND_H_ */

Modified: incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c Mon Nov 26 07:47:47 2012
@@ -39,7 +39,7 @@
 void addCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
 celix_status_t addCommand_isNumeric(COMMAND command, char *number, bool *ret);
 
-COMMAND addCommand_create(BUNDLE_CONTEXT context) {
+COMMAND addCommand_create(bundle_context_t context) {
 	apr_pool_t *pool;
 	bundleContext_getMemoryPool(context, &pool);
 

Modified: incubator/celix/trunk/remote_services/calc_shell/private/src/calc_shell_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/src/calc_shell_activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/src/calc_shell_activator.c (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/src/calc_shell_activator.c Mon Nov 26 07:47:47 2012
@@ -46,7 +46,7 @@ struct activator {
 	COMMAND sqrtCmd;
 };
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *pool = NULL;
 	status = bundleContext_getMemoryPool(context, &pool);
@@ -68,7 +68,7 @@ celix_status_t bundleActivator_create(BU
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
     celix_status_t status = CELIX_SUCCESS;
 
 	struct activator * activator = (struct activator *) userData;
@@ -85,7 +85,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
     celix_status_t status = CELIX_SUCCESS;
 	struct activator * activator = (struct activator *) userData;
 	serviceRegistration_unregister(activator->addCommand);
@@ -101,7 +101,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	return CELIX_SUCCESS;
 }
 

Modified: incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c Mon Nov 26 07:47:47 2012
@@ -39,7 +39,7 @@
 void sqrtCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
 celix_status_t sqrtCommand_isNumeric(COMMAND command, char *number, bool *ret);
 
-COMMAND sqrtCommand_create(BUNDLE_CONTEXT context) {
+COMMAND sqrtCommand_create(bundle_context_t context) {
 	apr_pool_t *pool;
 	bundleContext_getMemoryPool(context, &pool);
 

Modified: incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c Mon Nov 26 07:47:47 2012
@@ -39,7 +39,7 @@
 void subCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
 celix_status_t subCommand_isNumeric(COMMAND command, char *number, bool *ret);
 
-COMMAND subCommand_create(BUNDLE_CONTEXT context) {
+COMMAND subCommand_create(bundle_context_t context) {
 	apr_pool_t *pool;
 	bundleContext_getMemoryPool(context, &pool);
 

Modified: incubator/celix/trunk/remote_services/discovery/private/include/discovery.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/private/include/discovery.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/private/include/discovery.h (original)
+++ incubator/celix/trunk/remote_services/discovery/private/include/discovery.h Mon Nov 26 07:47:47 2012
@@ -31,7 +31,7 @@
 
 typedef struct discovery *discovery_t;
 
-celix_status_t discovery_create(apr_pool_t *pool, BUNDLE_CONTEXT context, discovery_t *discovery);
+celix_status_t discovery_create(apr_pool_t *pool, bundle_context_t context, discovery_t *discovery);
 celix_status_t discovery_stop(discovery_t discovery);
 
 celix_status_t discovery_endpointAdded(void *handle, endpoint_description_t endpoint, char *machtedFilter);

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/private/src/discovery.c (original)
+++ incubator/celix/trunk/remote_services/discovery/private/src/discovery.c Mon Nov 26 07:47:47 2012
@@ -40,7 +40,7 @@
 #include "discovery.h"
 
 struct discovery {
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	apr_pool_t *pool;
 
 	HASH_MAP listenerReferences;
@@ -76,7 +76,7 @@ SLPBoolean discovery_attributesCallback(
 celix_status_t discovery_deregisterEndpoint(discovery_t discovery, const char *serviceUrl);
 void discovery_deregistrationReport(SLPHandle hslp, SLPError errcode, void* cookie);
 
-celix_status_t discovery_create(apr_pool_t *pool, BUNDLE_CONTEXT context, discovery_t *discovery) {
+celix_status_t discovery_create(apr_pool_t *pool, bundle_context_t context, discovery_t *discovery) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*discovery = apr_palloc(pool, sizeof(**discovery));
@@ -177,8 +177,10 @@ celix_status_t discovery_addService(disc
 		PROPERTIES serviceProperties = NULL;
 		serviceRegistration_getProperties(registration, &serviceProperties);
 		char *scope = properties_get(serviceProperties, (char *) ENDPOINT_LISTENER_SCOPE);
-		FILTER filter = filter_create(scope, discovery->pool);
-		if (filter_match(filter, endpoint->properties)) {
+		filter_t filter = filter_create(scope, discovery->pool);
+		bool matchResult = false;
+		filter_match(filter, endpoint->properties, &matchResult);
+		if (matchResult) {
 			printf("DISCOVERY: Add service (%s)\n", endpoint->service);
 			bundleContext_getService(discovery->context, reference, (void**)&listener);
 			discovery_informListener(discovery, listener, endpoint);

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -41,7 +41,7 @@
 
 struct activator {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 
 	discovery_t discovery;
 
@@ -52,7 +52,7 @@ struct activator {
 celix_status_t discoveryActivator_createEPLTracker(struct activator *activator, service_tracker_t *tracker);
 celix_status_t discoveryActivator_getUUID(struct activator *activator, char **uuidStr);
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *parentPool = NULL;
 	apr_pool_t *pool = NULL;
@@ -95,7 +95,7 @@ celix_status_t discoveryActivator_create
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	apr_pool_t *pool = NULL;
@@ -117,7 +117,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -128,7 +128,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -36,7 +36,7 @@ struct activator {
 	SERVICE_REGISTRATION endpoint;
 };
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	apr_pool_t *parentPool = NULL;
@@ -63,7 +63,7 @@ celix_status_t bundleActivator_create(BU
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	remote_endpoint_t endpoint;
@@ -81,7 +81,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -90,7 +90,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -38,7 +38,7 @@ struct activator {
 	SERVICE_REGISTRATION service;
 };
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	apr_pool_t *parentPool = NULL;
@@ -66,7 +66,7 @@ celix_status_t bundleActivator_create(BU
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	example_t example;
@@ -96,7 +96,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -108,7 +108,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -37,7 +37,7 @@ struct activator {
 	SERVICE_REGISTRATION exampleReg;
 };
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *parentpool = NULL;
 	apr_pool_t *pool = NULL;
@@ -59,7 +59,7 @@ celix_status_t bundleActivator_create(BU
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	example_t example = NULL;
@@ -87,7 +87,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -96,7 +96,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -33,7 +33,7 @@
 
 struct export_registration {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	remote_service_admin_t rsa;
 	endpoint_description_t endpointDescription;
 	SERVICE_REFERENCE reference;
@@ -49,7 +49,7 @@ struct export_registration {
 	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 context, export_registration_t *registration);
+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_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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -33,7 +33,7 @@
 
 struct import_registration {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	remote_service_admin_t rsa;
 	endpoint_description_t endpointDescription;
 
@@ -47,7 +47,7 @@ struct import_registration {
 	bool closed;
 };
 
-celix_status_t importRegistration_create(apr_pool_t *pool, endpoint_description_t endpoint, remote_service_admin_t rsa, BUNDLE_CONTEXT context, import_registration_t *registration);
+celix_status_t importRegistration_create(apr_pool_t *pool, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, import_registration_t *registration);
 celix_status_t importRegistration_open(import_registration_t registration);
 celix_status_t importRegistration_close(import_registration_t registration);
 celix_status_t importRegistration_getException(import_registration_t registration);

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -45,7 +45,7 @@ struct import_reference {
 
 struct remote_service_admin {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 
 	HASH_MAP exportedServices;
 	HASH_MAP importedServices;
@@ -53,7 +53,7 @@ struct remote_service_admin {
 	struct mg_context *ctx;
 };
 
-celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, BUNDLE_CONTEXT context, remote_service_admin_t *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);

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -44,7 +44,7 @@ celix_status_t exportRegistration_endpoi
 
 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 context, export_registration_t *registration) {
+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 status = CELIX_SUCCESS;
 	apr_pool_t *mypool = NULL;
 	apr_pool_create(&mypool, pool);

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -46,7 +46,7 @@ celix_status_t importRegistration_proxyR
 
 celix_status_t importRegistration_createProxyTracker(import_registration_t registration, service_tracker_t *tracker);
 
-celix_status_t importRegistration_create(apr_pool_t *pool, endpoint_description_t endpoint, remote_service_admin_t rsa, BUNDLE_CONTEXT context, import_registration_t *registration) {
+celix_status_t importRegistration_create(apr_pool_t *pool, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, import_registration_t *registration) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *mypool = NULL;
 	apr_pool_create(&mypool, pool);

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -38,7 +38,7 @@ struct activator {
 	SERVICE_REGISTRATION registration;
 };
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *parentPool = NULL;
 	apr_pool_t *pool = NULL;
@@ -65,7 +65,7 @@ celix_status_t bundleActivator_create(BU
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	remote_service_admin_service_t remoteServiceAdmin = NULL;
@@ -103,7 +103,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -115,7 +115,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	return status;

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -51,7 +51,7 @@ celix_status_t remoteServiceAdmin_instal
 celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, PROPERTIES serviceProperties, PROPERTIES 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 context, remote_service_admin_t *admin) {
+celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_t *admin) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*admin = apr_palloc(pool, sizeof(**admin));

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -38,7 +38,7 @@ struct activator {
 	SERVICE_REGISTRATION registration;
 };
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *parentPool = NULL;
 	apr_pool_t *pool = NULL;
@@ -65,7 +65,7 @@ celix_status_t bundleActivator_create(BU
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	remote_service_admin_service_t remoteServiceAdmin = NULL;
@@ -103,7 +103,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -115,7 +115,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	return status;

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -32,7 +32,7 @@ typedef struct remote_service_admin_http
 
 struct remote_service_admin_http {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 
 	struct mg_context *ctx;
 };
@@ -45,7 +45,7 @@ static const char *ajax_reply_start =
 
 void *remoteServiceAdminHttp_callback(enum mg_event event, struct mg_connection *conn, const struct mg_request_info *request_info);
 
-celix_status_t remoteServiceAdminHttp_create(apr_pool_t *pool, BUNDLE_CONTEXT context, remote_service_admin_http_t *httpAdmin) {
+celix_status_t remoteServiceAdminHttp_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_http_t *httpAdmin) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*httpAdmin = apr_palloc(pool, sizeof(**httpAdmin));

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -47,7 +47,7 @@ celix_status_t remoteServiceAdmin_instal
 celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, PROPERTIES serviceProperties, PROPERTIES 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 context, remote_service_admin_t *admin) {
+celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_t *admin) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*admin = apr_palloc(pool, sizeof(**admin));

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -33,7 +33,7 @@
 
 typedef struct topology_manager *topology_manager_t;
 
-celix_status_t topologyManager_create(BUNDLE_CONTEXT context, apr_pool_t *pool, topology_manager_t *manager);
+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);

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -43,7 +43,7 @@
 
 struct activator {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 
 	topology_manager_t manager;
 
@@ -57,7 +57,7 @@ struct activator {
 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);
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *parentPool = NULL;
 	apr_pool_t *pool = NULL;
@@ -126,7 +126,7 @@ static celix_status_t bundleActivator_cr
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	apr_pool_t *pool = NULL;
@@ -158,7 +158,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -170,7 +170,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }

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=1413494&r1=1413493&r2=1413494&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 Mon Nov 26 07:47:47 2012
@@ -44,7 +44,7 @@
 
 struct topology_manager {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 
 	ARRAY_LIST rsaList;
 	HASH_MAP exportedServices;
@@ -63,7 +63,7 @@ celix_status_t topologyManager_notifyLis
 
 celix_status_t topologyManager_getUUID(topology_manager_t manager, char **uuidStr);
 
-celix_status_t topologyManager_create(BUNDLE_CONTEXT context, apr_pool_t *pool, topology_manager_t *manager) {
+celix_status_t topologyManager_create(bundle_context_t context, apr_pool_t *pool, topology_manager_t *manager) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*manager = apr_palloc(pool, sizeof(**manager));
@@ -223,7 +223,7 @@ celix_status_t topologyManager_notifyLis
 				PROPERTIES props = NULL;
 				serviceRegistration_getProperties(registration, &props);
 				char *scope = properties_get(props, (char *) ENDPOINT_LISTENER_SCOPE);
-				FILTER filter = filter_create(scope, manager->pool);
+				filter_t filter = filter_create(scope, manager->pool);
 				endpoint_listener_t epl = NULL;
 				status = bundleContext_getService(manager->context, eplRef, (void **) &epl);
 				if (status == CELIX_SUCCESS) {
@@ -236,7 +236,9 @@ celix_status_t topologyManager_notifyLis
 						if (status == CELIX_SUCCESS) {
 							status = rsa->exportReference_getExportedEndpoint(reference, &endpoint);
 							if (status == CELIX_SUCCESS) {
-								if (filter_match(filter, endpoint->properties)) {
+								bool matchResult = false;
+								filter_match(filter, endpoint->properties, &matchResult);
+								if (matchResult) {
 									status = epl->endpointAdded(epl->handle, endpoint, scope);
 								}
 							}

Modified: incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c (original)
+++ incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c Mon Nov 26 07:47:47 2012
@@ -32,7 +32,7 @@
 #include "remote_constants.h"
 #include "remote_services_utils.h"
 
-celix_status_t remoteServicesUtils_getUUID(apr_pool_t *pool, BUNDLE_CONTEXT context, char **uuidStr) {
+celix_status_t remoteServicesUtils_getUUID(apr_pool_t *pool, bundle_context_t context, char **uuidStr) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	status = bundleContext_getProperty(context, ENDPOINT_FRAMEWORK_UUID, uuidStr);

Modified: incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h (original)
+++ incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h Mon Nov 26 07:47:47 2012
@@ -31,6 +31,6 @@
 #include <bundle_context.h>
 #include <celix_errno.h>
 
-celix_status_t remoteServicesUtils_getUUID(apr_pool_t *pool, BUNDLE_CONTEXT context, char **uuidStr);
+celix_status_t remoteServicesUtils_getUUID(apr_pool_t *pool, bundle_context_t context, char **uuidStr);
 
 #endif /* REMOTE_SERVICES_UTILS_H_ */

Modified: incubator/celix/trunk/shell/private/include/inspect_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/inspect_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/inspect_command.h (original)
+++ incubator/celix/trunk/shell/private/include/inspect_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef INSPECT_COMMAND_H_
 #define INSPECT_COMMAND_H_
 
-COMMAND inspectCommand_create(BUNDLE_CONTEXT context);
+COMMAND inspectCommand_create(bundle_context_t context);
 void inspectCommand_destroy(COMMAND command);
 
 #endif /* INSPECT_COMMAND_H_ */

Modified: incubator/celix/trunk/shell/private/include/install_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/install_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/install_command.h (original)
+++ incubator/celix/trunk/shell/private/include/install_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef INSTALL_COMMAND_H_
 #define INSTALL_COMMAND_H_
 
-COMMAND installCommand_create(BUNDLE_CONTEXT context);
+COMMAND installCommand_create(bundle_context_t context);
 void installCommand_destroy(COMMAND command);
 
 #endif /* INSTALL_COMMAND_H_ */

Modified: incubator/celix/trunk/shell/private/include/log_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/log_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/log_command.h (original)
+++ incubator/celix/trunk/shell/private/include/log_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef LOG_COMMAND_H_
 #define LOG_COMMAND_H_
 
-COMMAND logCommand_create(BUNDLE_CONTEXT context);
+COMMAND logCommand_create(bundle_context_t context);
 void logCommand_destroy(COMMAND command);
 
 #endif /* LOG_COMMAND_H_ */

Modified: incubator/celix/trunk/shell/private/include/ps_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/ps_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/ps_command.h (original)
+++ incubator/celix/trunk/shell/private/include/ps_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef PS_COMMAND_H_
 #define PS_COMMAND_H_
 
-COMMAND psCommand_create(BUNDLE_CONTEXT context);
+COMMAND psCommand_create(bundle_context_t context);
 void psCommand_destroy(COMMAND command);
 
 #endif /* PS_COMMAND_H_ */

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/shell_private.h (original)
+++ incubator/celix/trunk/shell/private/include/shell_private.h Mon Nov 26 07:47:47 2012
@@ -33,7 +33,7 @@
 
 struct shell {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT bundleContext;
+	bundle_context_t bundleContext;
 	HASH_MAP commandReferenceMap;
 	HASH_MAP commandNameMap;
 };

Modified: incubator/celix/trunk/shell/private/include/start_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/start_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/start_command.h (original)
+++ incubator/celix/trunk/shell/private/include/start_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef START_COMMAND_H_
 #define START_COMMAND_H_
 
-COMMAND startCommand_create(BUNDLE_CONTEXT context);
+COMMAND startCommand_create(bundle_context_t context);
 void startCommand_destroy(COMMAND command);
 
 #endif /* START_COMMAND_H_ */

Modified: incubator/celix/trunk/shell/private/include/stop_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/stop_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/stop_command.h (original)
+++ incubator/celix/trunk/shell/private/include/stop_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef STOP_COMMAND_H_
 #define STOP_COMMAND_H_
 
-COMMAND stopCommand_create(BUNDLE_CONTEXT context);
+COMMAND stopCommand_create(bundle_context_t context);
 void stopCommand_destroy(COMMAND command);
 
 #endif /* STOP_COMMAND_H_ */

Modified: incubator/celix/trunk/shell/private/include/uninstall_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/uninstall_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/uninstall_command.h (original)
+++ incubator/celix/trunk/shell/private/include/uninstall_command.h Mon Nov 26 07:47:47 2012
@@ -27,7 +27,7 @@
 #ifndef UNINSTALL_COMMAND_H_
 #define UNINSTALL_COMMAND_H_
 
-COMMAND uninstallCommand_create(BUNDLE_CONTEXT context);
+COMMAND uninstallCommand_create(bundle_context_t context);
 void uninstallCommand_destroy(COMMAND command);
 
 #endif /* UNINSTALL_COMMAND_H_ */

Modified: incubator/celix/trunk/shell/private/include/update_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/update_command.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/update_command.h (original)
+++ incubator/celix/trunk/shell/private/include/update_command.h Mon Nov 26 07:47:47 2012
@@ -29,7 +29,7 @@
 
 #include "command.h"
 
-COMMAND updateCommand_create(BUNDLE_CONTEXT context);
+COMMAND updateCommand_create(bundle_context_t context);
 void updateCommand_destroy(COMMAND command);
 
 #endif /* UPDATE_COMMAND_H_ */

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/inspect_command.c (original)
+++ incubator/celix/trunk/shell/private/src/inspect_command.c Mon Nov 26 07:47:47 2012
@@ -44,7 +44,7 @@
 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 *));
 
-COMMAND inspectCommand_create(BUNDLE_CONTEXT context) {
+COMMAND inspectCommand_create(bundle_context_t context) {
 	COMMAND command = (COMMAND) malloc(sizeof(*command));
 	command->bundleContext = context;
 	command->name = "inspect";

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/install_command.c (original)
+++ incubator/celix/trunk/shell/private/src/install_command.c Mon Nov 26 07:47:47 2012
@@ -36,7 +36,7 @@
 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 *));
 
-COMMAND installCommand_create(BUNDLE_CONTEXT context) {
+COMMAND installCommand_create(bundle_context_t context) {
 	COMMAND command = (COMMAND) malloc(sizeof(*command));
 	command->bundleContext = context;
 	command->name = "install";
@@ -66,7 +66,7 @@ void installCommand_execute(COMMAND comm
 				strcat(info, ", ");
 			}
 			long id;
-			BUNDLE_ARCHIVE archive = NULL;
+			bundle_archive_t archive = NULL;
 			bundle_getArchive(bundle, &archive);
 			bundleArchive_getId(archive, &id);
 			char bundleId[sizeof(id) + 1];

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/log_command.c (original)
+++ incubator/celix/trunk/shell/private/src/log_command.c Mon Nov 26 07:47:47 2012
@@ -35,7 +35,7 @@
 
 void logCommand_execute(COMMAND command, char *line, void (*out)(char *), void (*err)(char *));
 
-COMMAND logCommand_create(BUNDLE_CONTEXT context) {
+COMMAND logCommand_create(bundle_context_t context) {
     COMMAND command = (COMMAND) malloc(sizeof(*command));
     command->bundleContext = context;
     command->name = "log";

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/ps_command.c (original)
+++ incubator/celix/trunk/shell/private/src/ps_command.c Mon Nov 26 07:47:47 2012
@@ -35,7 +35,7 @@
 char * psCommand_stateString(BUNDLE_STATE state);
 void psCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
 
-COMMAND psCommand_create(BUNDLE_CONTEXT context) {
+COMMAND psCommand_create(bundle_context_t context) {
 	COMMAND command = (COMMAND) malloc(sizeof(*command));
 	command->bundleContext = context;
 	command->name = "ps";
@@ -83,7 +83,7 @@ void psCommand_execute(COMMAND command, 
 		out(line);
 		for (i = 0; i < arrayList_size(bundles); i++) {
 			BUNDLE bundle = arrayList_get(bundles, i);
-			BUNDLE_ARCHIVE archive = NULL;
+			bundle_archive_t archive = NULL;
 			long id;
 
 			bundle_getArchive(bundle, &archive);

Modified: incubator/celix/trunk/shell/private/src/shell.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/shell.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/shell.c (original)
+++ incubator/celix/trunk/shell/private/src/shell.c Mon Nov 26 07:47:47 2012
@@ -160,7 +160,7 @@ void shell_serviceChanged(SERVICE_LISTEN
 	}
 }
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	*userData = malloc(sizeof(struct shellServiceActivator));
 	apr_pool_t *pool = NULL;
 	bundleContext_getMemoryPool(context, &pool);
@@ -183,7 +183,7 @@ celix_status_t bundleActivator_create(BU
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
     celix_status_t status;
 
 	struct shellServiceActivator * activator = (struct shellServiceActivator *) userData;
@@ -239,7 +239,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
     celix_status_t status = CELIX_SUCCESS;
 	struct shellServiceActivator * activator = (struct shellServiceActivator *) userData;
 	serviceRegistration_unregister(activator->registration);
@@ -273,7 +273,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	struct shellServiceActivator * activator = (struct shellServiceActivator *) userData;
 	shell_destroy(activator->shell);
 	free(activator);

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/start_command.c (original)
+++ incubator/celix/trunk/shell/private/src/start_command.c Mon Nov 26 07:47:47 2012
@@ -33,7 +33,7 @@
 
 void startCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
 
-COMMAND startCommand_create(BUNDLE_CONTEXT context) {
+COMMAND startCommand_create(bundle_context_t context) {
 	COMMAND command = (COMMAND) malloc(sizeof(*command));
 	command->bundleContext = context;
 	command->name = "start";

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/stop_command.c (original)
+++ incubator/celix/trunk/shell/private/src/stop_command.c Mon Nov 26 07:47:47 2012
@@ -34,7 +34,7 @@
 
 void stopCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
 
-COMMAND stopCommand_create(BUNDLE_CONTEXT context) {
+COMMAND stopCommand_create(bundle_context_t context) {
 	COMMAND command = (COMMAND) malloc(sizeof(*command));
 	command->bundleContext = context;
 	command->name = "stop";

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/uninstall_command.c (original)
+++ incubator/celix/trunk/shell/private/src/uninstall_command.c Mon Nov 26 07:47:47 2012
@@ -34,7 +34,7 @@
 
 void uninstallCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
 
-COMMAND uninstallCommand_create(BUNDLE_CONTEXT context) {
+COMMAND uninstallCommand_create(bundle_context_t context) {
 	COMMAND command = (COMMAND) malloc(sizeof(*command));
 	command->bundleContext = context;
 	command->name = "uninstall";

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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/update_command.c (original)
+++ incubator/celix/trunk/shell/private/src/update_command.c Mon Nov 26 07:47:47 2012
@@ -39,7 +39,7 @@ void updateCommand_execute(COMMAND comma
 celix_status_t updateCommand_download(COMMAND command, char * url, char **inputFile);
 size_t updateCommand_writeData(void *ptr, size_t size, size_t nmemb, FILE *stream);
 
-COMMAND updateCommand_create(BUNDLE_CONTEXT context) {
+COMMAND updateCommand_create(bundle_context_t context) {
 	COMMAND command = (COMMAND) malloc(sizeof(*command));
 	command->bundleContext = context;
 	command->name = "update";

Modified: incubator/celix/trunk/shell/public/include/command_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/public/include/command_private.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell/public/include/command_private.h (original)
+++ incubator/celix/trunk/shell/public/include/command_private.h Mon Nov 26 07:47:47 2012
@@ -35,7 +35,7 @@ struct command {
 	char * usage;
 	char * shortDescription;
 
-	BUNDLE_CONTEXT bundleContext;
+	bundle_context_t bundleContext;
 
 	void (*executeCommand)(COMMAND command, 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=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/private/src/shell_tui.c (original)
+++ incubator/celix/trunk/shell_tui/private/src/shell_tui.c Mon Nov 26 07:47:47 2012
@@ -34,7 +34,7 @@
 #include "utils.h"
 
 struct shellTuiActivator {
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	SHELL_SERVICE shell;
 	SERVICE_REFERENCE reference;
 	struct serviceListener * listener;
@@ -101,7 +101,7 @@ void shellTui_serviceChanged(SERVICE_LIS
 	}
 }
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	apr_pool_t *pool = NULL;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
 	SHELL_TUI_ACTIVATOR activator = apr_palloc(pool, sizeof(*activator));
@@ -111,7 +111,7 @@ celix_status_t bundleActivator_create(BU
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
     celix_status_t status;
 	SHELL_TUI_ACTIVATOR act = (SHELL_TUI_ACTIVATOR) userData;
 	act->context = context;
@@ -135,7 +135,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
     celix_status_t status;
 	SHELL_TUI_ACTIVATOR act = (SHELL_TUI_ACTIVATOR) userData;
 	status = bundleContext_removeServiceListener(context, act->listener);
@@ -151,6 +151,6 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	return CELIX_SUCCESS;
 }

Modified: incubator/celix/trunk/utils/public/include/exports.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/public/include/exports.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/utils/public/include/exports.h (original)
+++ incubator/celix/trunk/utils/public/include/exports.h Mon Nov 26 07:47:47 2012
@@ -32,8 +32,9 @@ configures to build a shared library. If
 another build system on windows or create the visual studio
 projects by hand you need to define utils_EXPORTS when
 building a DLL on windows.
+
+We are using the Visual Studio Compiler and building Shared libraries
 */
-// We are using the Visual Studio Compiler and building Shared libraries
 
 #if defined (_WIN32)
   #if defined(utils_EXPORTS)



Mime
View raw message