incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject svn commit: r1492377 [1/12] - in /incubator/celix/trunk: dependency_manager/private/src/ dependency_manager/public/include/ deployment_admin/private/include/ deployment_admin/private/src/ deployment_admin/public/include/ device_access/device_access/pri...
Date Wed, 12 Jun 2013 19:08:55 GMT
Author: pnoltes
Date: Wed Jun 12 19:08:50 2013
New Revision: 1492377

URL: http://svn.apache.org/r1492377
Log:
CELIX-62: applied patch which change _t typedef to _pt. 

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.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/include/log.h
    incubator/celix/trunk/deployment_admin/private/include/log_event.h
    incubator/celix/trunk/deployment_admin/private/include/log_store.h
    incubator/celix/trunk/deployment_admin/private/include/log_sync.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/deployment_admin/private/src/log.c
    incubator/celix/trunk/deployment_admin/private/src/log_store.c
    incubator/celix/trunk/deployment_admin/private/src/log_sync.c
    incubator/celix/trunk/deployment_admin/public/include/resource_processor.h
    incubator/celix/trunk/device_access/device_access/private/include/device_manager.h
    incubator/celix/trunk/device_access/device_access/private/include/driver_attributes.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/device_access/public/include/device.h
    incubator/celix/trunk/device_access/device_access/public/include/driver.h
    incubator/celix/trunk/device_access/device_access/public/include/driver_locator.h
    incubator/celix/trunk/device_access/device_access/public/include/driver_selector.h
    incubator/celix/trunk/device_access/device_access/public/include/match.h
    incubator/celix/trunk/device_access/driver_locator/private/include/driver_locator_private.h
    incubator/celix/trunk/device_access/driver_locator/private/src/activator.c
    incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c
    incubator/celix/trunk/device_access/example/CMakeLists.txt
    incubator/celix/trunk/device_access/example/base_driver/private/include/base_driver_private.h
    incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c
    incubator/celix/trunk/device_access/example/base_driver/private/src/base_driver.c
    incubator/celix/trunk/device_access/example/base_driver/public/include/base_driver_device.h
    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/device_access/example/refining_driver/public/include/refining_driver_device.h
    incubator/celix/trunk/examples/echo_service/client/private/include/echo_client_private.h
    incubator/celix/trunk/examples/echo_service/client/private/src/echo_client.c
    incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c
    incubator/celix/trunk/examples/echo_service/server/private/include/echo_server_private.h
    incubator/celix/trunk/examples/echo_service/server/private/src/echo_server.c
    incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c
    incubator/celix/trunk/examples/echo_service/server/public/include/echo_server.h
    incubator/celix/trunk/examples/hello_world/private/src/activator.c
    incubator/celix/trunk/examples/mongoose/private/include/mongoose.h
    incubator/celix/trunk/examples/mongoose/private/src/activator.c
    incubator/celix/trunk/examples/mongoose/private/src/mongoose.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/include/greeting_impl.h
    incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c
    incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/greeting_impl.c
    incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/public/include/greeting_service.h
    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/include/shape_component.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/paint/private/src/shape_component.c
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/simple/public/include/simple_shape.h
    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/publisherA/private/src/publisher.c
    incubator/celix/trunk/examples/whiteboard/publisherB/private/src/activator.c
    incubator/celix/trunk/examples/whiteboard/publisherB/private/src/publisher.c
    incubator/celix/trunk/examples/whiteboard/publisherService/private/include/publisher_private.h
    incubator/celix/trunk/examples/whiteboard/publisherService/public/include/publisher.h
    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/examples/whiteboard/tracker_depman/private/src/tracker.c
    incubator/celix/trunk/framework/private/include/attribute.h
    incubator/celix/trunk/framework/private/include/bundle_cache.h
    incubator/celix/trunk/framework/private/include/manifest_parser.h
    incubator/celix/trunk/framework/private/include/resolver.h
    incubator/celix/trunk/framework/private/src/attribute.c
    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/bundle_revision.c
    incubator/celix/trunk/framework/private/src/capability.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/manifest_parser.c
    incubator/celix/trunk/framework/private/src/module.c
    incubator/celix/trunk/framework/private/src/properties.c
    incubator/celix/trunk/framework/private/src/requirement.c
    incubator/celix/trunk/framework/private/src/resolver.c
    incubator/celix/trunk/framework/private/src/service_reference.c
    incubator/celix/trunk/framework/private/src/service_registration.c
    incubator/celix/trunk/framework/private/src/service_registry.c
    incubator/celix/trunk/framework/private/src/service_tracker.c
    incubator/celix/trunk/framework/private/src/service_tracker_customizer.c
    incubator/celix/trunk/framework/private/src/version.c
    incubator/celix/trunk/framework/private/src/version_range.c
    incubator/celix/trunk/framework/private/src/wire.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/bundle_event.h
    incubator/celix/trunk/framework/public/include/bundle_listener.h
    incubator/celix/trunk/framework/public/include/bundle_revision.h
    incubator/celix/trunk/framework/public/include/capability.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/manifest.h
    incubator/celix/trunk/framework/public/include/module.h
    incubator/celix/trunk/framework/public/include/properties.h
    incubator/celix/trunk/framework/public/include/requirement.h
    incubator/celix/trunk/framework/public/include/service_event.h
    incubator/celix/trunk/framework/public/include/service_factory.h
    incubator/celix/trunk/framework/public/include/service_listener.h
    incubator/celix/trunk/framework/public/include/service_reference.h
    incubator/celix/trunk/framework/public/include/service_registration.h
    incubator/celix/trunk/framework/public/include/service_registry.h
    incubator/celix/trunk/framework/public/include/service_tracker.h
    incubator/celix/trunk/framework/public/include/service_tracker_customizer.h
    incubator/celix/trunk/framework/public/include/version.h
    incubator/celix/trunk/framework/public/include/version_range.h
    incubator/celix/trunk/framework/public/include/wire.h
    incubator/celix/trunk/hessian/source/private/src/hessian_in.c
    incubator/celix/trunk/hessian/source/private/src/hessian_out.c
    incubator/celix/trunk/hessian/source/private/test/test_hessian_out.c
    incubator/celix/trunk/hessian/source/private/test/test_service.h
    incubator/celix/trunk/hessian/source/private/test/test_service_proxy.c
    incubator/celix/trunk/hessian/source/private/test/test_service_skeleton.c
    incubator/celix/trunk/hessian/source/public/include/hessian_2.0_in.h
    incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h
    incubator/celix/trunk/hessian/source/test.c
    incubator/celix/trunk/launcher/private/src/launcher.c
    incubator/celix/trunk/log_service/private/include/log.h
    incubator/celix/trunk/log_service/private/include/log_factory.h
    incubator/celix/trunk/log_service/private/include/log_reader_service_impl.h
    incubator/celix/trunk/log_service/private/include/log_service_impl.h
    incubator/celix/trunk/log_service/private/src/log.c
    incubator/celix/trunk/log_service/private/src/log_entry.c
    incubator/celix/trunk/log_service/private/src/log_factory.c
    incubator/celix/trunk/log_service/private/src/log_reader_service_impl.c
    incubator/celix/trunk/log_service/private/src/log_service_activator.c
    incubator/celix/trunk/log_service/private/src/log_service_impl.c
    incubator/celix/trunk/log_service/public/include/log_entry.h
    incubator/celix/trunk/log_service/public/include/log_listener.h
    incubator/celix/trunk/log_service/public/include/log_reader_service.h
    incubator/celix/trunk/log_service/public/include/log_service.h
    incubator/celix/trunk/log_writer/private/include/log_writer.h
    incubator/celix/trunk/log_writer/private/src/dependency_activator.c
    incubator/celix/trunk/log_writer/private/src/log_writer.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/endpoint_listener/public/include/endpoint_listener.h
    incubator/celix/trunk/remote_services/example_endpoint/private/include/example_endpoint_impl.h
    incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c
    incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_impl.c
    incubator/celix/trunk/remote_services/example_proxy/private/include/example_proxy_impl.h
    incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c
    incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c
    incubator/celix/trunk/remote_services/example_service/private/include/example_impl.h
    incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c
    incubator/celix/trunk/remote_services/example_service/private/src/example_impl.c
    incubator/celix/trunk/remote_services/example_service/public/include/example_service.h
    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/mongoose.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/mongoose.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/public/include/remote_endpoint.h
    incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h
    incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/mongoose.h
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/mongoose.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/remote_shell/private/include/connection_listener.h
    incubator/celix/trunk/remote_shell/private/include/remote_shell.h
    incubator/celix/trunk/remote_shell/private/include/shell_mediator.h
    incubator/celix/trunk/remote_shell/private/src/activator.c
    incubator/celix/trunk/remote_shell/private/src/connection_listener.c
    incubator/celix/trunk/remote_shell/private/src/remote_shell.c
    incubator/celix/trunk/remote_shell/private/src/shell_mediator.c
    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/command.c
    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.h
    incubator/celix/trunk/shell/public/include/command_private.h
    incubator/celix/trunk/shell/public/include/shell.h
    incubator/celix/trunk/shell_tui/private/src/shell_tui.c
    incubator/celix/trunk/utils/private/include/array_list_private.h
    incubator/celix/trunk/utils/private/include/hash_map_private.h
    incubator/celix/trunk/utils/private/include/linked_list_private.h
    incubator/celix/trunk/utils/private/src/array_list.c
    incubator/celix/trunk/utils/private/src/hash_map.c
    incubator/celix/trunk/utils/private/src/linked_list_iterator.c
    incubator/celix/trunk/utils/private/src/linkedlist.c
    incubator/celix/trunk/utils/private/test/array_list_test.c
    incubator/celix/trunk/utils/private/test/hash_map_test.c
    incubator/celix/trunk/utils/private/test/hash_map_test_hash.c
    incubator/celix/trunk/utils/private/test/linked_list_test.c
    incubator/celix/trunk/utils/public/include/array_list.h
    incubator/celix/trunk/utils/public/include/hash_map.h
    incubator/celix/trunk/utils/public/include/linked_list_iterator.h
    incubator/celix/trunk/utils/public/include/linkedlist.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=1492377&r1=1492376&r2=1492377&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 Wed Jun 12 19:08:50 2013
@@ -31,21 +31,21 @@
 #include "dependency_activator_base.h"
 
 struct dependencyActivatorBase {
-	DEPENDENCY_MANAGER manager;
-	bundle_context_t context;
+	dependency_manager_pt manager;
+	bundle_context_pt context;
 	void * userData;
 };
 
-typedef struct dependencyActivatorBase * DEPENDENCY_ACTIVATOR_BASE;
+typedef struct dependencyActivatorBase * dependency_activator_base_pt;
 
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
 	apr_pool_t *pool;
 	apr_pool_t *npool = NULL;
 	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
 	apr_pool_create(&npool, pool);
 	if (status == CELIX_SUCCESS) {
-		*userData = apr_palloc(npool, sizeof(DEPENDENCY_ACTIVATOR_BASE));
-		((DEPENDENCY_ACTIVATOR_BASE)(*userData))->userData = dm_create(context);;
+		*userData = apr_palloc(npool, sizeof(dependency_activator_base_pt));
+		((dependency_activator_base_pt)(*userData))->userData = dm_create(context);;
 	} else {
 		status = CELIX_START_ERROR;
 	}
@@ -53,10 +53,10 @@ celix_status_t bundleActivator_create(bu
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	DEPENDENCY_ACTIVATOR_BASE data = (DEPENDENCY_ACTIVATOR_BASE) userData;
+	dependency_activator_base_pt data = (dependency_activator_base_pt) userData;
 	data->manager = dependencyManager_create(context);
 	data->context = context;
 	dm_init(data->userData, data->context, data->manager);
@@ -64,10 +64,10 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	DEPENDENCY_ACTIVATOR_BASE data = (DEPENDENCY_ACTIVATOR_BASE) userData;
+	dependency_activator_base_pt data = (dependency_activator_base_pt) userData;
 	dm_destroy(data->userData, data->context, data->manager);
 	data->userData = NULL;
 	data->context = NULL;
@@ -76,16 +76,16 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }
 
-SERVICE dependencyActivatorBase_createService(DEPENDENCY_MANAGER manager) {
+service_pt dependencyActivatorBase_createService(dependency_manager_pt manager) {
 	return serviceComponent_create(manager->context, manager);
 }
 
-SERVICE_DEPENDENCY dependencyActivatorBase_createServiceDependency(DEPENDENCY_MANAGER manager) {
+service_dependency_pt dependencyActivatorBase_createServiceDependency(dependency_manager_pt manager) {
 	return serviceDependency_create(manager->context);
 }
 

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=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c Wed Jun 12 19:08:50 2013
@@ -31,8 +31,8 @@
 #include "bundle_context.h"
 #include "service_component_private.h"
 
-DEPENDENCY_MANAGER dependencyManager_create(bundle_context_t context) {
-	DEPENDENCY_MANAGER manager = (DEPENDENCY_MANAGER) malloc(sizeof(*manager));
+dependency_manager_pt dependencyManager_create(bundle_context_pt context) {
+	dependency_manager_pt manager = (dependency_manager_pt) malloc(sizeof(*manager));
 	apr_pool_t *pool = NULL;
 	apr_pool_t *npool = NULL;
 	bundleContext_getMemoryPool(context, &pool);
@@ -43,20 +43,20 @@ DEPENDENCY_MANAGER dependencyManager_cre
 	return manager;
 }
 
-void dependencyManager_add(DEPENDENCY_MANAGER manager, SERVICE service) {
+void dependencyManager_add(dependency_manager_pt manager, service_pt service) {
 	arrayList_add(manager->services, service);
 	serviceComponent_start(service);
 }
 
-void dependencyManager_remove(DEPENDENCY_MANAGER manager, SERVICE service) {
+void dependencyManager_remove(dependency_manager_pt manager, service_pt service) {
 	serviceComponent_stop(service);
 	arrayList_removeElement(manager->services, service);
 }
 
-SERVICE dependencyManager_createService(DEPENDENCY_MANAGER manager) {
+service_pt dependencyManager_createService(dependency_manager_pt manager) {
 	return serviceComponent_create(manager->context, manager);
 }
 
-SERVICE_DEPENDENCY dependencyManager_createServiceDependency(DEPENDENCY_MANAGER manager) {
+service_dependency_pt dependencyManager_createServiceDependency(dependency_manager_pt manager) {
 	return serviceDependency_create(manager->context);
 }

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=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/private/src/service_component.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/service_component.c Wed Jun 12 19:08:50 2013
@@ -41,25 +41,25 @@ typedef enum state_state {
 } STATE_STATE;
 
 struct state {
-	array_list_t dependencies;
+	array_list_pt dependencies;
 	STATE_STATE state;
 };
 
 struct executorEntry {
-	SERVICE service;
+	service_pt service;
 	void (*function)(void *, void*);
 	void * argument;
 };
 
 struct executor {
 	struct executorEntry * active;
-	linked_list_t workQueue;
+	linked_list_pt workQueue;
 
 	apr_thread_mutex_t *mutex;
 };
 
-SERVICE serviceComponent_create(bundle_context_t context, DEPENDENCY_MANAGER manager) {
-    SERVICE service;
+service_pt serviceComponent_create(bundle_context_pt context, dependency_manager_pt manager) {
+    service_pt service;
     apr_pool_t *pool;
 	apr_pool_t *mypool;
 
@@ -67,7 +67,7 @@ SERVICE serviceComponent_create(bundle_c
 	apr_pool_create(&mypool, pool);
 
 	if (mypool) {
-        service = (SERVICE) apr_pcalloc(mypool, sizeof(*service));
+        service = (service_pt) apr_pcalloc(mypool, sizeof(*service));
         service->pool = mypool;
         service->impl = NULL;
         service->serviceName = NULL;
@@ -91,7 +91,7 @@ SERVICE serviceComponent_create(bundle_c
 	return service;
 }
 
-void serviceComponent_calculateStateChanges(SERVICE service, const STATE old, const STATE new) {
+void serviceComponent_calculateStateChanges(service_pt service, const state_pt old, const state_pt new) {
 	if (state_isWaitingForRequired(old) && state_isTrackingOptional(new)) {
 		executor_enqueue(service->executor, service, serviceComponent_activateService, new);
 	}
@@ -114,8 +114,8 @@ void serviceComponent_calculateStateChan
 	executor_execute(service->executor);
 }
 
-SERVICE serviceComponent_addServiceDependency(SERVICE service, SERVICE_DEPENDENCY dependency) {
-	STATE old, new;
+service_pt serviceComponent_addServiceDependency(service_pt service, service_dependency_pt dependency) {
+	state_pt old, new;
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
 	arrayList_add(service->dependencies, dependency);
@@ -135,8 +135,8 @@ SERVICE serviceComponent_addServiceDepen
 	return service;
 }
 
-SERVICE serviceComponent_removeServiceDependency(SERVICE service, SERVICE_DEPENDENCY dependency) {
-	STATE old, new;
+service_pt serviceComponent_removeServiceDependency(service_pt service, service_dependency_pt dependency) {
+	state_pt old, new;
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
 	arrayList_removeElement(service->dependencies, dependency);
@@ -156,8 +156,8 @@ SERVICE serviceComponent_removeServiceDe
 	return service;
 }
 
-void serviceComponent_dependencyAvailable(SERVICE service, SERVICE_DEPENDENCY dependency) {
-	STATE old, new;
+void serviceComponent_dependencyAvailable(service_pt service, service_dependency_pt dependency) {
+	state_pt old, new;
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
 	new = state_create(arrayList_clone(service->pool, service->dependencies), !state_isInactive(old));
@@ -171,8 +171,8 @@ void serviceComponent_dependencyAvailabl
 	}
 }
 
-void serviceComponent_dependencyChanged(SERVICE service, SERVICE_DEPENDENCY dependency) {
-	STATE state;
+void serviceComponent_dependencyChanged(service_pt service, service_dependency_pt dependency) {
+	state_pt state;
 	apr_thread_mutex_lock(service->mutex);
 	state = service->state;
 	apr_thread_mutex_unlock(service->mutex);
@@ -182,8 +182,8 @@ void serviceComponent_dependencyChanged(
 	}
 }
 
-void serviceComponent_dependencyUnavailable(SERVICE service, SERVICE_DEPENDENCY dependency) {
-	STATE old, new;
+void serviceComponent_dependencyUnavailable(service_pt service, service_dependency_pt dependency) {
+	state_pt old, new;
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
 	new = state_create(arrayList_clone(service->pool, service->dependencies), !state_isInactive(old));
@@ -197,8 +197,8 @@ void serviceComponent_dependencyUnavaila
 	}
 }
 
-void serviceComponent_start(SERVICE service) {
-	STATE old, new;
+void serviceComponent_start(service_pt service) {
+	state_pt old, new;
 	bundleContext_registerService(service->context, SERVICE_COMPONENT_NAME, service, NULL, &service->serviceRegistration);
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
@@ -209,8 +209,8 @@ void serviceComponent_start(SERVICE serv
 	state_destroy(old);
 }
 
-void serviceComponent_stop(SERVICE service) {
-	STATE old, new;
+void serviceComponent_stop(service_pt service) {
+	state_pt old, new;
 	apr_thread_mutex_lock(service->mutex);
 	old = service->state;
 	new = state_create(arrayList_clone(service->pool, service->dependencies), false);
@@ -221,20 +221,20 @@ void serviceComponent_stop(SERVICE servi
 	serviceRegistration_unregister(service->serviceRegistration);
 }
 
-SERVICE serviceComponent_setInterface(SERVICE service, char * serviceName, properties_t properties) {
+service_pt serviceComponent_setInterface(service_pt service, char * serviceName, properties_pt properties) {
 	service->serviceName = serviceName;
 	service->properties = properties;
 
 	return service;
 }
 
-SERVICE serviceComponent_setImplementation(SERVICE service, void * implementation) {
+service_pt serviceComponent_setImplementation(service_pt service, void * implementation) {
 	service->impl = implementation;
 	return service;
 }
 
-void serviceComponent_activateService(SERVICE service, void * arg) {
-	STATE state = (STATE) arg;
+void serviceComponent_activateService(service_pt service, void * arg) {
+	state_pt state = (state_pt) arg;
 	serviceComponent_initService(service);
 	service->init(service->impl);
 	serviceComponent_configureService(service, state);
@@ -243,8 +243,8 @@ void serviceComponent_activateService(SE
 	serviceComponent_registerService(service);
 }
 
-void serviceComponent_deactivateService(SERVICE service, void * arg) {
-	STATE state = (STATE) arg;
+void serviceComponent_deactivateService(service_pt service, void * arg) {
+	state_pt state = (state_pt) arg;
 	serviceComponent_unregisterService(service);
 	serviceComponent_stopTrackingOptional(service, state);
 	service->stop(service->impl);
@@ -252,11 +252,11 @@ void serviceComponent_deactivateService(
 	serviceComponent_destroyService(service, state);
 }
 
-void serviceComponent_startTrackingOptional(SERVICE service, STATE state) {
-    array_list_t deps = arrayList_clone(service->pool, state->dependencies);
-	array_list_iterator_t i = arrayListIterator_create(deps);
+void serviceComponent_startTrackingOptional(service_pt service, state_pt state) {
+    array_list_pt deps = arrayList_clone(service->pool, state->dependencies);
+	array_list_iterator_pt i = arrayListIterator_create(deps);
 	while (arrayListIterator_hasNext(i)) {
-		SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) arrayListIterator_next(i);
+		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);
 		if (!dependency->required) {
 			serviceDependency_start(dependency, service);
 		}
@@ -265,11 +265,11 @@ void serviceComponent_startTrackingOptio
 	arrayList_destroy(deps);
 }
 
-void serviceComponent_stopTrackingOptional(SERVICE service, STATE state) {
-    array_list_t deps = arrayList_clone(service->pool, state->dependencies);
-	array_list_iterator_t i = arrayListIterator_create(deps);
+void serviceComponent_stopTrackingOptional(service_pt service, state_pt state) {
+    array_list_pt deps = arrayList_clone(service->pool, state->dependencies);
+	array_list_iterator_pt i = arrayListIterator_create(deps);
 	while (arrayListIterator_hasNext(i)) {
-		SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) arrayListIterator_next(i);
+		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);
 		if (!dependency->required) {
 			serviceDependency_stop(dependency, service);
 		}
@@ -278,12 +278,12 @@ void serviceComponent_stopTrackingOption
 	arrayList_destroy(deps);
 }
 
-void serviceComponent_startTrackingRequired(SERVICE service, void * arg) {
-	STATE state = (STATE) arg;
-	array_list_t deps = arrayList_clone(service->pool, state->dependencies);
-    array_list_iterator_t i = arrayListIterator_create(deps);
+void serviceComponent_startTrackingRequired(service_pt service, void * arg) {
+	state_pt state = (state_pt) arg;
+	array_list_pt deps = arrayList_clone(service->pool, state->dependencies);
+    array_list_iterator_pt i = arrayListIterator_create(deps);
 	while (arrayListIterator_hasNext(i)) {
-		SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) arrayListIterator_next(i);
+		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);
 		if (dependency->required) {
 			serviceDependency_start(dependency, service);
 		}
@@ -292,12 +292,12 @@ void serviceComponent_startTrackingRequi
 	arrayList_destroy(deps);
 }
 
-void serviceComponent_stopTrackingRequired(SERVICE service, void * arg) {
-	STATE state = (STATE) arg;
-	array_list_t deps = arrayList_clone(service->pool, state->dependencies);
-    array_list_iterator_t i = arrayListIterator_create(deps);
+void serviceComponent_stopTrackingRequired(service_pt service, void * arg) {
+	state_pt state = (state_pt) arg;
+	array_list_pt deps = arrayList_clone(service->pool, state->dependencies);
+    array_list_iterator_pt i = arrayListIterator_create(deps);
 	while (arrayListIterator_hasNext(i)) {
-		SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) arrayListIterator_next(i);
+		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);
 		if (dependency->required) {
 			serviceDependency_stop(dependency, service);
 		}
@@ -306,13 +306,13 @@ void serviceComponent_stopTrackingRequir
 	arrayList_destroy(deps);
 }
 
-void serviceComponent_initService(SERVICE service) {
+void serviceComponent_initService(service_pt service) {
 }
 
-void serviceComponent_configureService(SERVICE service, STATE state) {
-	array_list_iterator_t i = arrayListIterator_create(state->dependencies);
+void serviceComponent_configureService(service_pt service, state_pt state) {
+	array_list_iterator_pt i = arrayListIterator_create(state->dependencies);
 	while (arrayListIterator_hasNext(i)) {
-		SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) arrayListIterator_next(i);
+		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);
 		if (dependency->autoConfigureField != NULL) {
 			*dependency->autoConfigureField = serviceDependency_getService(dependency);
 		}
@@ -323,10 +323,10 @@ void serviceComponent_configureService(S
 	arrayListIterator_destroy(i);
 }
 
-void serviceComponent_destroyService(SERVICE service, STATE state) {
-	array_list_iterator_t i = arrayListIterator_create(state->dependencies);
+void serviceComponent_destroyService(service_pt service, state_pt state) {
+	array_list_iterator_pt i = arrayListIterator_create(state->dependencies);
 	while (arrayListIterator_hasNext(i)) {
-		SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) arrayListIterator_next(i);
+		service_dependency_pt dependency = (service_dependency_pt) arrayListIterator_next(i);
 		if (dependency->required) {
 			serviceDependency_invokeRemoved(dependency);
 		}
@@ -337,37 +337,37 @@ void serviceComponent_destroyService(SER
 	arrayList_destroy(service->dependencies);
 }
 
-void serviceComponent_registerService(SERVICE service) {
+void serviceComponent_registerService(service_pt service) {
 	if (service->serviceName != NULL) {
 		bundleContext_registerService(service->context, service->serviceName, service->impl, service->properties, &service->registration);
 	}
 }
 
-void serviceComponent_unregisterService(SERVICE service) {
+void serviceComponent_unregisterService(service_pt service) {
 	if (service->serviceName != NULL) {
 		serviceRegistration_unregister(service->registration);
 	}
 }
 
-void serviceComponent_updateInstance(SERVICE service, void * arg) {
-	SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) arg;
+void serviceComponent_updateInstance(service_pt service, void * arg) {
+	service_dependency_pt dependency = (service_dependency_pt) arg;
 	if (dependency->autoConfigureField != NULL) {
 		*dependency->autoConfigureField = serviceDependency_getService(dependency);
 	}
 }
 
-char * serviceComponent_getName(SERVICE service) {
+char * serviceComponent_getName(service_pt service) {
 	return service->serviceName;
 }
 
-STATE state_create(array_list_t dependencies, bool active) {
-	STATE state = (STATE) malloc(sizeof(*state));
+state_pt state_create(array_list_pt dependencies, bool active) {
+	state_pt state = (state_pt) malloc(sizeof(*state));
 	state->dependencies = dependencies;
 	if (active) {
 		bool allReqAvail = true;
 		unsigned int i;
 		for (i = 0; i < arrayList_size(dependencies); i++) {
-			SERVICE_DEPENDENCY dependency = arrayList_get(dependencies, i);
+			service_dependency_pt dependency = arrayList_get(dependencies, i);
 			if (dependency->required) {
 				if (!dependency->available) {
 					allReqAvail = false;
@@ -387,7 +387,7 @@ STATE state_create(array_list_t dependen
 	return state;
 }
 
-void state_destroy(STATE state) {
+void state_destroy(state_pt state) {
 	if (state->dependencies != NULL) {
 		arrayList_destroy(state->dependencies);
 		state->dependencies = NULL;
@@ -397,26 +397,26 @@ void state_destroy(STATE state) {
 	state = NULL;
 }
 
-bool state_isInactive(STATE state) {
+bool state_isInactive(state_pt state) {
 	return state->state == STATE_INACTIVE;
 }
 
-bool state_isWaitingForRequired(STATE state) {
+bool state_isWaitingForRequired(state_pt state) {
 	return state->state == STATE_WAITING_FOR_REQUIRED;
 }
 
-bool state_isTrackingOptional(STATE state) {
+bool state_isTrackingOptional(state_pt state) {
 	return state->state == STATE_TRACKING_OPTIONAL;
 }
 
-array_list_t state_getDependencies(STATE state) {
+array_list_pt state_getDependencies(state_pt state) {
 	return state->dependencies;
 }
 
-EXECUTOR executor_create(apr_pool_t *memory_pool) {
-	EXECUTOR executor;
+executor_pt executor_create(apr_pool_t *memory_pool) {
+	executor_pt executor;
 
-	executor = (EXECUTOR) apr_pcalloc(memory_pool, sizeof(*executor));
+	executor = (executor_pt) apr_pcalloc(memory_pool, sizeof(*executor));
 	if (executor) {
         linkedList_create(memory_pool, &executor->workQueue);
         executor->active = NULL;
@@ -426,7 +426,7 @@ EXECUTOR executor_create(apr_pool_t *mem
 	return executor;
 }
 
-void executor_enqueue(EXECUTOR executor, SERVICE service, void (*function), void * argument) {
+void executor_enqueue(executor_pt executor, service_pt service, void (*function), void * argument) {
 	struct executorEntry * entry = NULL;
 	apr_thread_mutex_lock(executor->mutex);
 	entry = (struct executorEntry *) malloc(sizeof(*entry));
@@ -437,7 +437,7 @@ void executor_enqueue(EXECUTOR executor,
 	apr_thread_mutex_unlock(executor->mutex);
 }
 
-void executor_execute(EXECUTOR executor) {
+void executor_execute(executor_pt executor) {
 	struct executorEntry * active;
 	apr_thread_mutex_lock(executor->mutex);
 	active = executor->active;
@@ -447,7 +447,7 @@ void executor_execute(EXECUTOR executor)
 	}
 }
 
-void executor_scheduleNext(EXECUTOR executor) {
+void executor_scheduleNext(executor_pt executor) {
 	struct executorEntry * entry = NULL;
 	apr_thread_mutex_lock(executor->mutex);
 	entry = linkedList_removeFirst(executor->workQueue);

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=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/private/src/service_dependency.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/service_dependency.c Wed Jun 12 19:08:50 2013
@@ -31,13 +31,13 @@
 #include "bundle_context.h"
 #include "constants.h"
 
-celix_status_t serviceDependency_addingService(void * handle, service_reference_t reference, void **service);
-celix_status_t serviceDependency_addedService(void * handle, service_reference_t reference, void * service);
-celix_status_t serviceDependency_modifiedService(void * handle, service_reference_t reference, void * service);
-celix_status_t serviceDependency_removedService(void * handle, service_reference_t reference, void * service);
+celix_status_t serviceDependency_addingService(void * handle, service_reference_pt reference, void **service);
+celix_status_t serviceDependency_addedService(void * handle, service_reference_pt reference, void * service);
+celix_status_t serviceDependency_modifiedService(void * handle, service_reference_pt reference, void * service);
+celix_status_t serviceDependency_removedService(void * handle, service_reference_pt reference, void * service);
 
-SERVICE_DEPENDENCY serviceDependency_create(bundle_context_t context) {
-	SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) malloc(sizeof(*dependency));
+service_dependency_pt serviceDependency_create(bundle_context_pt context) {
+	service_dependency_pt dependency = (service_dependency_pt) malloc(sizeof(*dependency));
 	dependency->context = context;
 
 	dependency->autoConfigureField = NULL;
@@ -60,7 +60,7 @@ SERVICE_DEPENDENCY serviceDependency_cre
 	return dependency;
 }
 
-void * serviceDependency_getService(SERVICE_DEPENDENCY dependency) {
+void * serviceDependency_getService(service_dependency_pt dependency) {
 	void * service = NULL;
 	if (dependency->started) {
 		service = serviceTracker_getService(dependency->tracker);
@@ -68,9 +68,9 @@ void * serviceDependency_getService(SERV
 	return service;
 }
 
-void serviceDependency_start(SERVICE_DEPENDENCY dependency, SERVICE service) {
+void serviceDependency_start(service_dependency_pt dependency, service_pt service) {
 	apr_pool_t *pool;
-	service_tracker_customizer_t cust = NULL;
+	service_tracker_customizer_pt cust = NULL;
 
 	dependency->service = service;
 	dependency->tracker = NULL;
@@ -92,21 +92,21 @@ void serviceDependency_start(SERVICE_DEP
 	serviceTracker_open(dependency->tracker);
 }
 
-void serviceDependency_stop(SERVICE_DEPENDENCY dependency, SERVICE service) {
+void serviceDependency_stop(service_dependency_pt dependency, service_pt service) {
 	dependency->started = true;
 	serviceTracker_close(dependency->tracker);
 }
 
-celix_status_t serviceDependency_addingService(void * handle, service_reference_t reference, void **service) {
-	SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) handle;
+celix_status_t serviceDependency_addingService(void * handle, service_reference_pt reference, void **service) {
+	service_dependency_pt dependency = (service_dependency_pt) handle;
 	bundleContext_getService(dependency->context, reference, service);
 	dependency->reference = reference;
 	dependency->serviceInstance = *service;
 	return CELIX_SUCCESS;
 }
 
-celix_status_t serviceDependency_addedService(void * handle, service_reference_t reference, void * service) {
-	SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) handle;
+celix_status_t serviceDependency_addedService(void * handle, service_reference_pt reference, void * service) {
+	service_dependency_pt dependency = (service_dependency_pt) handle;
 	if (!dependency->available) {
 		dependency->available = true;
 		serviceComponent_dependencyAvailable(dependency->service, dependency);
@@ -119,14 +119,14 @@ celix_status_t serviceDependency_addedSe
 	return CELIX_SUCCESS;
 }
 
-void serviceDependency_invokeAdded(SERVICE_DEPENDENCY dependency) {
+void serviceDependency_invokeAdded(service_dependency_pt dependency) {
 	if (dependency->added != NULL) {
 		dependency->added(dependency->service->impl, dependency->reference, dependency->serviceInstance);
 	}
 }
 
-celix_status_t serviceDependency_modifiedService(void * handle, service_reference_t reference, void * service) {
-	SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) handle;
+celix_status_t serviceDependency_modifiedService(void * handle, service_reference_pt reference, void * service) {
+	service_dependency_pt dependency = (service_dependency_pt) handle;
 	dependency->reference = reference;
 	dependency->serviceInstance = service;
 	serviceComponent_dependencyChanged(dependency->service, dependency);
@@ -137,9 +137,9 @@ celix_status_t serviceDependency_modifie
 	return CELIX_SUCCESS;
 }
 
-celix_status_t serviceDependency_removedService(void * handle, service_reference_t reference, void * service) {
+celix_status_t serviceDependency_removedService(void * handle, service_reference_pt reference, void * service) {
 	bool result;
-	SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) handle;
+	service_dependency_pt dependency = (service_dependency_pt) handle;
 	if (dependency->available && serviceTracker_getService(dependency->tracker) == NULL) {
 		dependency->available = false;
 		serviceComponent_dependencyUnavailable(dependency->service, dependency);
@@ -153,13 +153,13 @@ celix_status_t serviceDependency_removed
 	return CELIX_SUCCESS;
 }
 
-void serviceDependency_invokeRemoved(SERVICE_DEPENDENCY dependency) {
+void serviceDependency_invokeRemoved(service_dependency_pt dependency) {
 	if (dependency->removed != NULL) {
 		dependency->removed(dependency->service->impl, dependency->reference, dependency->serviceInstance);
 	}
 }
 
-SERVICE_DEPENDENCY serviceDependency_setService(SERVICE_DEPENDENCY dependency, char * serviceName, char * filter) {
+service_dependency_pt serviceDependency_setService(service_dependency_pt dependency, char * serviceName, char * filter) {
 	dependency->trackedServiceName = serviceName;
 
 	if (filter != NULL) {
@@ -182,20 +182,20 @@ SERVICE_DEPENDENCY serviceDependency_set
 	return dependency;
 }
 
-SERVICE_DEPENDENCY serviceDependency_setRequired(SERVICE_DEPENDENCY dependency, bool required) {
+service_dependency_pt serviceDependency_setRequired(service_dependency_pt dependency, bool required) {
 	dependency->required = required;
 	return dependency;
 }
 
-SERVICE_DEPENDENCY serviceDependency_setAutoConfigure(SERVICE_DEPENDENCY dependency, void ** field) {
+service_dependency_pt serviceDependency_setAutoConfigure(service_dependency_pt dependency, void ** field) {
 	dependency->autoConfigureField = field;
 
 	return dependency;
 }
 
-SERVICE_DEPENDENCY serviceDependency_setCallbacks(SERVICE_DEPENDENCY dependency, void (*added)(void * handle, service_reference_t reference, void *),
-		void (*changed)(void * handle, service_reference_t reference, void *),
-		void (*removed)(void * handle, service_reference_t reference, void *)) {
+service_dependency_pt serviceDependency_setCallbacks(service_dependency_pt dependency, void (*added)(void * handle, service_reference_pt reference, void *),
+		void (*changed)(void * handle, service_reference_pt reference, void *),
+		void (*removed)(void * handle, service_reference_pt reference, void *)) {
 	dependency->added = added;
 	dependency->changed = changed;
 	dependency->removed = removed;

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=1492377&r1=1492376&r2=1492377&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 Wed Jun 12 19:08:50 2013
@@ -30,11 +30,11 @@
 #include "dependency_manager.h"
 #include "service_dependency.h"
 
-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);
+void * dm_create(bundle_context_pt context);
+void dm_init(void * userData, bundle_context_pt context, dependency_manager_pt manager);
+void dm_destroy(void * userData, bundle_context_pt context, dependency_manager_pt manager);
 
-SERVICE dependencyActivatorBase_createService(DEPENDENCY_MANAGER manager);
-SERVICE_DEPENDENCY dependencyActivatorBase_createServiceDependency(DEPENDENCY_MANAGER manager);
+service_pt dependencyActivatorBase_createService(dependency_manager_pt manager);
+service_dependency_pt dependencyActivatorBase_createServiceDependency(dependency_manager_pt manager);
 
 #endif /* DEPENDENCY_ACTIVATOR_BASE_H_ */

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=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h Wed Jun 12 19:08:50 2013
@@ -31,17 +31,17 @@
 #include "bundle_context.h"
 
 struct dependencyManager {
-	bundle_context_t context;
-	array_list_t services;
+	bundle_context_pt context;
+	array_list_pt services;
 };
 
-typedef struct dependencyManager * DEPENDENCY_MANAGER;
+typedef struct dependencyManager * dependency_manager_pt;
 
-DEPENDENCY_MANAGER dependencyManager_create(bundle_context_t context);
-void dependencyManager_add(DEPENDENCY_MANAGER manager, SERVICE service);
-void dependencyManager_remove(DEPENDENCY_MANAGER manager, SERVICE service);
+dependency_manager_pt dependencyManager_create(bundle_context_pt context);
+void dependencyManager_add(dependency_manager_pt manager, service_pt service);
+void dependencyManager_remove(dependency_manager_pt manager, service_pt service);
 
-void dm_startService(SERVICE service);
-void dm_stopService(SERVICE service);
+void dm_startService(service_pt service);
+void dm_stopService(service_pt service);
 
 #endif /* DEPENDENCY_MANAGER_H_ */

Modified: incubator/celix/trunk/dependency_manager/public/include/service_component.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/service_component.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/public/include/service_component.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/service_component.h Wed Jun 12 19:08:50 2013
@@ -29,11 +29,11 @@
 
 #define SERVICE_COMPONENT_NAME "ServiceComponent"
 
-typedef struct service * SERVICE;
+typedef struct service * service_pt;
 
 struct serviceComponent {
-	SERVICE handle;
-	char * (*getName)(SERVICE handle);
+	service_pt handle;
+	char * (*getName)(service_pt handle);
 };
 
 #endif /* SERVICE_COMPONENT_H_ */

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=1492377&r1=1492376&r2=1492377&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 Wed Jun 12 19:08:50 2013
@@ -33,13 +33,13 @@
 #include "properties.h"
 #include "dependency_manager.h"
 
-typedef struct state * STATE;
-typedef struct executor * EXECUTOR;
+typedef struct state * state_pt;
+typedef struct executor * executor_pt;
 
 struct service {
 	apr_pool_t *pool;
 
-	array_list_t dependencies;
+	array_list_pt dependencies;
 	void (*init)(void * userData);
 	void (*start)(void * userData);
 	void (*stop)(void * userData);
@@ -47,57 +47,57 @@ struct service {
 
 	char * serviceName;
 	void * impl;
-	properties_t properties;
+	properties_pt properties;
 
-	bundle_context_t context;
-	DEPENDENCY_MANAGER manager;
+	bundle_context_pt context;
+	dependency_manager_pt manager;
 
-	service_registration_t registration;
-	service_registration_t serviceRegistration;
+	service_registration_pt registration;
+	service_registration_pt serviceRegistration;
 
 	bool registered;
 
-	STATE state;
-	EXECUTOR executor;
+	state_pt state;
+	executor_pt executor;
 
 	apr_thread_mutex_t *mutex;
 };
 
-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);
-void serviceComponent_dependencyChanged(SERVICE service, SERVICE_DEPENDENCY dependency);
-void serviceComponent_dependencyUnavailable(SERVICE service, SERVICE_DEPENDENCY dependency);
-void serviceComponent_start(SERVICE service);
-void serviceComponent_stop(SERVICE service);
-SERVICE serviceComponent_setInterface(SERVICE service, char * serviceName, properties_t properties);
-SERVICE serviceComponent_setImplementation(SERVICE service, void * implementation);
-void serviceComponent_activateService(SERVICE service, void * arg);
-void serviceComponent_deactivateService(SERVICE service, void * arg);
-void serviceComponent_startTrackingOptional(SERVICE service, STATE state);
-void serviceComponent_stopTrackingOptional(SERVICE service, STATE state);
-void serviceComponent_startTrackingRequired(SERVICE service, void * arg);
-void serviceComponent_stopTrackingRequired(SERVICE service, void * arg);
-void serviceComponent_initService(SERVICE service);
-void serviceComponent_configureService(SERVICE service, STATE state);
-void serviceComponent_destroyService(SERVICE service, STATE state);
-void serviceComponent_registerService(SERVICE service);
-void serviceComponent_unregisterService(SERVICE service);
-void serviceComponent_updateInstance(SERVICE service, void * arg);
-char * serviceComponent_getName(SERVICE service);
-
-
-STATE state_create(array_list_t dependencies, bool active);
-void state_destroy(STATE state);
-bool state_isInactive(STATE state);
-bool state_isWaitingForRequired(STATE state);
-bool state_isTrackingOptional(STATE state);
-array_list_t state_getDependencies(STATE state);
-
-EXECUTOR executor_create(apr_pool_t *memory_pool);
-void executor_enqueue(EXECUTOR executor, SERVICE service, void (*function), void * argument);
-void executor_execute(EXECUTOR executor);
-void executor_scheduleNext(EXECUTOR executor);
+service_pt serviceComponent_create(bundle_context_pt context, dependency_manager_pt manager);
+service_pt serviceComponent_addServiceDependency(service_pt service, service_dependency_pt dependency);
+service_pt serviceComponent_removeServiceDependency(service_pt service, service_dependency_pt dependency);
+void serviceComponent_dependencyAvailable(service_pt service, service_dependency_pt dependency);
+void serviceComponent_dependencyChanged(service_pt service, service_dependency_pt dependency);
+void serviceComponent_dependencyUnavailable(service_pt service, service_dependency_pt dependency);
+void serviceComponent_start(service_pt service);
+void serviceComponent_stop(service_pt service);
+service_pt serviceComponent_setInterface(service_pt service, char * serviceName, properties_pt properties);
+service_pt serviceComponent_setImplementation(service_pt service, void * implementation);
+void serviceComponent_activateService(service_pt service, void * arg);
+void serviceComponent_deactivateService(service_pt service, void * arg);
+void serviceComponent_startTrackingOptional(service_pt service, state_pt state);
+void serviceComponent_stopTrackingOptional(service_pt service, state_pt state);
+void serviceComponent_startTrackingRequired(service_pt service, void * arg);
+void serviceComponent_stopTrackingRequired(service_pt service, void * arg);
+void serviceComponent_initService(service_pt service);
+void serviceComponent_configureService(service_pt service, state_pt state);
+void serviceComponent_destroyService(service_pt service, state_pt state);
+void serviceComponent_registerService(service_pt service);
+void serviceComponent_unregisterService(service_pt service);
+void serviceComponent_updateInstance(service_pt service, void * arg);
+char * serviceComponent_getName(service_pt service);
+
+
+state_pt state_create(array_list_pt dependencies, bool active);
+void state_destroy(state_pt state);
+bool state_isInactive(state_pt state);
+bool state_isWaitingForRequired(state_pt state);
+bool state_isTrackingOptional(state_pt state);
+array_list_pt state_getDependencies(state_pt state);
+
+executor_pt executor_create(apr_pool_t *memory_pool);
+void executor_enqueue(executor_pt executor, service_pt service, void (*function), void * argument);
+void executor_execute(executor_pt executor);
+void executor_scheduleNext(executor_pt executor);
 
 #endif /* SERVICE_COMPONENT_PRIVATE_H_ */

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=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/public/include/service_dependency.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/service_dependency.h Wed Jun 12 19:08:50 2013
@@ -34,40 +34,40 @@
 
 struct serviceDependency {
 	char * interface;
-	void (*added)(void * handle, service_reference_t reference, void *);
-	void (*changed)(void * handle, service_reference_t reference, void *);
-	void (*removed)(void * handle, service_reference_t reference, void *);
+	void (*added)(void * handle, service_reference_pt reference, void *);
+	void (*changed)(void * handle, service_reference_pt reference, void *);
+	void (*removed)(void * handle, service_reference_pt reference, void *);
 	void ** autoConfigureField;
 
 	bool started;
 	bool available;
 	bool required;
-	service_tracker_t tracker;
-	SERVICE service;
-	service_reference_t reference;
-	bundle_context_t context;
+	service_tracker_pt tracker;
+	service_pt service;
+	service_reference_pt reference;
+	bundle_context_pt context;
 	void * serviceInstance;
 	char * trackedServiceName;
 	char * trackedServiceFilter;
 };
 
-typedef struct serviceDependency * SERVICE_DEPENDENCY;
+typedef struct serviceDependency * service_dependency_pt;
 
-SERVICE_DEPENDENCY serviceDependency_create(bundle_context_t context);
-void * serviceDependency_getService(SERVICE_DEPENDENCY dependency);
+service_dependency_pt serviceDependency_create(bundle_context_pt context);
+void * serviceDependency_getService(service_dependency_pt dependency);
 
-SERVICE_DEPENDENCY serviceDependency_setRequired(SERVICE_DEPENDENCY dependency, bool required);
-SERVICE_DEPENDENCY serviceDependency_setService(SERVICE_DEPENDENCY dependency, char * serviceName, char * filter);
-SERVICE_DEPENDENCY serviceDependency_setCallbacks(SERVICE_DEPENDENCY dependency, void (*added)(void * handle, service_reference_t reference, void *),
-		void (*changed)(void * handle, service_reference_t reference, void *),
-		void (*removed)(void * handle, service_reference_t reference, void *));
-SERVICE_DEPENDENCY serviceDependency_setAutoConfigure(SERVICE_DEPENDENCY dependency, void ** field);
+service_dependency_pt serviceDependency_setRequired(service_dependency_pt dependency, bool required);
+service_dependency_pt serviceDependency_setService(service_dependency_pt dependency, char * serviceName, char * filter);
+service_dependency_pt serviceDependency_setCallbacks(service_dependency_pt dependency, void (*added)(void * handle, service_reference_pt reference, void *),
+		void (*changed)(void * handle, service_reference_pt reference, void *),
+		void (*removed)(void * handle, service_reference_pt reference, void *));
+service_dependency_pt serviceDependency_setAutoConfigure(service_dependency_pt dependency, void ** field);
 
-void serviceDependency_start(SERVICE_DEPENDENCY dependency, SERVICE service);
-void serviceDependency_stop(SERVICE_DEPENDENCY dependency, SERVICE service);
+void serviceDependency_start(service_dependency_pt dependency, service_pt service);
+void serviceDependency_stop(service_dependency_pt dependency, service_pt service);
 
-void serviceDependency_invokeAdded(SERVICE_DEPENDENCY dependency);
-void serviceDependency_invokeRemoved(SERVICE_DEPENDENCY dependency);
+void serviceDependency_invokeAdded(service_dependency_pt dependency);
+void serviceDependency_invokeRemoved(service_dependency_pt dependency);
 
 
 #endif /* SERVICE_DEPENDENCY_H_ */

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=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h Wed Jun 12 19:08:50 2013
@@ -31,20 +31,20 @@
 
 #include "bundle_context.h"
 
-typedef struct deployment_admin *deployment_admin_t;
+typedef struct deployment_admin *deployment_admin_pt;
 
 struct deployment_admin {
 	apr_pool_t *pool;
 	apr_thread_t *poller;
-	bundle_context_t context;
+	bundle_context_pt context;
 
 	bool running;
 	char *current;
-	hash_map_t packages;
+	hash_map_pt packages;
 	char *targetIdentification;
 	char *pollUrl;
 };
 
-celix_status_t deploymentAdmin_create(apr_pool_t *pool, bundle_context_t context, deployment_admin_t *admin);
+celix_status_t deploymentAdmin_create(apr_pool_t *pool, bundle_context_pt context, deployment_admin_pt *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=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/deployment_package.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/deployment_package.h Wed Jun 12 19:08:50 2013
@@ -36,43 +36,43 @@
 
 struct bundle_info {
 	char *path;
-	version_t version;
+	version_pt version;
 	char *symbolicName;
 	bool customizer;
 
-	properties_t attributes;
+	properties_pt attributes;
 };
 
-typedef struct bundle_info *bundle_info_t;
+typedef struct bundle_info *bundle_info_pt;
 
 struct resource_info {
 	char *path;
-	properties_t attributes;
+	properties_pt attributes;
 
 	char *resourceProcessor;
 };
 
-typedef struct resource_info *resource_info_t;
+typedef struct resource_info *resource_info_pt;
 
 struct deployment_package {
 	apr_pool_t *pool;
-	bundle_context_t context;
-	MANIFEST manifest;
-	array_list_t bundleInfos;
-	array_list_t resourceInfos;
-	hash_map_t nameToBundleInfo;
-	hash_map_t pathToEntry;
+	bundle_context_pt context;
+	manifest_pt manifest;
+	array_list_pt bundleInfos;
+	array_list_pt resourceInfos;
+	hash_map_pt nameToBundleInfo;
+	hash_map_pt pathToEntry;
 };
 
-typedef struct deployment_package *deployment_package_t;
+typedef struct deployment_package *deployment_package_pt;
 
-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_t *infos);
-celix_status_t deploymentPackage_getBundleInfoByName(deployment_package_t package, char *name, bundle_info_t *info);
-celix_status_t deploymentPackage_getResourceInfos(deployment_package_t package, array_list_t *infos);
-celix_status_t deploymentPackage_getResourceInfoByPath(deployment_package_t package, char *path, resource_info_t *info);
-celix_status_t deploymentPackage_getBundle(deployment_package_t package, char *name, bundle_t *bundle);
-celix_status_t deploymentPackage_getVersion(deployment_package_t package, version_t *version);
+celix_status_t deploymentPackage_create(apr_pool_t *pool, bundle_context_pt context, manifest_pt manifest, deployment_package_pt *package);
+celix_status_t deploymentPackage_getName(deployment_package_pt package, char **name);
+celix_status_t deploymentPackage_getBundleInfos(deployment_package_pt package, array_list_pt *infos);
+celix_status_t deploymentPackage_getBundleInfoByName(deployment_package_pt package, char *name, bundle_info_pt *info);
+celix_status_t deploymentPackage_getResourceInfos(deployment_package_pt package, array_list_pt *infos);
+celix_status_t deploymentPackage_getResourceInfoByPath(deployment_package_pt package, char *path, resource_info_pt *info);
+celix_status_t deploymentPackage_getBundle(deployment_package_pt package, char *name, bundle_pt *bundle);
+celix_status_t deploymentPackage_getVersion(deployment_package_pt package, version_pt *version);
 
 #endif /* DEPLOYMENT_PACKAGE_H_ */

Modified: incubator/celix/trunk/deployment_admin/private/include/log.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/log.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/log.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/log.h Wed Jun 12 19:08:50 2013
@@ -32,9 +32,9 @@
 #include "log_event.h"
 #include "log_store.h"
 
-typedef struct log *log_t;
+typedef struct log *log_pt;
 
-celix_status_t log_create(apr_pool_t *pool, log_store_t store, log_t *log);
-celix_status_t log_log(log_t log, unsigned int type, properties_t properties);
+celix_status_t log_create(apr_pool_t *pool, log_store_pt store, log_pt *log);
+celix_status_t log_log(log_pt log, unsigned int type, properties_pt properties);
 
 #endif /* LOG_H_ */

Modified: incubator/celix/trunk/deployment_admin/private/include/log_event.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/log_event.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/log_event.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/log_event.h Wed Jun 12 19:08:50 2013
@@ -35,9 +35,9 @@ struct log_event {
 	unsigned long id;
 	unsigned long time;
 	unsigned int type;
-	properties_t properties;
+	properties_pt properties;
 };
 
-typedef struct log_event *log_event_t;
+typedef struct log_event *log_event_pt;
 
 #endif /* LOG_EVENT_H_ */

Modified: incubator/celix/trunk/deployment_admin/private/include/log_store.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/log_store.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/log_store.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/log_store.h Wed Jun 12 19:08:50 2013
@@ -32,14 +32,14 @@
 #include "properties.h"
 #include "array_list.h"
 
-typedef struct log_store *log_store_t;
+typedef struct log_store *log_store_pt;
 
-celix_status_t logStore_create(apr_pool_t *pool, log_store_t *store);
-celix_status_t logStore_put(log_store_t store, unsigned int type, properties_t properties, log_event_t *event);
+celix_status_t logStore_create(apr_pool_t *pool, log_store_pt *store);
+celix_status_t logStore_put(log_store_pt store, unsigned int type, properties_pt properties, log_event_pt *event);
 
-celix_status_t logStore_getLogId(log_store_t store, unsigned long *id);
-celix_status_t logStore_getEvents(log_store_t store, array_list_t *events);
+celix_status_t logStore_getLogId(log_store_pt store, unsigned long *id);
+celix_status_t logStore_getEvents(log_store_pt store, array_list_pt *events);
 
-celix_status_t logStore_getHighestId(log_store_t store, long *id);
+celix_status_t logStore_getHighestId(log_store_pt store, long *id);
 
 #endif /* LOG_STORE_H_ */

Modified: incubator/celix/trunk/deployment_admin/private/include/log_sync.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/log_sync.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/log_sync.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/log_sync.h Wed Jun 12 19:08:50 2013
@@ -29,8 +29,8 @@
 
 #include "log_store.h"
 
-typedef struct log_sync *log_sync_t;
+typedef struct log_sync *log_sync_pt;
 
-celix_status_t logSync_create(apr_pool_t *pool, char *targetId, log_store_t store, log_sync_t *logSync);
+celix_status_t logSync_create(apr_pool_t *pool, char *targetId, log_store_pt store, log_sync_pt *logSync);
 
 #endif /* LOG_SYNC_H_ */

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=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c Wed Jun 12 19:08:50 2013
@@ -56,17 +56,17 @@ static void *APR_THREAD_FUNC deploymentA
 celix_status_t deploymentAdmin_download(char * url, char **inputFile);
 size_t deploymentAdmin_writeData(void *ptr, size_t size, size_t nmemb, FILE *stream);
 static celix_status_t deploymentAdmin_deleteTree(char * directory, apr_pool_t *mp);
-celix_status_t deploymentAdmin_readVersions(deployment_admin_t admin, array_list_t *versions);
+celix_status_t deploymentAdmin_readVersions(deployment_admin_pt admin, array_list_pt *versions);
 
-celix_status_t deploymentAdmin_stopDeploymentPackageBundles(deployment_admin_t admin, deployment_package_t target);
-celix_status_t deploymentAdmin_updateDeploymentPackageBundles(deployment_admin_t admin, deployment_package_t source);
-celix_status_t deploymentAdmin_startDeploymentPackageCustomizerBundles(deployment_admin_t admin, deployment_package_t source, deployment_package_t target);
-celix_status_t deploymentAdmin_processDeploymentPackageResources(deployment_admin_t admin, deployment_package_t source);
-celix_status_t deploymentAdmin_dropDeploymentPackageResources(deployment_admin_t admin, deployment_package_t source, deployment_package_t target);
-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_stopDeploymentPackageBundles(deployment_admin_pt admin, deployment_package_pt target);
+celix_status_t deploymentAdmin_updateDeploymentPackageBundles(deployment_admin_pt admin, deployment_package_pt source);
+celix_status_t deploymentAdmin_startDeploymentPackageCustomizerBundles(deployment_admin_pt admin, deployment_package_pt source, deployment_package_pt target);
+celix_status_t deploymentAdmin_processDeploymentPackageResources(deployment_admin_pt admin, deployment_package_pt source);
+celix_status_t deploymentAdmin_dropDeploymentPackageResources(deployment_admin_pt admin, deployment_package_pt source, deployment_package_pt target);
+celix_status_t deploymentAdmin_dropDeploymentPackageBundles(deployment_admin_pt admin, deployment_package_pt source, deployment_package_pt target);
+celix_status_t deploymentAdmin_startDeploymentPackageBundles(deployment_admin_pt admin, deployment_package_pt source);
 
-celix_status_t deploymentAdmin_create(apr_pool_t *pool, bundle_context_t context, deployment_admin_t *admin) {
+celix_status_t deploymentAdmin_create(apr_pool_t *pool, bundle_context_pt context, deployment_admin_pt *admin) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *subpool;
 	apr_pool_create(&subpool, pool);
@@ -95,9 +95,9 @@ celix_status_t deploymentAdmin_create(ap
 			} else {
 				(*admin)->pollUrl = apr_pstrcat(subpool, url, (*admin)->targetIdentification, VERSIONS, NULL);
 
-//				log_store_t store = NULL;
-//				log_t log = NULL;
-//				log_sync_t sync = NULL;
+//				log_store_pt store = NULL;
+//				log_pt log = NULL;
+//				log_sync_pt sync = NULL;
 //				logStore_create(subpool, &store);
 //				log_create(subpool, store, &log);
 //				logSync_create(subpool, (*admin)->targetIdentification, store, &sync);
@@ -114,11 +114,11 @@ celix_status_t deploymentAdmin_create(ap
 }
 
 static void *APR_THREAD_FUNC deploymentAdmin_poll(apr_thread_t *thd, void *deploymentAdmin) {
-	deployment_admin_t admin = deploymentAdmin;
+	deployment_admin_pt admin = deploymentAdmin;
 
 	while (admin->running) {
 		//poll ace
-		array_list_t versions = NULL;
+		array_list_pt versions = NULL;
 		deploymentAdmin_readVersions(admin, &versions);
 
 		char *last = arrayList_get(versions, arrayList_size(versions) - 1);
@@ -149,14 +149,14 @@ static void *APR_THREAD_FUNC deploymentA
 					// TODO: update to use bundle cache DataFile instead of module entries.
 					unzip_extractDeploymentPackage(test, tmpDir);
 					char *manifest = apr_pstrcat(admin->pool, tmpDir, "/META-INF/MANIFEST.MF", NULL);
-					MANIFEST mf = NULL;
+					manifest_pt mf = NULL;
 					manifest_createFromFile(admin->pool, manifest, &mf);
-					deployment_package_t source = NULL;
+					deployment_package_pt source = NULL;
 					deploymentPackage_create(admin->pool, admin->context, mf, &source);
 					char *name = NULL;
 					deploymentPackage_getName(source, &name);
 
-					bundle_t bundle = NULL;
+					bundle_pt bundle = NULL;
 					bundleContext_getBundle(admin->context, &bundle);
 					char *entry = NULL;
 					bundle_getEntry(bundle, "/", admin->pool, &entry);
@@ -169,7 +169,7 @@ static void *APR_THREAD_FUNC deploymentA
 						printf("No success\n");
 					}
 
-					deployment_package_t target = hashMap_get(admin->packages, name);
+					deployment_package_pt target = hashMap_get(admin->packages, name);
 					if (target == NULL) {
 //						target = empty package
 					}
@@ -220,7 +220,7 @@ size_t deploymentAdmin_parseVersions(voi
 	return realsize;
 }
 
-celix_status_t deploymentAdmin_readVersions(deployment_admin_t admin, array_list_t *versions) {
+celix_status_t deploymentAdmin_readVersions(deployment_admin_pt admin, array_list_pt *versions) {
 	celix_status_t status = CELIX_SUCCESS;
 	arrayList_create(admin->pool, versions);
 	CURL *curl;
@@ -324,16 +324,16 @@ static celix_status_t deploymentAdmin_de
 	return status;
 }
 
-celix_status_t deploymentAdmin_stopDeploymentPackageBundles(deployment_admin_t admin, deployment_package_t target) {
+celix_status_t deploymentAdmin_stopDeploymentPackageBundles(deployment_admin_pt admin, deployment_package_pt target) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (target != NULL) {
-		array_list_t infos = NULL;
+		array_list_pt infos = NULL;
 		deploymentPackage_getBundleInfos(target, &infos);
 		int i;
 		for (i = 0; i < arrayList_size(infos); i++) {
-			bundle_t bundle = NULL;
-			bundle_info_t info = arrayList_get(infos, i);
+			bundle_pt bundle = NULL;
+			bundle_info_pt info = arrayList_get(infos, i);
 			deploymentPackage_getBundle(target, info->symbolicName, &bundle);
 			if (bundle != NULL) {
 				bundle_stop(bundle, 0);
@@ -346,15 +346,15 @@ celix_status_t deploymentAdmin_stopDeplo
 	return status;
 }
 
-celix_status_t deploymentAdmin_updateDeploymentPackageBundles(deployment_admin_t admin, deployment_package_t source) {
+celix_status_t deploymentAdmin_updateDeploymentPackageBundles(deployment_admin_pt admin, deployment_package_pt source) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	array_list_t infos = NULL;
+	array_list_pt infos = NULL;
 	deploymentPackage_getBundleInfos(source, &infos);
 	int i;
 	for (i = 0; i < arrayList_size(infos); i++) {
-		bundle_t bundle = NULL;
-		bundle_info_t info = arrayList_get(infos, i);
+		bundle_pt bundle = NULL;
+		bundle_info_pt info = arrayList_get(infos, i);
 
 		bundleContext_getBundle(admin->context, &bundle);
 		char *entry = NULL;
@@ -364,7 +364,7 @@ celix_status_t deploymentAdmin_updateDep
 		char *bundlePath = apr_pstrcat(admin->pool, entry, "repo/", name, "/", info->path, NULL);
 		char *bsn = apr_pstrcat(admin->pool, "osgi-dp:", info->symbolicName, NULL);
 
-		bundle_t updateBundle = NULL;
+		bundle_pt updateBundle = NULL;
 		deploymentPackage_getBundle(source, info->symbolicName, &updateBundle);
 		if (updateBundle != NULL) {
 			//printf("Update bundle from: %s\n", bundlePath);
@@ -378,12 +378,12 @@ celix_status_t deploymentAdmin_updateDep
 	return status;
 }
 
-celix_status_t deploymentAdmin_startDeploymentPackageCustomizerBundles(deployment_admin_t admin, deployment_package_t source, deployment_package_t target) {
+celix_status_t deploymentAdmin_startDeploymentPackageCustomizerBundles(deployment_admin_pt admin, deployment_package_pt source, deployment_package_pt target) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	apr_pool_t *tmpPool = NULL;
-	array_list_t bundles = NULL;
-	array_list_t sourceInfos = NULL;
+	array_list_pt bundles = NULL;
+	array_list_pt sourceInfos = NULL;
 
 	apr_pool_create(&tmpPool, admin->pool);
 	arrayList_create(tmpPool, &bundles);
@@ -391,9 +391,9 @@ celix_status_t deploymentAdmin_startDepl
 	deploymentPackage_getBundleInfos(source, &sourceInfos);
 	int i;
 	for (i = 0; i < arrayList_size(sourceInfos); i++) {
-		bundle_info_t sourceInfo = arrayList_get(sourceInfos, i);
+		bundle_info_pt sourceInfo = arrayList_get(sourceInfos, i);
 		if (sourceInfo->customizer) {
-			bundle_t bundle = NULL;
+			bundle_pt bundle = NULL;
 			deploymentPackage_getBundle(source, sourceInfo->symbolicName, &bundle);
 			if (bundle != NULL) {
 				arrayList_add(bundles, bundle);
@@ -402,12 +402,12 @@ celix_status_t deploymentAdmin_startDepl
 	}
 
 	if (target != NULL) {
-		array_list_t targetInfos = NULL;
+		array_list_pt targetInfos = NULL;
 		deploymentPackage_getBundleInfos(target, &targetInfos);
 		for (i = 0; i < arrayList_size(targetInfos); i++) {
-			bundle_info_t targetInfo = arrayList_get(targetInfos, i);
+			bundle_info_pt targetInfo = arrayList_get(targetInfos, i);
 			if (targetInfo->customizer) {
-				bundle_t bundle = NULL;
+				bundle_pt bundle = NULL;
 				deploymentPackage_getBundle(target, targetInfo->symbolicName, &bundle);
 				if (bundle != NULL) {
 					arrayList_add(bundles, bundle);
@@ -417,7 +417,7 @@ celix_status_t deploymentAdmin_startDepl
 	}
 
 	for (i = 0; i < arrayList_size(bundles); i++) {
-		bundle_t bundle = arrayList_get(bundles, i);
+		bundle_pt bundle = arrayList_get(bundles, i);
 		bundle_start(bundle, 0);
 	}
 
@@ -426,16 +426,16 @@ celix_status_t deploymentAdmin_startDepl
 	return status;
 }
 
-celix_status_t deploymentAdmin_processDeploymentPackageResources(deployment_admin_t admin, deployment_package_t source) {
+celix_status_t deploymentAdmin_processDeploymentPackageResources(deployment_admin_pt admin, deployment_package_pt source) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	array_list_t infos = NULL;
+	array_list_pt infos = NULL;
 	deploymentPackage_getResourceInfos(source, &infos);
 	int i;
 	for (i = 0; i < arrayList_size(infos); i++) {
-		resource_info_t info = arrayList_get(infos, i);
+		resource_info_pt info = arrayList_get(infos, i);
 		apr_pool_t *tmpPool = NULL;
-		array_list_t services = NULL;
+		array_list_pt services = NULL;
 		char *filter = NULL;
 
 		apr_pool_create(&tmpPool, admin->pool);
@@ -444,17 +444,17 @@ celix_status_t deploymentAdmin_processDe
 		status = bundleContext_getServiceReferences(admin->context, RESOURCE_PROCESSOR_SERVICE, filter, &services);
 		if (status == CELIX_SUCCESS) {
 			if (services != NULL && arrayList_size(services) > 0) {
-				service_reference_t ref = arrayList_get(services, 0);
+				service_reference_pt ref = arrayList_get(services, 0);
 				// In Felix a check is done to assure the processor belongs to the deployment package
 				// Is this according to spec?
 				void *processorP = NULL;
 				status = bundleContext_getService(admin->context, ref, &processorP);
 				if (status == CELIX_SUCCESS) {
-					bundle_t bundle = NULL;
+					bundle_pt bundle = NULL;
 					char *entry = NULL;
 					char *name = NULL;
 					char *packageName = NULL;
-					resource_processor_service_t processor = processorP;
+					resource_processor_service_pt processor = processorP;
 
 					bundleContext_getBundle(admin->context, &bundle);
 					bundle_getEntry(bundle, "/", admin->pool, &entry);
@@ -475,20 +475,20 @@ celix_status_t deploymentAdmin_processDe
 	return status;
 }
 
-celix_status_t deploymentAdmin_dropDeploymentPackageResources(deployment_admin_t admin, deployment_package_t source, deployment_package_t target) {
+celix_status_t deploymentAdmin_dropDeploymentPackageResources(deployment_admin_pt admin, deployment_package_pt source, deployment_package_pt target) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (target != NULL) {
-		array_list_t infos = NULL;
+		array_list_pt infos = NULL;
 		deploymentPackage_getResourceInfos(target, &infos);
 		int i;
 		for (i = 0; i < arrayList_size(infos); i++) {
-			resource_info_t info = arrayList_get(infos, i);
-			resource_info_t sourceInfo = NULL;
+			resource_info_pt info = arrayList_get(infos, i);
+			resource_info_pt sourceInfo = NULL;
 			deploymentPackage_getResourceInfoByPath(source, info->path, &sourceInfo);
 			if (sourceInfo == NULL) {
 				apr_pool_t *tmpPool = NULL;
-				array_list_t services = NULL;
+				array_list_pt services = NULL;
 				char *filter = NULL;
 
 
@@ -498,15 +498,15 @@ celix_status_t deploymentAdmin_dropDeplo
 				status = bundleContext_getServiceReferences(admin->context, RESOURCE_PROCESSOR_SERVICE, filter, &services);
 				if (status == CELIX_SUCCESS) {
 					if (services != NULL && arrayList_size(services) > 0) {
-						service_reference_t ref = arrayList_get(services, 0);
+						service_reference_pt ref = arrayList_get(services, 0);
 						// In Felix a check is done to assure the processor belongs to the deployment package
 						// Is this according to spec?
 						void *processorP = NULL;
 						status = bundleContext_getService(admin->context, ref, &processorP);
 						if (status == CELIX_SUCCESS) {
-							bundle_t bundle = NULL;
+							bundle_pt bundle = NULL;
 							char *packageName = NULL;
-							resource_processor_service_t processor = processorP;
+							resource_processor_service_pt processor = processorP;
 
 							deploymentPackage_getName(source, &packageName);
 							processor->begin(processor->processor, packageName);
@@ -522,20 +522,20 @@ celix_status_t deploymentAdmin_dropDeplo
 	return status;
 }
 
-celix_status_t deploymentAdmin_dropDeploymentPackageBundles(deployment_admin_t admin, deployment_package_t source, deployment_package_t target) {
+celix_status_t deploymentAdmin_dropDeploymentPackageBundles(deployment_admin_pt admin, deployment_package_pt source, deployment_package_pt target) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (target != NULL) {
-		array_list_t targetInfos = NULL;
+		array_list_pt targetInfos = NULL;
 		deploymentPackage_getBundleInfos(target, &targetInfos);
 		int i;
 		for (i = 0; i < arrayList_size(targetInfos); i++) {
-			bundle_info_t targetInfo = arrayList_get(targetInfos, i);
+			bundle_info_pt targetInfo = arrayList_get(targetInfos, i);
 			if (!targetInfo->customizer) {
-				bundle_info_t info = NULL;
+				bundle_info_pt info = NULL;
 				deploymentPackage_getBundleInfoByName(source, targetInfo->symbolicName, &info);
 				if (info == NULL) {
-					bundle_t bundle = NULL;
+					bundle_pt bundle = NULL;
 					deploymentPackage_getBundle(target, targetInfo->symbolicName, &bundle);
 					bundle_uninstall(bundle);
 				}
@@ -546,15 +546,15 @@ celix_status_t deploymentAdmin_dropDeplo
 	return status;
 }
 
-celix_status_t deploymentAdmin_startDeploymentPackageBundles(deployment_admin_t admin, deployment_package_t source) {
+celix_status_t deploymentAdmin_startDeploymentPackageBundles(deployment_admin_pt admin, deployment_package_pt source) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	array_list_t infos = NULL;
+	array_list_pt infos = NULL;
 	deploymentPackage_getBundleInfos(source, &infos);
 	int i;
 	for (i = 0; i < arrayList_size(infos); i++) {
-		bundle_t bundle = NULL;
-		bundle_info_t info = arrayList_get(infos, i);
+		bundle_pt bundle = NULL;
+		bundle_info_pt info = arrayList_get(infos, i);
 		if (!info->customizer) {
 			deploymentPackage_getBundle(source, info->symbolicName, &bundle);
 			if (bundle != NULL) {

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=1492377&r1=1492376&r2=1492377&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 Wed Jun 12 19:08:50 2013
@@ -30,10 +30,10 @@
 
 struct activator {
 	apr_pool_t *pool;
-	deployment_admin_t admin;
+	deployment_admin_pt admin;
 };
 
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt 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_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt 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_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }



Mime
View raw message