celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1413494 [1/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
Author: abroekhuis
Date: Mon Nov 26 07:47:47 2012
New Revision: 1413494

URL: http://svn.apache.org/viewvc?rev=1413494&view=rev
Log:
CELIX-41, CELIX-7: Updated APR usage, renamed several types‚Ä®

Added:
    incubator/celix/trunk/framework/private/include/iowin32.h
    incubator/celix/trunk/framework/private/src/iowin32.c
Modified:
    incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c
    incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c
    incubator/celix/trunk/dependency_manager/private/src/service_component.c
    incubator/celix/trunk/dependency_manager/private/src/service_dependency.c
    incubator/celix/trunk/dependency_manager/public/include/dependency_activator_base.h
    incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h
    incubator/celix/trunk/dependency_manager/public/include/service_component_private.h
    incubator/celix/trunk/dependency_manager/public/include/service_dependency.h
    incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h
    incubator/celix/trunk/deployment_admin/private/include/deployment_package.h
    incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c
    incubator/celix/trunk/deployment_admin/private/src/deployment_admin_activator.c
    incubator/celix/trunk/deployment_admin/private/src/deployment_package.c
    incubator/celix/trunk/device_access/device_access/private/include/device_manager.h
    incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h
    incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h
    incubator/celix/trunk/device_access/device_access/private/src/activator.c
    incubator/celix/trunk/device_access/device_access/private/src/device_manager.c
    incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c
    incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c
    incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c
    incubator/celix/trunk/device_access/driver_locator/private/src/activator.c
    incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c
    incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h
    incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c
    incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c
    incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h
    incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c
    incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c
    incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c
    incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c
    incubator/celix/trunk/examples/hello_world/private/src/activator.c
    incubator/celix/trunk/examples/mongoose/private/src/activator.c
    incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c
    incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/activator.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/triangle_shape.c
    incubator/celix/trunk/examples/whiteboard/publisherA/private/src/activator.c
    incubator/celix/trunk/examples/whiteboard/publisherB/private/src/activator.c
    incubator/celix/trunk/examples/whiteboard/tracker/private/src/activator.c
    incubator/celix/trunk/examples/whiteboard/tracker_depman/private/include/tracker.h
    incubator/celix/trunk/examples/whiteboard/tracker_depman/private/src/dependency_activator.c
    incubator/celix/trunk/framework/CMakeLists.txt
    incubator/celix/trunk/framework/private/include/bundle_cache.h
    incubator/celix/trunk/framework/private/src/bundle.c
    incubator/celix/trunk/framework/private/src/bundle_archive.c
    incubator/celix/trunk/framework/private/src/bundle_cache.c
    incubator/celix/trunk/framework/private/src/bundle_context.c
    incubator/celix/trunk/framework/private/src/filter.c
    incubator/celix/trunk/framework/private/src/framework.c
    incubator/celix/trunk/framework/private/src/manifest.c
    incubator/celix/trunk/framework/private/src/service_registry.c
    incubator/celix/trunk/framework/private/src/service_tracker.c
    incubator/celix/trunk/framework/public/include/bundle.h
    incubator/celix/trunk/framework/public/include/bundle_activator.h
    incubator/celix/trunk/framework/public/include/bundle_archive.h
    incubator/celix/trunk/framework/public/include/bundle_context.h
    incubator/celix/trunk/framework/public/include/filter.h
    incubator/celix/trunk/framework/public/include/framework.h
    incubator/celix/trunk/framework/public/include/listener_hook_service.h
    incubator/celix/trunk/framework/public/include/service_registry.h
    incubator/celix/trunk/framework/public/include/service_tracker.h
    incubator/celix/trunk/launcher/private/src/launcher.c
    incubator/celix/trunk/log_service/private/src/log_service_activator.c
    incubator/celix/trunk/log_writer/private/src/dependency_activator.c
    incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h
    incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h
    incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h
    incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c
    incubator/celix/trunk/remote_services/calc_shell/private/src/calc_shell_activator.c
    incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c
    incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c
    incubator/celix/trunk/remote_services/discovery/private/include/discovery.h
    incubator/celix/trunk/remote_services/discovery/private/src/discovery.c
    incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c
    incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c
    incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c
    incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h
    incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h
    incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
    incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h
    incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c
    incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
    incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c
    incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h
    incubator/celix/trunk/shell/private/include/inspect_command.h
    incubator/celix/trunk/shell/private/include/install_command.h
    incubator/celix/trunk/shell/private/include/log_command.h
    incubator/celix/trunk/shell/private/include/ps_command.h
    incubator/celix/trunk/shell/private/include/shell_private.h
    incubator/celix/trunk/shell/private/include/start_command.h
    incubator/celix/trunk/shell/private/include/stop_command.h
    incubator/celix/trunk/shell/private/include/uninstall_command.h
    incubator/celix/trunk/shell/private/include/update_command.h
    incubator/celix/trunk/shell/private/src/inspect_command.c
    incubator/celix/trunk/shell/private/src/install_command.c
    incubator/celix/trunk/shell/private/src/log_command.c
    incubator/celix/trunk/shell/private/src/ps_command.c
    incubator/celix/trunk/shell/private/src/shell.c
    incubator/celix/trunk/shell/private/src/start_command.c
    incubator/celix/trunk/shell/private/src/stop_command.c
    incubator/celix/trunk/shell/private/src/uninstall_command.c
    incubator/celix/trunk/shell/private/src/update_command.c
    incubator/celix/trunk/shell/public/include/command_private.h
    incubator/celix/trunk/shell_tui/private/src/shell_tui.c
    incubator/celix/trunk/utils/public/include/exports.h

Modified: incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c Mon Nov 26 07:47:47 2012
@@ -32,13 +32,13 @@
 
 struct dependencyActivatorBase {
 	DEPENDENCY_MANAGER manager;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	void * userData;
 };
 
 typedef struct dependencyActivatorBase * DEPENDENCY_ACTIVATOR_BASE;
 
-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;
 	apr_pool_t *npool = NULL;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
@@ -53,7 +53,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;
 
 	DEPENDENCY_ACTIVATOR_BASE data = (DEPENDENCY_ACTIVATOR_BASE) userData;
@@ -64,7 +64,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;
 
 	DEPENDENCY_ACTIVATOR_BASE data = (DEPENDENCY_ACTIVATOR_BASE) userData;
@@ -76,7 +76,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/dependency_manager/private/src/dependency_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c Mon Nov 26 07:47:47 2012
@@ -31,7 +31,7 @@
 #include "bundle_context.h"
 #include "service_component_private.h"
 
-DEPENDENCY_MANAGER dependencyManager_create(BUNDLE_CONTEXT context) {
+DEPENDENCY_MANAGER dependencyManager_create(bundle_context_t context) {
 	DEPENDENCY_MANAGER manager = (DEPENDENCY_MANAGER) malloc(sizeof(*manager));
 	apr_pool_t *pool = NULL;
 	apr_pool_t *npool = NULL;

Modified: incubator/celix/trunk/dependency_manager/private/src/service_component.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/service_component.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/private/src/service_component.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/service_component.c Mon Nov 26 07:47:47 2012
@@ -58,7 +58,7 @@ struct executor {
 	pthread_mutex_t mutex;
 };
 
-SERVICE serviceComponent_create(BUNDLE_CONTEXT context, DEPENDENCY_MANAGER manager) {
+SERVICE serviceComponent_create(bundle_context_t context, DEPENDENCY_MANAGER manager) {
     SERVICE service;
     apr_pool_t *pool;
 

Modified: incubator/celix/trunk/dependency_manager/private/src/service_dependency.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/service_dependency.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/private/src/service_dependency.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/service_dependency.c Mon Nov 26 07:47:47 2012
@@ -36,7 +36,7 @@ celix_status_t serviceDependency_addedSe
 celix_status_t serviceDependency_modifiedService(void * handle, SERVICE_REFERENCE reference, void * service);
 celix_status_t serviceDependency_removedService(void * handle, SERVICE_REFERENCE reference, void * service);
 
-SERVICE_DEPENDENCY serviceDependency_create(BUNDLE_CONTEXT context) {
+SERVICE_DEPENDENCY serviceDependency_create(bundle_context_t context) {
 	SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) malloc(sizeof(*dependency));
 	dependency->context = context;
 

Modified: incubator/celix/trunk/dependency_manager/public/include/dependency_activator_base.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/dependency_activator_base.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/public/include/dependency_activator_base.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/dependency_activator_base.h Mon Nov 26 07:47:47 2012
@@ -30,9 +30,9 @@
 #include "dependency_manager.h"
 #include "service_dependency.h"
 
-void * dm_create(BUNDLE_CONTEXT context);
-void dm_init(void * userData, BUNDLE_CONTEXT context, DEPENDENCY_MANAGER manager);
-void dm_destroy(void * userData, BUNDLE_CONTEXT context, DEPENDENCY_MANAGER manager);
+void * dm_create(bundle_context_t context);
+void dm_init(void * userData, bundle_context_t context, DEPENDENCY_MANAGER manager);
+void dm_destroy(void * userData, bundle_context_t context, DEPENDENCY_MANAGER manager);
 
 SERVICE dependencyActivatorBase_createService(DEPENDENCY_MANAGER manager);
 SERVICE_DEPENDENCY dependencyActivatorBase_createServiceDependency(DEPENDENCY_MANAGER manager);

Modified: incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h Mon Nov 26 07:47:47 2012
@@ -31,13 +31,13 @@
 #include "bundle_context.h"
 
 struct dependencyManager {
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	ARRAY_LIST services;
 };
 
 typedef struct dependencyManager * DEPENDENCY_MANAGER;
 
-DEPENDENCY_MANAGER dependencyManager_create(BUNDLE_CONTEXT context);
+DEPENDENCY_MANAGER dependencyManager_create(bundle_context_t context);
 void dependencyManager_add(DEPENDENCY_MANAGER manager, SERVICE service);
 void dependencyManager_remove(DEPENDENCY_MANAGER manager, SERVICE service);
 

Modified: incubator/celix/trunk/dependency_manager/public/include/service_component_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/service_component_private.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/public/include/service_component_private.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/service_component_private.h Mon Nov 26 07:47:47 2012
@@ -49,7 +49,7 @@ struct service {
 	void * impl;
 	PROPERTIES properties;
 
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	DEPENDENCY_MANAGER manager;
 
 	SERVICE_REGISTRATION registration;
@@ -63,7 +63,7 @@ struct service {
 	pthread_mutex_t mutex;
 };
 
-SERVICE serviceComponent_create(BUNDLE_CONTEXT context, DEPENDENCY_MANAGER manager);
+SERVICE serviceComponent_create(bundle_context_t context, DEPENDENCY_MANAGER manager);
 SERVICE serviceComponent_addServiceDependency(SERVICE service, SERVICE_DEPENDENCY dependency);
 SERVICE serviceComponent_removeServiceDependency(SERVICE service, SERVICE_DEPENDENCY dependency);
 void serviceComponent_dependencyAvailable(SERVICE service, SERVICE_DEPENDENCY dependency);

Modified: incubator/celix/trunk/dependency_manager/public/include/service_dependency.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/service_dependency.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/public/include/service_dependency.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/service_dependency.h Mon Nov 26 07:47:47 2012
@@ -45,7 +45,7 @@ struct serviceDependency {
 	service_tracker_t tracker;
 	SERVICE service;
 	SERVICE_REFERENCE reference;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	void * serviceInstance;
 	char * trackedServiceName;
 	char * trackedServiceFilter;
@@ -53,7 +53,7 @@ struct serviceDependency {
 
 typedef struct serviceDependency * SERVICE_DEPENDENCY;
 
-SERVICE_DEPENDENCY serviceDependency_create(BUNDLE_CONTEXT context);
+SERVICE_DEPENDENCY serviceDependency_create(bundle_context_t context);
 void * serviceDependency_getService(SERVICE_DEPENDENCY dependency);
 
 SERVICE_DEPENDENCY serviceDependency_setRequired(SERVICE_DEPENDENCY dependency, bool required);

Modified: incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h Mon Nov 26 07:47:47 2012
@@ -36,7 +36,7 @@ typedef struct deployment_admin *deploym
 struct deployment_admin {
 	apr_pool_t *pool;
 	apr_thread_t *poller;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 
 	bool running;
 	char *current;
@@ -45,6 +45,6 @@ struct deployment_admin {
 	char *pollUrl;
 };
 
-celix_status_t deploymentAdmin_create(apr_pool_t *pool, BUNDLE_CONTEXT context, deployment_admin_t *admin);
+celix_status_t deploymentAdmin_create(apr_pool_t *pool, bundle_context_t context, deployment_admin_t *admin);
 
 #endif /* DEPLOYMENT_ADMIN_H_ */

Modified: incubator/celix/trunk/deployment_admin/private/include/deployment_package.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/deployment_package.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/deployment_package.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/deployment_package.h Mon Nov 26 07:47:47 2012
@@ -56,7 +56,7 @@ typedef struct resource_info *resource_i
 
 struct deployment_package {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	MANIFEST manifest;
 	ARRAY_LIST bundleInfos;
 	ARRAY_LIST resourceInfos;
@@ -66,7 +66,7 @@ struct deployment_package {
 
 typedef struct deployment_package *deployment_package_t;
 
-celix_status_t deploymentPackage_create(apr_pool_t *pool, BUNDLE_CONTEXT context, MANIFEST manifest, deployment_package_t *package);
+celix_status_t deploymentPackage_create(apr_pool_t *pool, bundle_context_t context, MANIFEST manifest, deployment_package_t *package);
 celix_status_t deploymentPackage_getName(deployment_package_t package, char **name);
 celix_status_t deploymentPackage_getBundleInfos(deployment_package_t package, ARRAY_LIST *infos);
 celix_status_t deploymentPackage_getBundleInfoByName(deployment_package_t package, char *name, bundle_info_t *info);

Modified: incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c Mon Nov 26 07:47:47 2012
@@ -66,7 +66,7 @@ celix_status_t deploymentAdmin_dropDeplo
 celix_status_t deploymentAdmin_dropDeploymentPackageBundles(deployment_admin_t admin, deployment_package_t source, deployment_package_t target);
 celix_status_t deploymentAdmin_startDeploymentPackageBundles(deployment_admin_t admin, deployment_package_t source);
 
-celix_status_t deploymentAdmin_create(apr_pool_t *pool, BUNDLE_CONTEXT context, deployment_admin_t *admin) {
+celix_status_t deploymentAdmin_create(apr_pool_t *pool, bundle_context_t context, deployment_admin_t *admin) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *subpool;
 	apr_pool_create(&subpool, pool);

Modified: incubator/celix/trunk/deployment_admin/private/src/deployment_admin_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_admin_activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_admin_activator.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_admin_activator.c Mon Nov 26 07:47:47 2012
@@ -33,7 +33,7 @@ struct activator {
 	deployment_admin_t admin;
 };
 
-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;
@@ -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) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -69,14 +69,14 @@ 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;
 
 	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/deployment_admin/private/src/deployment_package.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_package.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_package.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_package.c Mon Nov 26 07:47:47 2012
@@ -41,7 +41,7 @@ celix_status_t deploymentPackage_process
 static celix_status_t deploymentPackage_isBundleResource(PROPERTIES attributes, bool *isBundleResource);
 static celix_status_t deploymentPackage_parseBooleanHeader(char *value, bool *boolValue);
 
-celix_status_t deploymentPackage_create(apr_pool_t *pool, BUNDLE_CONTEXT context, MANIFEST manifest, deployment_package_t *package) {
+celix_status_t deploymentPackage_create(apr_pool_t *pool, bundle_context_t context, MANIFEST manifest, deployment_package_t *package) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*package = apr_palloc(pool, sizeof(**package));

Modified: incubator/celix/trunk/device_access/device_access/private/include/device_manager.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/include/device_manager.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/include/device_manager.h (original)
+++ incubator/celix/trunk/device_access/device_access/private/include/device_manager.h Mon Nov 26 07:47:47 2012
@@ -30,7 +30,7 @@
 
 typedef struct device_manager *device_manager_t;
 
-celix_status_t deviceManager_create(apr_pool_t *pool, BUNDLE_CONTEXT context, device_manager_t *manager);
+celix_status_t deviceManager_create(apr_pool_t *pool, bundle_context_t context, device_manager_t *manager);
 celix_status_t deviceManager_destroy(device_manager_t manager);
 
 celix_status_t deviceManager_matchAttachDriver(device_manager_t manager, apr_pool_t *attachPool, driver_loader_t loader,
@@ -47,7 +47,7 @@ celix_status_t deviceManager_driverAdded
 celix_status_t deviceManager_driverModified(void * handle, SERVICE_REFERENCE ref, void * service);
 celix_status_t deviceManager_driverRemoved(void * handle, SERVICE_REFERENCE ref, void * service);
 
-celix_status_t deviceManager_getBundleContext(device_manager_t manager, BUNDLE_CONTEXT *context);
+celix_status_t deviceManager_getBundleContext(device_manager_t manager, bundle_context_t *context);
 
 // celix_status_t deviceManager_match(device_manager_t manager, ...);
 

Modified: incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h (original)
+++ incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h Mon Nov 26 07:47:47 2012
@@ -33,7 +33,7 @@
 
 typedef struct driver_loader *driver_loader_t;
 
-celix_status_t driverLoader_create(apr_pool_t *pool, BUNDLE_CONTEXT context, driver_loader_t *loader);
+celix_status_t driverLoader_create(apr_pool_t *pool, bundle_context_t context, driver_loader_t *loader);
 
 celix_status_t driverLoader_findDrivers(driver_loader_t loader, apr_pool_t *pool, ARRAY_LIST locators, PROPERTIES properties, ARRAY_LIST *driversIds);
 celix_status_t driverLoader_findDriversForLocator(driver_loader_t loader, apr_pool_t *pool, driver_locator_service_t locator, PROPERTIES properties, ARRAY_LIST *driversIds);

Modified: incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h (original)
+++ incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h Mon Nov 26 07:47:47 2012
@@ -32,7 +32,7 @@
 
 typedef struct driver_matcher *driver_matcher_t;
 
-celix_status_t driverMatcher_create(apr_pool_t *pool, BUNDLE_CONTEXT context, driver_matcher_t *matcher);
+celix_status_t driverMatcher_create(apr_pool_t *pool, bundle_context_t context, driver_matcher_t *matcher);
 
 celix_status_t driverMatcher_add(driver_matcher_t matcher, int match, driver_attributes_t attributes);
 

Modified: incubator/celix/trunk/device_access/device_access/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -35,7 +35,7 @@
 #include "device_manager.h"
 
 struct device_manager_bundle_instance {
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	apr_pool_t *pool;
 	device_manager_t deviceManager;
 	service_tracker_t driverLocatorTracker;
@@ -52,7 +52,7 @@ static celix_status_t deviceManagerBundl
 celix_status_t addingService_dummy_func(void * handle, SERVICE_REFERENCE reference, void **service) {
 	celix_status_t status = CELIX_SUCCESS;
 	device_manager_t dm = handle;
-	BUNDLE_CONTEXT context = NULL;
+	bundle_context_t context = NULL;
 	status = deviceManager_getBundleContext(dm, &context);
 	if (status == CELIX_SUCCESS) {
 		status = bundleContext_getService(context, reference, service);
@@ -60,7 +60,7 @@ celix_status_t addingService_dummy_func(
 	return status;
 }
 
-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;
 	status = bundleContext_getMemoryPool(context, &pool);
@@ -78,7 +78,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;
 	device_manager_bundle_instance_t bundleData = userData;
 	apr_pool_t *pool;
@@ -170,7 +170,7 @@ static celix_status_t deviceManagerBundl
 	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;
 	device_manager_bundle_instance_t bundleData = userData;
 //	status = serviceTracker_close(bundleData->driverLocatorTracker);
@@ -183,7 +183,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;
 	device_manager_bundle_instance_t bundleData = userData;
 	deviceManager_destroy(bundleData->deviceManager);

Modified: incubator/celix/trunk/device_access/device_access/private/src/device_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/device_manager.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/device_manager.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/device_manager.c Mon Nov 26 07:47:47 2012
@@ -43,7 +43,7 @@
 
 struct device_manager {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	HASH_MAP devices;
 	HASH_MAP drivers;
 	ARRAY_LIST locators;
@@ -54,7 +54,7 @@ static celix_status_t deviceManager_atta
 static celix_status_t deviceManager_getIdleDevices(device_manager_t manager, apr_pool_t *pool, ARRAY_LIST *idleDevices);
 static celix_status_t deviceManager_isDriverBundle(device_manager_t manager, BUNDLE bundle, bool *isDriver);
 
-celix_status_t deviceManager_create(apr_pool_t *pool, BUNDLE_CONTEXT context, device_manager_t *manager) {
+celix_status_t deviceManager_create(apr_pool_t *pool, bundle_context_t context, device_manager_t *manager) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*manager = apr_palloc(pool, sizeof(**manager));
@@ -578,7 +578,7 @@ celix_status_t deviceManager_isDriverBun
 }
 
 
-celix_status_t deviceManager_getBundleContext(device_manager_t manager, BUNDLE_CONTEXT *context) {
+celix_status_t deviceManager_getBundleContext(device_manager_t manager, bundle_context_t *context) {
 	celix_status_t status = CELIX_SUCCESS;
 	if (manager->context != NULL) {
 		(*context) = manager->context;

Modified: incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c Mon Nov 26 07:47:47 2012
@@ -50,7 +50,7 @@ celix_status_t driverAttributes_create(a
 		status = CELIX_ENOMEM;
 	} else {
 		BUNDLE bundle = NULL;
-		BUNDLE_ARCHIVE bundleArchive = NULL;
+		bundle_archive_t bundleArchive = NULL;
 		status = serviceReference_getBundle(reference, &bundle);
 
 		if (status == CELIX_SUCCESS) {

Modified: incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c Mon Nov 26 07:47:47 2012
@@ -34,13 +34,13 @@
 struct driver_loader {
 	apr_pool_t *pool;
 
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	ARRAY_LIST loadedDrivers;
 };
 
 static apr_status_t driverLoader_destroy(void *loaderP);
 
-celix_status_t driverLoader_create(apr_pool_t *pool, BUNDLE_CONTEXT context, driver_loader_t *loader) {
+celix_status_t driverLoader_create(apr_pool_t *pool, bundle_context_t context, driver_loader_t *loader) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*loader = apr_palloc(pool, sizeof(**loader));

Modified: incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c Mon Nov 26 07:47:47 2012
@@ -35,7 +35,7 @@ struct driver_matcher {
 	HASH_MAP attributes;
 	 ARRAY_LIST matches;
 
-	 BUNDLE_CONTEXT context;
+	 bundle_context_t context;
 };
 
 typedef struct match_key {
@@ -56,7 +56,7 @@ int driverMatcher_matchKeyEquals(void * 
 	return ((match_key_t) key)->matchValue == ((match_key_t) toCompare)->matchValue;
 }
 
-celix_status_t driverMatcher_create(apr_pool_t *pool, BUNDLE_CONTEXT context, driver_matcher_t *matcher) {
+celix_status_t driverMatcher_create(apr_pool_t *pool, bundle_context_t context, driver_matcher_t *matcher) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*matcher = apr_palloc(pool, sizeof(**matcher));

Modified: incubator/celix/trunk/device_access/driver_locator/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/driver_locator/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/driver_locator/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -40,7 +40,7 @@ struct bundle_instance {
 
 typedef struct bundle_instance *bundle_instance_t;
 
-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;
     status = bundleContext_getMemoryPool(context, &pool);
@@ -58,7 +58,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;
     apr_pool_t *pool;
     status = bundleContext_getMemoryPool(context, &pool);
@@ -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;
     bundle_instance_t bi = (bundle_instance_t)userData;
     serviceRegistration_unregister(bi->locatorRegistration);
@@ -93,6 +93,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/device_access/example/base_driver/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -37,14 +37,14 @@
 #include "base_driver_device.h"
 
 struct base_driver_bundle_instance {
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	apr_pool_t * pool;
 	ARRAY_LIST serviceRegistrations;
 };
 
 typedef struct base_driver_bundle_instance *base_driver_bundle_instance_t;
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	printf("BASE_DRIVER: creating bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *pool;
@@ -98,7 +98,7 @@ static celix_status_t bundleActivator_re
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	printf("BASE_DRIVER: starting bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	base_driver_bundle_instance_t bundleInstance = userData;
@@ -109,7 +109,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) {
 	printf("BASE_DRIVER: stopping bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	base_driver_bundle_instance_t bundleInstance = userData;
@@ -131,7 +131,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) {
 	printf("BASE_DRIVER: destroying bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	base_driver_bundle_instance_t bundleInstance = userData;

Modified: incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h (original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h Mon Nov 26 07:47:47 2012
@@ -34,7 +34,7 @@
 
 typedef struct consuming_driver *consuming_driver_t;
 
-celix_status_t consumingDriver_create(BUNDLE_CONTEXT context, apr_pool_t *pool, consuming_driver_t *driver);
+celix_status_t consumingDriver_create(bundle_context_t context, apr_pool_t *pool, consuming_driver_t *driver);
 celix_status_t consumingDriver_createService(consuming_driver_t driver, driver_service_t *service);
 
 celix_status_t consumingDriver_attach(void *driver, SERVICE_REFERENCE reference, char **result);

Modified: incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -36,14 +36,14 @@
 #include "consuming_driver_private.h"
 
 struct consuming_driver_bundle_instance {
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	apr_pool_t * pool;
 	SERVICE_REGISTRATION registration;
 };
 
 typedef struct consuming_driver_bundle_instance *consuming_driver_bundle_instance_t;
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	printf("CONSUMING_DRIVER: creating bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *pool;
@@ -62,7 +62,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) {
 	printf("CONSUMING_DRIVER: starting bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	consuming_driver_bundle_instance_t bi = userData;
@@ -88,7 +88,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) {
 	printf("CONSUMING_DRIVER: stopping bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	consuming_driver_bundle_instance_t bi = userData;
@@ -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) {
 	printf("CONSUMING_DRIVER: destroying bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	consuming_driver_bundle_instance_t bi = userData;

Modified: incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c (original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c Mon Nov 26 07:47:47 2012
@@ -41,7 +41,7 @@
 
 struct consuming_driver {
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	ARRAY_LIST references;
 };
 
@@ -66,7 +66,7 @@ static apr_status_t consumingDriver_clea
 	return APR_SUCCESS;
 }
 
-celix_status_t consumingDriver_create(BUNDLE_CONTEXT context, apr_pool_t *pool, consuming_driver_t *driver) {
+celix_status_t consumingDriver_create(bundle_context_t context, apr_pool_t *pool, consuming_driver_t *driver) {
 	celix_status_t status = CELIX_SUCCESS;
 	(*driver) = apr_palloc(pool, sizeof(**driver));
 	if ((*driver) != NULL) {

Modified: incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h Mon Nov 26 07:47:47 2012
@@ -37,7 +37,7 @@
 
 typedef struct refining_driver *refining_driver_t;
 
-celix_status_t refiningDriver_create(BUNDLE_CONTEXT context, apr_pool_t *pool, refining_driver_t *driver);
+celix_status_t refiningDriver_create(bundle_context_t context, apr_pool_t *pool, refining_driver_t *driver);
 celix_status_t refiningDriver_destroy(refining_driver_t driver);
 
 celix_status_t refiningDriver_createService(refining_driver_t driver, driver_service_t *service);

Modified: incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -36,14 +36,14 @@
 #include "refining_driver_private.h"
 
 struct refining_driver_bundle_instance {
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	apr_pool_t * pool;
 	SERVICE_REGISTRATION registration;
 };
 
 typedef struct refining_driver_bundle_instance *refining_driver_bundle_instance_t;
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	printf("REFINING_DRIVER: creating bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *pool;
@@ -62,7 +62,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) {
 	printf("REFINING_DRIVER: starting bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	refining_driver_bundle_instance_t bi = userData;
@@ -88,7 +88,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) {
 	printf("REFINING_DRIVER: stopping bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	refining_driver_bundle_instance_t bi = userData;
@@ -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) {
 	printf("REFINING_DRIVER: destroying bundle\n");
 	celix_status_t status = CELIX_SUCCESS;
 	refining_driver_bundle_instance_t bi = userData;

Modified: incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c Mon Nov 26 07:47:47 2012
@@ -42,7 +42,7 @@ static const int MAX_BUFF_SIZE = 1024;
 struct refining_driver {
 	device_t device;
 	apr_pool_t *pool;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	int deviceCount;
 	ARRAY_LIST devices;
 };
@@ -77,7 +77,7 @@ static apr_status_t refiningDriver_clean
 	return CELIX_SUCCESS;
 }
 
-celix_status_t refiningDriver_create(BUNDLE_CONTEXT context, apr_pool_t *pool, refining_driver_t *driver) {
+celix_status_t refiningDriver_create(bundle_context_t context, apr_pool_t *pool, refining_driver_t *driver) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *driverPool = NULL;
 	apr_status_t aprStatus = apr_pool_create(&driverPool, pool);

Modified: incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c (original)
+++ incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c Mon Nov 26 07:47:47 2012
@@ -37,7 +37,7 @@ struct echoActivator {
 	service_tracker_t tracker;
 };
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	struct echoActivator * act = malloc(sizeof(*act));
 	act->client = NULL;
 	act->tracker = NULL;
@@ -47,7 +47,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) {
 	struct echoActivator * act = (struct echoActivator *) userData;
 
 	apr_pool_t *pool = NULL;
@@ -66,7 +66,7 @@ celix_status_t bundleActivator_start(voi
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	struct echoActivator * act = (struct echoActivator *) userData;
 	serviceTracker_close(act->tracker);
 	echoClient_stop(act->client);
@@ -74,7 +74,7 @@ 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) {
 	struct echoActivator * act = (struct echoActivator *) userData;
 	echoClient_destroy(act->client);
 

Modified: incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c (original)
+++ incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c Mon Nov 26 07:47:47 2012
@@ -35,14 +35,14 @@ struct echoActivator {
 	ECHO_SERVICE es;
 };
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	struct echoActivator * act = malloc(sizeof(*act));
 	act->reg = NULL;
 	*userData = act;
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	struct echoActivator * act = (struct echoActivator *) userData;
 
 	ECHO_SERVICE es = malloc(sizeof(*es));
@@ -57,7 +57,7 @@ celix_status_t bundleActivator_start(voi
     return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	struct echoActivator * act = (struct echoActivator *) userData;
 
 	serviceRegistration_unregister(act->reg);
@@ -66,7 +66,7 @@ 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) {
 	struct echoActivator * act = (struct echoActivator *) userData;
 	act->es->echo = NULL;
 	echoServer_destroy(act->es->server);

Modified: incubator/celix/trunk/examples/hello_world/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/hello_world/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -34,7 +34,7 @@ struct userData {
 	char * word;
 };
 
-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;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
 	if (status == CELIX_SUCCESS) {
@@ -46,18 +46,18 @@ 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) {
 	struct userData * data = (struct userData *) userData;
 	printf("Hello %s\n", data->word);
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	struct userData * data = (struct userData *) userData;
 	printf("Goodbye %s\n", data->word);
 	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/examples/mongoose/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/mongoose/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/mongoose/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -36,14 +36,14 @@ struct userData {
 	struct mg_context *ctx;
 };
 
-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;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
 	*userData = apr_palloc(pool, sizeof(struct userData));
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
 	BUNDLE bundle;
 	celix_status_t status = CELIX_SUCCESS;
 	struct userData * data = (struct userData *) userData;
@@ -73,13 +73,13 @@ 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 userData * data = (struct userData *) userData;
 	mg_stop(data->ctx);
 	printf("Mongoose stopped\n");
 	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/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c Mon Nov 26 07:47:47 2012
@@ -31,12 +31,12 @@
 #include "greeting_service.h"
 
 
-celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
 	*userData = NULL;
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT ctx) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t ctx) {
 	SERVICE_REFERENCE ref = NULL;
 	celix_status_t status = bundleContext_getServiceReference(ctx, (char *) GREETING_SERVICE_NAME, &ref);
 	if (status == CELIX_SUCCESS) {
@@ -57,10 +57,10 @@ 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) {
 	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/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -40,7 +40,7 @@ struct greetingActivator {
 
 typedef struct greetingActivator *greeting_activator_t;
 
-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;
 	greeting_activator_t activator;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
@@ -57,7 +57,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;
 
 	greeting_activator_t act = (greeting_activator_t) userData;
@@ -80,7 +80,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;
 	greeting_activator_t act = (greeting_activator_t) userData;
 	serviceRegistration_unregister(act->reg);
@@ -88,6 +88,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/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c Mon Nov 26 07:47:47 2012
@@ -34,7 +34,7 @@
 struct listenerActivator {
 	apr_pool_t *pool;
 
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	SERVICE_LISTENER listener;
 
 	apr_thread_mutex_t *logServiceReferencesLock;
@@ -51,7 +51,7 @@ static void *APR_THREAD_FUNC listenerExa
 
 celix_status_t listenerExample_alternativeLog(struct listenerActivator *activator, char *message);
 
-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;
 	apr_pool_t *subpool;
@@ -80,7 +80,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 listenerActivator *activator = userData;
 
@@ -119,7 +119,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 listenerActivator *activator = userData;
 	apr_status_t stat;
@@ -132,7 +132,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 listenerActivator *activator = userData;
 	arrayList_destroy(activator->logServiceReferences);

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -39,7 +39,7 @@ typedef log_service_t LOG_SERVICE;
 struct threadData {
 	char * service;
 	int threadId;
-	BUNDLE_CONTEXT m_context;
+	bundle_context_t m_context;
 };
 
 typedef struct threadData *THREAD_DATA;
@@ -58,7 +58,7 @@ void alternativeLog(char *message, THREA
 // global functions
 //*******************************************************************************
 
-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;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
 	if (status == CELIX_SUCCESS) {
@@ -72,18 +72,18 @@ 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) {
 	((THREAD_DATA) userData)->m_context = context;
 	startTestThread(((THREAD_DATA) userData));
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	stopTestThread();
 	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;
 }
 
@@ -95,7 +95,7 @@ celix_status_t bundleActivator_destroy(v
 void *LogServiceTest (void *argument){
 	celix_status_t status = CELIX_SUCCESS;
 	THREAD_DATA data = (THREAD_DATA) argument;
-	BUNDLE_CONTEXT m_context = ((THREAD_DATA) argument)->m_context;
+	bundle_context_t m_context = ((THREAD_DATA) argument)->m_context;
 	while (pthread_self() == m_logTestThread) {
 		SERVICE_REFERENCE logServiceRef = NULL;
 		// lookup the current "best" LogService each time, just before we need to use it

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h Mon Nov 26 07:47:47 2012
@@ -28,6 +28,6 @@
 
 #include "celix_errno.h"
 
-celix_status_t circleShape_create(BUNDLE_CONTEXT context, SIMPLE_SHAPE *shape);
+celix_status_t circleShape_create(bundle_context_t context, SIMPLE_SHAPE *shape);
 
 #endif /* CIRCLE_SHAPE_H_ */

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -42,7 +42,7 @@ struct activator {
 	apr_pool_t *pool;
 };
 
-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;
 	struct activator *activator;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
@@ -55,7 +55,7 @@ celix_status_t bundleActivator_create(BU
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT ctx) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t ctx) {
 	struct activator * act = (struct activator *) userData;
 	celix_status_t status = CELIX_SUCCESS;
 	SIMPLE_SHAPE es = NULL;
@@ -66,7 +66,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 * act = (struct activator *) userData;
 
@@ -75,6 +75,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/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c Mon Nov 26 07:47:47 2012
@@ -40,7 +40,7 @@
 
 void circleShape_draw(SIMPLE_SHAPE shape, GdkPixmap *pixMap, GtkWidget *widget, gdouble x, gdouble y);
 
-celix_status_t circleShape_create(BUNDLE_CONTEXT context, SIMPLE_SHAPE *shape) {
+celix_status_t circleShape_create(bundle_context_t context, SIMPLE_SHAPE *shape) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	BUNDLE bundle;

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h Mon Nov 26 07:47:47 2012
@@ -26,6 +26,6 @@
 #ifndef DEFAULT_SHAPE_H_
 #define DEFAULT_SHAPE_H_
 
-extern SIMPLE_SHAPE defaultShape_create(BUNDLE_CONTEXT context);
+extern SIMPLE_SHAPE defaultShape_create(bundle_context_t context);
 
 #endif /* DEFAULT_SHAPE_H_ */

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h Mon Nov 26 07:47:47 2012
@@ -41,17 +41,17 @@ struct paint_frame {
 	HASH_MAP m_shapes;
 	SIMPLE_SHAPE m_defaultShape;
 	LINKED_LIST m_shapeComponents;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	GThread *main;
 };
 
 
 typedef struct paint_frame *PAINT_FRAME;
-celix_status_t paintFrame_create(BUNDLE_CONTEXT context, apr_pool_t *pool, PAINT_FRAME *frame);
+celix_status_t paintFrame_create(bundle_context_t context, apr_pool_t *pool, PAINT_FRAME *frame);
 celix_status_t paintFrame_exit(PAINT_FRAME frame);
 
 SIMPLE_SHAPE paintFrame_getShape(PAINT_FRAME frame, char *name);
-celix_status_t paintFrame_addShape(PAINT_FRAME frame, BUNDLE_CONTEXT context, SIMPLE_SHAPE shape);
+celix_status_t paintFrame_addShape(PAINT_FRAME frame, bundle_context_t context, SIMPLE_SHAPE shape);
 celix_status_t paintFrame_removeShape(PAINT_FRAME frame, SIMPLE_SHAPE sshape);
 
 

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -42,7 +42,7 @@ struct paintFrameActivatorData {
 	SERVICE_REGISTRATION reg;
 	apr_pool_t *pool;
 	service_tracker_t tracker;
-	BUNDLE_CONTEXT context;
+	bundle_context_t context;
 	PAINT_FRAME paint_frame;
 };
 celix_status_t addingServ(void * handle, SERVICE_REFERENCE ref, void **service);
@@ -52,7 +52,7 @@ celix_status_t removedServ(void * handle
 
 typedef struct paintFrameActivatorData *GREETING_ACTIVATOR;
 
-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;
 	GREETING_ACTIVATOR activator;
 	service_tracker_customizer_t cust;
@@ -77,20 +77,20 @@ celix_status_t bundleActivator_create(BU
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT ctx) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t ctx) {
 	struct paintFrameActivatorData * act = (struct paintFrameActivatorData *) userData;
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
 	struct paintFrameActivatorData * act = (struct paintFrameActivatorData *) userData;
 	serviceTracker_close(act->tracker);
 	paintFrame_exit(act->paint_frame);
 	return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
 	struct paintFrameActivatorData * act = (struct paintFrameActivatorData *) userData;
 	return CELIX_SUCCESS;
 }

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c Mon Nov 26 07:47:47 2012
@@ -41,7 +41,7 @@
 
 void defaultShape_draw(SIMPLE_SHAPE shape, GdkPixmap *pixMap, GtkWidget *widget, gdouble x, gdouble y);
 
-SIMPLE_SHAPE defaultShape_create(BUNDLE_CONTEXT context) {
+SIMPLE_SHAPE defaultShape_create(bundle_context_t context) {
 	BUNDLE bundle;
 	apr_pool_t *pool;
 	SIMPLE_SHAPE shape = (SIMPLE_SHAPE) malloc(sizeof(*shape));

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c Mon Nov 26 07:47:47 2012
@@ -74,7 +74,7 @@ static void paintFrame_destroyWidgets(PA
 /**
  * Default constructor that populates the main window.
  **/
-celix_status_t paintFrame_create(BUNDLE_CONTEXT context, apr_pool_t *pool, PAINT_FRAME *frame) {
+celix_status_t paintFrame_create(bundle_context_t context, apr_pool_t *pool, PAINT_FRAME *frame) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *mypool = NULL;
 	apr_pool_create(&mypool, pool);
@@ -182,7 +182,7 @@ static celix_status_t paintFrame_show(PA
  * @param icon The icon associated with the injected <tt>SimpleShape</tt>.
  * @param shape The injected <tt>SimpleShape</tt> instance.
  **/
-celix_status_t paintFrame_addShape(PAINT_FRAME frame, BUNDLE_CONTEXT context, SIMPLE_SHAPE shape) {
+celix_status_t paintFrame_addShape(PAINT_FRAME frame, bundle_context_t context, SIMPLE_SHAPE shape) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	gdk_threads_enter();

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h Mon Nov 26 07:47:47 2012
@@ -26,6 +26,6 @@
 #ifndef SQUARE_SHAPE_H_
 #define SQUARE_SHAPE_H_
 
-extern SIMPLE_SHAPE squareShape_create(BUNDLE_CONTEXT context);
+extern SIMPLE_SHAPE squareShape_create(bundle_context_t context);
 
 #endif /* SQUARE_SHAPE_H_ */

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -43,7 +43,7 @@ struct squareActivator {
 
 typedef struct squareActivator *GREETING_ACTIVATOR;
 
-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;
 	GREETING_ACTIVATOR activator;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
@@ -57,7 +57,7 @@ celix_status_t bundleActivator_create(BU
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT ctx) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t ctx) {
 	struct squareActivator * act = (struct squareActivator *) userData;
 	celix_status_t status = CELIX_SUCCESS;
 	SIMPLE_SHAPE es = squareShape_create(ctx);
@@ -68,10 +68,10 @@ 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) {
 	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/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c Mon Nov 26 07:47:47 2012
@@ -39,7 +39,7 @@
 
 void squareShape_draw(SIMPLE_SHAPE shape, GdkPixmap *pixMap, GtkWidget *widget, gdouble x, gdouble y);
 
-SIMPLE_SHAPE squareShape_create(BUNDLE_CONTEXT context) {
+SIMPLE_SHAPE squareShape_create(bundle_context_t context) {
 	BUNDLE bundle;
 	apr_pool_t *pool;
 	SIMPLE_SHAPE shape = (SIMPLE_SHAPE) malloc(sizeof(*shape));

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h Mon Nov 26 07:47:47 2012
@@ -27,6 +27,6 @@
 #ifndef TRIANGLE_SHAPE_H_
 #define TRIANGLE_SHAPE_H_
 
-extern SIMPLE_SHAPE triangleShape_create(BUNDLE_CONTEXT ctx);
+extern SIMPLE_SHAPE triangleShape_create(bundle_context_t ctx);
 
 #endif /* TRIANGLE_SHAPE_H_ */

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -43,7 +43,7 @@ struct greetingActivator {
 
 typedef struct greetingActivator *GREETING_ACTIVATOR;
 
-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;
 	GREETING_ACTIVATOR activator;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
@@ -57,7 +57,7 @@ celix_status_t bundleActivator_create(BU
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT ctx) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_t ctx) {
 	struct greetingActivator * act = (struct greetingActivator *) userData;
 	celix_status_t status = CELIX_SUCCESS;
 	SIMPLE_SHAPE es = triangleShape_create(ctx);
@@ -68,10 +68,10 @@ 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) {
 	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/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/triangle_shape.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/triangle_shape.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/triangle_shape.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/triangle_shape.c Mon Nov 26 07:47:47 2012
@@ -41,7 +41,7 @@
 
 void triangleShape_draw(SIMPLE_SHAPE shape, GdkPixmap *pixMap, GtkWidget *widget, gdouble x, gdouble y);
 
-SIMPLE_SHAPE triangleShape_create(BUNDLE_CONTEXT context) {
+SIMPLE_SHAPE triangleShape_create(bundle_context_t context) {
 	BUNDLE bundle;
 	apr_pool_t *pool;
 	SIMPLE_SHAPE shape = (SIMPLE_SHAPE) malloc(sizeof(*shape));

Modified: incubator/celix/trunk/examples/whiteboard/publisherA/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/publisherA/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/publisherA/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/whiteboard/publisherA/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -38,7 +38,7 @@ struct activatorData {
     SERVICE_REGISTRATION reg;
 };
 
-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;
     celix_status_t status = bundleContext_getMemoryPool(context, &pool);
     if (status == CELIX_SUCCESS) {
@@ -49,7 +49,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;
     apr_pool_t *pool;
     status = bundleContext_getMemoryPool(context, &pool);
@@ -75,7 +75,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 activatorData * data = (struct activatorData *) userData;
@@ -84,6 +84,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/examples/whiteboard/publisherB/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/publisherB/private/src/activator.c?rev=1413494&r1=1413493&r2=1413494&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/publisherB/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/whiteboard/publisherB/private/src/activator.c Mon Nov 26 07:47:47 2012
@@ -37,7 +37,7 @@ struct activatorData {
 	SERVICE_REGISTRATION reg;
 };
 
-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;
     celix_status_t status = bundleContext_getMemoryPool(context, &pool);
     if (status == CELIX_SUCCESS) {
@@ -48,7 +48,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;
     apr_pool_t *pool;
     status = bundleContext_getMemoryPool(context, &pool);
@@ -70,7 +70,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 activatorData * data = (struct activatorData *) userData;
@@ -79,6 +79,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;
 }



Mime
View raw message