celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1601103 [3/3] - in /incubator/celix/trunk: dependency_manager/private/src/ deployment_admin/private/src/ device_access/device_access/private/src/ device_access/example/refining_driver/private/src/ event_admin/event_admin/private/src/ event...
Date Sat, 07 Jun 2014 12:44:34 GMT
Modified: incubator/celix/trunk/framework/private/test/version_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/version_test.cpp?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/version_test.cpp (original)
+++ incubator/celix/trunk/framework/private/test/version_test.cpp Sat Jun  7 12:44:31 2014
@@ -64,11 +64,11 @@ TEST(version, create) {
 	std::string str;
 
 	str = "abc";
-	status = version_createVersion(NULL, 1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersion(1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_ILLEGAL_ARGUMENT, status);
 
 	str = "abc";
-	status = version_createVersion(pool, 1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersion(1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
     LONGS_EQUAL(1, version->major);
@@ -77,7 +77,7 @@ TEST(version, create) {
 	STRCMP_EQUAL("abc", version->qualifier);
 
 	version = NULL;
-	status = version_createVersion(pool, 1, 2, 3, NULL, &version);
+	status = version_createVersion(1, 2, 3, NULL, &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 	LONGS_EQUAL(1, version->major);
@@ -86,11 +86,11 @@ TEST(version, create) {
 	STRCMP_EQUAL("", version->qualifier);
 
 	str = "abc";
-	status = version_createVersion(pool, 1, -2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersion(1, -2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_ILLEGAL_ARGUMENT, status);
 
 	str = "abc|xyz";
-	status = version_createVersion(pool, 1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersion(1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_ILLEGAL_ARGUMENT, status);
 }
 
@@ -100,9 +100,9 @@ TEST(version, clone) {
 	std::string str;
 
 	str = "abc";
-	status = version_createVersion(pool, 1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersion(1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
-	status = version_clone(version, pool, &clone);
+	status = version_clone(version, &clone);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
     LONGS_EQUAL(1, clone->major);
@@ -117,30 +117,30 @@ TEST(version, createFromString) {
 	std::string str;
 
 	str = "1";
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 	LONGS_EQUAL(1, version->major);
 
 	str = "a";
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_ILLEGAL_ARGUMENT, status);
 
 	str = "1.a";
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_ILLEGAL_ARGUMENT, status);
 
 	str = "1.1.a";
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_ILLEGAL_ARGUMENT, status);
 
 	str = "-1";
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_ILLEGAL_ARGUMENT, status);
 
 	str = "1.2";
 	version = NULL;
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 	LONGS_EQUAL(1, version->major);
@@ -148,7 +148,7 @@ TEST(version, createFromString) {
 
 	str = "1.2.3";
 	version = NULL;
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 	LONGS_EQUAL(1, version->major);
@@ -157,7 +157,7 @@ TEST(version, createFromString) {
 
 	str = "1.2.3.abc";
 	version = NULL;
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
     LONGS_EQUAL(1, version->major);
@@ -167,7 +167,7 @@ TEST(version, createFromString) {
 
 	str = "1.2.3.abc_xyz";
 	version = NULL;
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
     LONGS_EQUAL(1, version->major);
@@ -177,7 +177,7 @@ TEST(version, createFromString) {
 
 	str = "1.2.3.abc-xyz";
 	version = NULL;
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
     LONGS_EQUAL(1, version->major);
@@ -186,7 +186,7 @@ TEST(version, createFromString) {
 	STRCMP_EQUAL("abc-xyz", version->qualifier);
 
 	str = "1.2.3.abc|xyz";
-	status = version_createVersionFromString(pool, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersionFromString(apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_ILLEGAL_ARGUMENT, status);
 }
 
@@ -194,7 +194,7 @@ TEST(version, createEmptyVersion) {
 	version_pt version = NULL;
 	celix_status_t status = CELIX_SUCCESS;
 
-	status = version_createEmptyVersion(pool, &version);
+	status = version_createEmptyVersion(&version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
     LONGS_EQUAL(0, version->major);
@@ -211,7 +211,7 @@ TEST(version, getters) {
 	char *qualifier;
 
 	str = "abc";
-	status = version_createVersion(pool, 1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersion(1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 
@@ -236,14 +236,14 @@ TEST(version, compare) {
 
 	// Base version to compare
 	str = "abc";
-	status = version_createVersion(pool, 1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersion(1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 
 	// Compare equality
 	str = "abc";
 	compare = NULL;
-	status = version_createVersion(pool, 1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &compare);
+	status = version_createVersion(1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &compare);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 	status = version_compareTo(version, compare, &result);
@@ -253,7 +253,7 @@ TEST(version, compare) {
 	// Compare against a higher version
 	str = "bcd";
 	compare = NULL;
-	status = version_createVersion(pool, 1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &compare);
+	status = version_createVersion(1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &compare);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 	status = version_compareTo(version, compare, &result);
@@ -263,7 +263,7 @@ TEST(version, compare) {
 	// Compare againts a lower version
 	str = "abc";
 	compare = NULL;
-	status = version_createVersion(pool, 1, 1, 3, apr_pstrdup(pool, (const char *) str.c_str()), &compare);
+	status = version_createVersion(1, 1, 3, apr_pstrdup(pool, (const char *) str.c_str()), &compare);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 	status = version_compareTo(version, compare, &result);
@@ -278,21 +278,21 @@ TEST(version, toString) {
 	char *result = NULL;
 
 	str = "abc";
-	status = version_createVersion(pool, 1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
+	status = version_createVersion(1, 2, 3, apr_pstrdup(pool, (const char *) str.c_str()), &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 
-	status = version_toString(version, pool, &result);
+	status = version_toString(version, &result);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(result != NULL);
 	STRCMP_EQUAL("1.2.3.abc", result);
 
 	version = NULL;
-	status = version_createVersion(pool, 1, 2, 3, NULL, &version);
+	status = version_createVersion(1, 2, 3, NULL, &version);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(version != NULL);
 
-	status = version_toString(version, pool, &result);
+	status = version_toString(version, &result);
 	LONGS_EQUAL(CELIX_SUCCESS, status);
 	CHECK_C(result != NULL);
 	STRCMP_EQUAL("1.2.3", result);

Modified: incubator/celix/trunk/framework/public/include/bundle.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle.h Sat Jun  7 12:44:31 2014
@@ -27,8 +27,6 @@
 #ifndef BUNDLE_H_
 #define BUNDLE_H_
 
-#include <apr_general.h>
-
 typedef struct bundle * bundle_pt;
 
 #include "celix_errno.h"
@@ -42,8 +40,8 @@ typedef struct bundle * bundle_pt;
 #include "celix_log.h"
 #include "celix_threads.h"
 
-FRAMEWORK_EXPORT celix_status_t bundle_create(bundle_pt * bundle, framework_logger_pt logger, apr_pool_t *mp);
-FRAMEWORK_EXPORT celix_status_t bundle_createFromArchive(bundle_pt * bundle, framework_pt framework, bundle_archive_pt archive, apr_pool_t *bundlePool);
+FRAMEWORK_EXPORT celix_status_t bundle_create(bundle_pt * bundle, framework_logger_pt logger);
+FRAMEWORK_EXPORT celix_status_t bundle_createFromArchive(bundle_pt * bundle, framework_pt framework, bundle_archive_pt archive);
 FRAMEWORK_EXPORT celix_status_t bundle_destroy(bundle_pt bundle);
 
 FRAMEWORK_EXPORT celix_status_t bundle_isSystemBundle(bundle_pt bundle, bool *systemBundle);
@@ -56,7 +54,7 @@ FRAMEWORK_EXPORT activator_pt bundle_get
 FRAMEWORK_EXPORT celix_status_t bundle_setActivator(bundle_pt bundle, activator_pt activator);
 FRAMEWORK_EXPORT celix_status_t bundle_getContext(bundle_pt bundle, bundle_context_pt *context);
 FRAMEWORK_EXPORT celix_status_t bundle_setContext(bundle_pt bundle, bundle_context_pt context);
-FRAMEWORK_EXPORT celix_status_t bundle_getEntry(bundle_pt bundle, char * name, apr_pool_t *pool, char **entry);
+FRAMEWORK_EXPORT celix_status_t bundle_getEntry(bundle_pt bundle, char * name, char **entry);
 
 FRAMEWORK_EXPORT celix_status_t bundle_start(bundle_pt bundle);
 FRAMEWORK_EXPORT celix_status_t bundle_startWithOptions(bundle_pt bundle, int options);
@@ -92,11 +90,9 @@ FRAMEWORK_EXPORT celix_status_t bundle_c
 FRAMEWORK_EXPORT celix_status_t bundle_refresh(bundle_pt bundle);
 FRAMEWORK_EXPORT celix_status_t bundle_getBundleId(bundle_pt bundle, long *id);
 
-FRAMEWORK_EXPORT celix_status_t bundle_getRegisteredServices(bundle_pt bundle, apr_pool_t *pool, array_list_pt *list);
+FRAMEWORK_EXPORT celix_status_t bundle_getRegisteredServices(bundle_pt bundle, array_list_pt *list);
 FRAMEWORK_EXPORT celix_status_t bundle_getServicesInUse(bundle_pt bundle, array_list_pt *list);
 
-FRAMEWORK_EXPORT celix_status_t bundle_getMemoryPool(bundle_pt bundle, apr_pool_t **pool);
-
 FRAMEWORK_EXPORT celix_status_t bundle_setFramework(bundle_pt bundle, framework_pt framework);
 FRAMEWORK_EXPORT celix_status_t bundle_getFramework(bundle_pt bundle, framework_pt *framework);
 

Modified: incubator/celix/trunk/framework/public/include/bundle_archive.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle_archive.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle_archive.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle_archive.h Sat Jun  7 12:44:31 2014
@@ -27,6 +27,8 @@
 #ifndef BUNDLE_ARCHIVE_H_
 #define BUNDLE_ARCHIVE_H_
 
+#include <time.h>
+
 #include "bundle_revision.h"
 #include "bundle_state.h"
 #include "celix_errno.h"

Modified: incubator/celix/trunk/framework/public/include/bundle_context.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle_context.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle_context.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle_context.h Sat Jun  7 12:44:31 2014
@@ -41,7 +41,7 @@ typedef struct bundleContext *bundle_con
 #include "properties.h"
 #include "array_list.h"
 
-celix_status_t bundleContext_create(framework_pt framework, framework_logger_pt, bundle_pt bundle, bundle_context_pt *bundle_context);
+celix_status_t bundleContext_create(apr_pool_t *pool, framework_pt framework, framework_logger_pt, bundle_pt bundle, bundle_context_pt *bundle_context);
 celix_status_t bundleContext_destroy(bundle_context_pt context);
 
 FRAMEWORK_EXPORT celix_status_t bundleContext_getBundle(bundle_context_pt context, bundle_pt *bundle);

Modified: incubator/celix/trunk/framework/public/include/bundle_listener.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle_listener.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle_listener.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle_listener.h Sat Jun  7 12:44:31 2014
@@ -29,15 +29,12 @@
 #ifndef BUNDLE_LISTENER_H_
 #define BUNDLE_LISTENER_H_
 
-#include <apr_general.h>
-
 typedef struct bundle_listener *bundle_listener_pt;
 
 #include "celix_errno.h"
 #include "bundle_event.h"
 
 struct bundle_listener {
-	apr_pool_t *pool;
 	void * handle;
 	celix_status_t (*bundleChanged)(void * listener, bundle_event_pt event);
 };

Modified: incubator/celix/trunk/framework/public/include/bundle_revision.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle_revision.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle_revision.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle_revision.h Sat Jun  7 12:44:31 2014
@@ -30,7 +30,6 @@
 #define BUNDLE_REVISION_H_
 
 #include <stdio.h>
-#include <apr_pools.h>
 
 #include "celix_errno.h"
 #include "manifest.h"

Modified: incubator/celix/trunk/framework/public/include/celix_errno.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/celix_errno.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/celix_errno.h (original)
+++ incubator/celix/trunk/framework/public/include/celix_errno.h Sat Jun  7 12:44:31 2014
@@ -34,8 +34,6 @@
 #include <stddef.h>
 #include <errno.h>
 
-#include <apr_errno.h>
-
 #include "framework_exports.h"
 
 /*!
@@ -58,7 +56,7 @@ struct celix_status {
 /*!
  * Status type returned by all functions in Celix
  */
-typedef apr_status_t celix_status_t;
+typedef int celix_status_t;
 
 /*!
  * Return a readable string for the given error code.
@@ -74,7 +72,7 @@ FRAMEWORK_EXPORT char *celix_strerror(ce
 /*!
  * Starting point for Celix errors.
  */
-#define CELIX_START_ERROR APR_OS_START_USERERR
+#define CELIX_START_ERROR 70000
 
 /*!
  * The range for Celix errors.

Modified: incubator/celix/trunk/framework/public/include/framework.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/framework.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/framework.h (original)
+++ incubator/celix/trunk/framework/public/include/framework.h Sat Jun  7 12:44:31 2014
@@ -30,6 +30,8 @@
 typedef struct activator * activator_pt;
 typedef struct framework * framework_pt;
 
+#include <apr_general.h>
+
 #include "celix_errno.h"
 #include "framework_exports.h"
 #include "bundle.h"

Modified: incubator/celix/trunk/framework/public/include/framework_listener.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/framework_listener.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/framework_listener.h (original)
+++ incubator/celix/trunk/framework/public/include/framework_listener.h Sat Jun  7 12:44:31 2014
@@ -29,15 +29,12 @@
 #ifndef FRAMEWORK_LISTENER_H_
 #define FRAMEWORK_LISTENER_H_
 
-#include <apr_general.h>
-
 typedef struct framework_listener *framework_listener_pt;
 
 #include "celix_errno.h"
 #include "framework_event.h"
 
 struct framework_listener {
-	apr_pool_t *pool;
 	void * handle;
 	celix_status_t (*frameworkEvent)(void * listener, framework_event_pt event);
 };

Modified: incubator/celix/trunk/framework/public/include/manifest.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/manifest.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/manifest.h (original)
+++ incubator/celix/trunk/framework/public/include/manifest.h Sat Jun  7 12:44:31 2014
@@ -27,8 +27,6 @@
 #ifndef MANIFEST_H_
 #define MANIFEST_H_
 
-#include <apr_general.h>
-
 #include "properties.h"
 #include "celix_errno.h"
 #include "framework_exports.h"

Modified: incubator/celix/trunk/framework/public/include/service_factory.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_factory.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_factory.h (original)
+++ incubator/celix/trunk/framework/public/include/service_factory.h Sat Jun  7 12:44:31 2014
@@ -27,8 +27,6 @@
 #ifndef SERVICE_FACTORY_H_
 #define SERVICE_FACTORY_H_
 
-#include <apr_general.h>
-
 typedef struct service_factory * service_factory_pt;
 
 #include "celix_errno.h"

Modified: incubator/celix/trunk/framework/public/include/service_listener.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_listener.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_listener.h (original)
+++ incubator/celix/trunk/framework/public/include/service_listener.h Sat Jun  7 12:44:31 2014
@@ -29,15 +29,12 @@
 #ifndef SERVICE_LISTENER_H_
 #define SERVICE_LISTENER_H_
 
-#include <apr_general.h>
-
 typedef struct serviceListener * service_listener_pt;
 
 #include "celix_errno.h"
 #include "service_event.h"
 
 struct serviceListener {
-	apr_pool_t *pool;
 	void * handle;
 	celix_status_t (*serviceChanged)(void * listener, service_event_pt event);
 };

Modified: incubator/celix/trunk/framework/public/include/service_tracker.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_tracker.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_tracker.h (original)
+++ incubator/celix/trunk/framework/public/include/service_tracker.h Sat Jun  7 12:44:31 2014
@@ -35,8 +35,8 @@
 
 typedef struct serviceTracker * service_tracker_pt;
 
-FRAMEWORK_EXPORT celix_status_t serviceTracker_create(apr_pool_t *pool, bundle_context_pt context, char * service, service_tracker_customizer_pt customizer, service_tracker_pt *tracker);
-FRAMEWORK_EXPORT celix_status_t serviceTracker_createWithFilter(apr_pool_t *pool, bundle_context_pt context, char * filter, service_tracker_customizer_pt customizer, service_tracker_pt *tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_create(bundle_context_pt context, char * service, service_tracker_customizer_pt customizer, service_tracker_pt *tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_createWithFilter(bundle_context_pt context, char * filter, service_tracker_customizer_pt customizer, service_tracker_pt *tracker);
 
 FRAMEWORK_EXPORT celix_status_t serviceTracker_open(service_tracker_pt tracker);
 FRAMEWORK_EXPORT celix_status_t serviceTracker_close(service_tracker_pt tracker);

Modified: incubator/celix/trunk/framework/public/include/service_tracker_customizer.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_tracker_customizer.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_tracker_customizer.h (original)
+++ incubator/celix/trunk/framework/public/include/service_tracker_customizer.h Sat Jun  7 12:44:31 2014
@@ -38,10 +38,11 @@ typedef celix_status_t (*removed_callbac
 
 typedef struct serviceTrackerCustomizer *service_tracker_customizer_pt;
 
-FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_create(apr_pool_t *pool, void *handle,
+FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_create(void *handle,
 		adding_callback_pt addingFunction, added_callback_pt addedFunction,
 		modified_callback_pt modifiedFunction, removed_callback_pt removedFunction,
 		service_tracker_customizer_pt *customizer);
+FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_destroy(service_tracker_customizer_pt customizer);
 
 FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getHandle(service_tracker_customizer_pt customizer, void **handle);
 FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getAddingFunction(service_tracker_customizer_pt customizer, adding_callback_pt *function);

Modified: incubator/celix/trunk/framework/public/include/utils.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/utils.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/utils.h (original)
+++ incubator/celix/trunk/framework/public/include/utils.h Sat Jun  7 12:44:31 2014
@@ -28,18 +28,18 @@
 #define UTILS_H_
 
 #include <ctype.h>
-#include <apr_portable.h>
 
 #include "celix_errno.h"
 #include "celixbool.h"
 #include "framework_exports.h"
+#include "celix_threads.h"
 
 FRAMEWORK_EXPORT unsigned int utils_stringHash(void * string);
 FRAMEWORK_EXPORT int utils_stringEquals(void * string, void * toCompare);
 FRAMEWORK_EXPORT char * string_ndup(const char *s, size_t n);
 FRAMEWORK_EXPORT char * utils_stringTrim(char * string);
 
-FRAMEWORK_EXPORT celix_status_t thread_equalsSelf(apr_os_thread_t thread, bool *equals);
+FRAMEWORK_EXPORT celix_status_t thread_equalsSelf(celix_thread_t thread, bool *equals);
 
 FRAMEWORK_EXPORT celix_status_t utils_isNumeric(char *number, bool *ret);
 

Modified: incubator/celix/trunk/framework/public/include/version.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/version.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/version.h (original)
+++ incubator/celix/trunk/framework/public/include/version.h Sat Jun  7 12:44:31 2014
@@ -27,8 +27,6 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#include <apr_general.h>
-
 #include "celix_errno.h"
 #include "framework_exports.h"
 

Modified: incubator/celix/trunk/log_service/private/src/log_service_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log_service_activator.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log_service_activator.c (original)
+++ incubator/celix/trunk/log_service/private/src/log_service_activator.c Sat Jun  7 12:44:31 2014
@@ -35,6 +35,7 @@
 #include "service_registration.h"
 
 struct logActivator {
+    apr_pool_t *pool;
     bundle_context_pt bundleContext;
     service_registration_pt logServiceFactoryReg;
     service_registration_pt logReaderServiceReg;
@@ -49,7 +50,7 @@ celix_status_t bundleActivator_create(bu
     apr_pool_t *mp = NULL;
 	struct logActivator * activator = NULL;
 
-    bundleContext_getMemoryPool(context, &mp);
+    apr_pool_create(&mp, NULL);
     activator = (struct logActivator *) apr_palloc(mp, sizeof(struct logActivator));
 
 
@@ -59,6 +60,7 @@ celix_status_t bundleActivator_create(bu
 		activator->bundleContext = context;
 		activator->logServiceFactoryReg = NULL;
 		activator->logReaderServiceReg = NULL;
+		activator->pool = mp;
         *userData = activator;
     }
 
@@ -68,37 +70,33 @@ celix_status_t bundleActivator_create(bu
 celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
     struct logActivator * activator = (struct logActivator *) userData;
     celix_status_t status = CELIX_SUCCESS;
-    apr_pool_t *mp = NULL;
     service_factory_pt factory = NULL;
     log_pt logger = NULL;
 
     log_reader_data_pt reader = NULL;
     log_reader_service_pt reader_service = NULL;
 
-    bundleContext_getMemoryPool(context, &mp);
 
-    log_create(mp, &logger);
+    log_create(activator->pool, &logger);
 
     // Add logger as Bundle- and FrameworkEvent listener
-    activator->bundleListener = apr_palloc(mp, sizeof(*activator->bundleListener));
-    activator->bundleListener->pool = mp;
+    activator->bundleListener = apr_palloc(activator->pool, sizeof(*activator->bundleListener));
     activator->bundleListener->handle = logger;
     activator->bundleListener->bundleChanged = log_bundleChanged;
     bundleContext_addBundleListener(context, activator->bundleListener);
 
-    activator->frameworkListener = apr_palloc(mp, sizeof(*activator->frameworkListener));
-    activator->frameworkListener->pool = mp;
+    activator->frameworkListener = apr_palloc(activator->pool, sizeof(*activator->frameworkListener));
     activator->frameworkListener->handle = logger;
     activator->frameworkListener->frameworkEvent = log_frameworkEvent;
     bundleContext_addFrameworkListener(context, activator->frameworkListener);
 
-    logFactory_create(mp, logger, &factory);
+    logFactory_create(activator->pool, logger, &factory);
 
     bundleContext_registerServiceFactory(context, (char *) OSGI_LOGSERVICE_NAME, factory, NULL, &activator->logServiceFactoryReg);
 
-    logReaderService_create(logger, mp, &reader);
+    logReaderService_create(logger, activator->pool, &reader);
 
-    reader_service = apr_palloc(mp, sizeof(*reader_service));
+    reader_service = apr_palloc(activator->pool, sizeof(*reader_service));
     reader_service->reader = reader;
     reader_service->getLog = logReaderService_getLog;
     reader_service->addLogListener = logReaderService_addLogListener;

Modified: incubator/celix/trunk/log_service/public/include/log_entry.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/public/include/log_entry.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/public/include/log_entry.h (original)
+++ incubator/celix/trunk/log_service/public/include/log_entry.h Sat Jun  7 12:44:31 2014
@@ -27,6 +27,8 @@
 #ifndef LOG_ENTRY_H_
 #define LOG_ENTRY_H_
 
+#include <apr_general.h>
+
 #include "log_service.h"
 
 struct log_entry {

Modified: incubator/celix/trunk/log_writer/private/src/log_writer.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/private/src/log_writer.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/private/src/log_writer.c (original)
+++ incubator/celix/trunk/log_writer/private/src/log_writer.c Sat Jun  7 12:44:31 2014
@@ -58,9 +58,9 @@ celix_status_t logWriter_start(log_write
 	service_tracker_customizer_pt cust = NULL;
 	service_tracker_pt tracker = NULL;
 
-	status = serviceTrackerCustomizer_create(writer->pool, writer, logWriter_addingServ, logWriter_addedServ, logWriter_modifiedServ, logWriter_removedServ, &cust);
+	status = serviceTrackerCustomizer_create(writer, logWriter_addingServ, logWriter_addedServ, logWriter_modifiedServ, logWriter_removedServ, &cust);
 	if (status == CELIX_SUCCESS) {
-		status = serviceTracker_create(writer->pool, writer->context, (char *) OSGI_LOGSERVICE_READER_SERVICE_NAME, cust, &tracker);
+		status = serviceTracker_create(writer->context, (char *) OSGI_LOGSERVICE_READER_SERVICE_NAME, cust, &tracker);
 		if (status == CELIX_SUCCESS) {
 			writer->tracker = tracker;
 			status = serviceTracker_open(tracker);

Modified: incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c (original)
+++ incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c Sat Jun  7 12:44:31 2014
@@ -28,6 +28,7 @@
 #include <apr_strings.h>
 #include <unistd.h>
 #include <stdbool.h>
+#include <apr_thread_proc.h>
 
 #include <dns_sd.h>
 
@@ -326,7 +327,7 @@ celix_status_t discovery_endpointListene
 
 				char *scope = properties_get(serviceProperties,
 				(char *) OSGI_ENDPOINT_LISTENER_SCOPE);
-				filter_pt filter = filter_create(scope, discovery->pool); //FIXME memory leak
+				filter_pt filter = filter_create(scope); //FIXME memory leak
 				bool matchResult = false;
 				filter_match(filter, endpoint->properties, &matchResult);
 				if (matchResult) {
@@ -513,7 +514,7 @@ static celix_status_t discovery_informEn
 			serviceRegistration_getProperties(registration, &serviceProperties);
 			char *scope = properties_get(serviceProperties,
 					(char *) OSGI_ENDPOINT_LISTENER_SCOPE);
-			filter_pt filter = filter_create(scope, discovery->pool);
+			filter_pt filter = filter_create(scope);
 			bool matchResult = false;
 			filter_match(filter, endpoint->properties, &matchResult);
 			if (matchResult) {

Modified: incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery_activator.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery_activator.c (original)
+++ incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery_activator.c Sat Jun  7 12:44:31 2014
@@ -87,13 +87,13 @@ celix_status_t discoveryActivator_create
 
 	service_tracker_customizer_pt customizer = NULL;
 
-	status = serviceTrackerCustomizer_create(activator->pool,
+	status = serviceTrackerCustomizer_create(
 			activator->discovery, discovery_endpointListenerAdding,
 			discovery_endpointListenerAdded, discovery_endpointListenerModified,
 			discovery_endpointListenerRemoved, &customizer);
 
 	if (status == CELIX_SUCCESS) {
-		status = serviceTracker_create(activator->pool, activator->context,
+		status = serviceTracker_create(activator->context,
 				(char *) OSGI_ENDPOINT_LISTENER_SERVICE, customizer, tracker);
 
 		serviceTracker_open(activator->endpointListenerTracker);

Modified: incubator/celix/trunk/remote_services/discovery_shm/private/src/discovery.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_shm/private/src/discovery.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_shm/private/src/discovery.c (original)
+++ incubator/celix/trunk/remote_services/discovery_shm/private/src/discovery.c Sat Jun  7 12:44:31 2014
@@ -30,6 +30,7 @@
 #include <unistd.h>
 
 #include <apr_strings.h>
+#include <apr_thread_proc.h>
 
 #include <sys/types.h>
 #include <sys/sem.h>
@@ -197,7 +198,7 @@ celix_status_t discovery_addService(disc
 		properties_pt serviceProperties = NULL;
 		serviceRegistration_getProperties(registration, &serviceProperties);
 		char *scope = properties_get(serviceProperties, (char *) OSGI_ENDPOINT_LISTENER_SCOPE);
-		filter_pt filter = filter_create(scope, discovery->pool);
+		filter_pt filter = filter_create(scope);
 		bool matchResult = false;
 		filter_match(filter, endpoint->properties, &matchResult);
 		if (matchResult) {

Modified: incubator/celix/trunk/remote_services/discovery_shm/private/src/discovery_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_shm/private/src/discovery_activator.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_shm/private/src/discovery_activator.c (original)
+++ incubator/celix/trunk/remote_services/discovery_shm/private/src/discovery_activator.c Sat Jun  7 12:44:31 2014
@@ -83,11 +83,11 @@ celix_status_t discoveryActivator_create
 
 	service_tracker_customizer_pt customizer = NULL;
 
-	status = serviceTrackerCustomizer_create(activator->pool, activator->discovery, discovery_endpointListenerAdding,
+	status = serviceTrackerCustomizer_create(activator->discovery, discovery_endpointListenerAdding,
 			discovery_endpointListenerAdded, discovery_endpointListenerModified, discovery_endpointListenerRemoved, &customizer);
 
 	if (status == CELIX_SUCCESS) {
-		status = serviceTracker_create(activator->pool, activator->context, "endpoint_listener", customizer, tracker);
+		status = serviceTracker_create(activator->context, "endpoint_listener", customizer, tracker);
 
 		serviceTracker_open(activator->endpointListenerTracker);
 	}

Modified: incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c (original)
+++ incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c Sat Jun  7 12:44:31 2014
@@ -28,6 +28,8 @@
 #include <apr_strings.h>
 #include <slp.h>
 #include <unistd.h>
+#include <apr_thread_proc.h>
+#include <apr_network_io.h>
 
 #include "bundle_context.h"
 #include "array_list.h"
@@ -179,7 +181,7 @@ celix_status_t discovery_addService(disc
 		properties_pt serviceProperties = NULL;
 		serviceRegistration_getProperties(registration, &serviceProperties);
 		char *scope = properties_get(serviceProperties, (char *) OSGI_ENDPOINT_LISTENER_SCOPE);
-		filter_pt filter = filter_create(scope, discovery->pool);
+		filter_pt filter = filter_create(scope);
 		bool matchResult = false;
 		filter_match(filter, endpoint->properties, &matchResult);
 		if (matchResult) {

Modified: incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery_activator.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery_activator.c (original)
+++ incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery_activator.c Sat Jun  7 12:44:31 2014
@@ -83,11 +83,11 @@ celix_status_t discoveryActivator_create
 
 	service_tracker_customizer_pt customizer = NULL;
 
-	status = serviceTrackerCustomizer_create(activator->pool, activator->discovery, discovery_endpointListenerAdding,
+	status = serviceTrackerCustomizer_create(activator->discovery, discovery_endpointListenerAdding,
 			discovery_endpointListenerAdded, discovery_endpointListenerModified, discovery_endpointListenerRemoved, &customizer);
 
 	if (status == CELIX_SUCCESS) {
-		status = serviceTracker_create(activator->pool, activator->context, "endpoint_listener", customizer, tracker);
+		status = serviceTracker_create(activator->context, "endpoint_listener", customizer, tracker);
 
 		serviceTracker_open(activator->endpointListenerTracker);
 	}

Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c Sat Jun  7 12:44:31 2014
@@ -105,11 +105,11 @@ celix_status_t exportRegistration_create
 
 	service_tracker_customizer_pt customizer = NULL;
 
-	status = serviceTrackerCustomizer_create(registration->pool, registration, exportRegistration_endpointAdding,
+	status = serviceTrackerCustomizer_create(registration, exportRegistration_endpointAdding,
 			exportRegistration_endpointAdded, exportRegistration_endpointModified, exportRegistration_endpointRemoved, &customizer);
 
 	if (status == CELIX_SUCCESS) {
-		status = serviceTracker_create(registration->pool, registration->context, OSGI_RSA_REMOTE_ENDPOINT, customizer, tracker);
+		status = serviceTracker_create(registration->context, OSGI_RSA_REMOTE_ENDPOINT, customizer, tracker);
 	}
 
 	return status;

Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c Sat Jun  7 12:44:31 2014
@@ -96,13 +96,13 @@ celix_status_t importRegistration_create
 
 	service_tracker_customizer_pt customizer = NULL;
 
-	status = serviceTrackerCustomizer_create(registration->pool, registration, importRegistration_proxyAdding,
+	status = serviceTrackerCustomizer_create(registration, importRegistration_proxyAdding,
 			importRegistration_proxyAdded, importRegistration_proxyModified, importRegistration_proxyRemoved, &customizer);
 
 	if (status == CELIX_SUCCESS) {
 		char *filter = apr_pstrcat(registration->pool, "(&(", OSGI_FRAMEWORK_OBJECTCLASS, "=", OSGI_RSA_REMOTE_PROXY,
 				")(proxy.interface=", registration->endpointDescription->service, "))", NULL);
-		status = serviceTracker_createWithFilter(registration->pool, registration->context, filter, customizer, tracker);
+		status = serviceTracker_createWithFilter(registration->context, filter, customizer, tracker);
 	}
 
 	return status;

Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c Sat Jun  7 12:44:31 2014
@@ -28,6 +28,7 @@
 
 #include <apr_strings.h>
 #include <apr_uuid.h>
+#include <apr_network_io.h>
 
 #include <curl/curl.h>
 

Modified: incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c Sat Jun  7 12:44:31 2014
@@ -105,11 +105,11 @@ celix_status_t exportRegistration_create
 
 	service_tracker_customizer_pt customizer = NULL;
 
-	status = serviceTrackerCustomizer_create(registration->pool, registration, exportRegistration_endpointAdding,
+	status = serviceTrackerCustomizer_create(registration, exportRegistration_endpointAdding,
 			exportRegistration_endpointAdded, exportRegistration_endpointModified, exportRegistration_endpointRemoved, &customizer);
 
 	if (status == CELIX_SUCCESS) {
-		status = serviceTracker_create(registration->pool, registration->context, OSGI_RSA_REMOTE_ENDPOINT, customizer, tracker);
+		status = serviceTracker_create(registration->context, OSGI_RSA_REMOTE_ENDPOINT, customizer, tracker);
 	}
 
 	return status;

Modified: incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c Sat Jun  7 12:44:31 2014
@@ -96,13 +96,13 @@ celix_status_t importRegistration_create
 
 	service_tracker_customizer_pt customizer = NULL;
 
-	status = serviceTrackerCustomizer_create(registration->pool, registration, importRegistration_proxyAdding,
+	status = serviceTrackerCustomizer_create(registration, importRegistration_proxyAdding,
 			importRegistration_proxyAdded, importRegistration_proxyModified, importRegistration_proxyRemoved, &customizer);
 
 	if (status == CELIX_SUCCESS) {
 		char *filter = apr_pstrcat(registration->pool, "(&(", OSGI_FRAMEWORK_OBJECTCLASS, "=", OSGI_RSA_REMOTE_PROXY,
 				")(proxy.interface=", registration->endpointDescription->service, "))", NULL);
-		status = serviceTracker_createWithFilter(registration->pool, registration->context, filter, customizer, tracker);
+		status = serviceTracker_createWithFilter(registration->context, filter, customizer, tracker);
 	}
 
 	return status;

Modified: incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c Sat Jun  7 12:44:31 2014
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <apr_uuid.h>
 #include <apr_strings.h>
+#include <apr_thread_proc.h>
 
 #include "remote_service_admin_shm.h"
 #include "remote_service_admin_shm_impl.h"

Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c Sat Jun  7 12:44:31 2014
@@ -98,11 +98,11 @@ static celix_status_t bundleActivator_cr
 
 	service_tracker_customizer_pt customizer = NULL;
 
-	status = serviceTrackerCustomizer_create(activator->pool, activator->manager, topologyManager_rsaAdding,
+	status = serviceTrackerCustomizer_create(activator->manager, topologyManager_rsaAdding,
 			topologyManager_rsaAdded, topologyManager_rsaModified, topologyManager_rsaRemoved, &customizer);
 
 	if (status == CELIX_SUCCESS) {
-		status = serviceTracker_create(activator->pool, activator->context, "remote_service_admin", customizer, tracker);
+		status = serviceTracker_create(activator->context, "remote_service_admin", customizer, tracker);
 	}
 
 	return status;
@@ -116,7 +116,6 @@ static celix_status_t bundleActivator_cr
 	if (!*listener) {
 		status = CELIX_ENOMEM;
 	} else {
-		(*listener)->pool = pool;
 		(*listener)->handle = activator->manager;
 		(*listener)->serviceChanged = topologyManager_serviceChanged;
 	}

Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c Sat Jun  7 12:44:31 2014
@@ -223,7 +223,7 @@ celix_status_t topologyManager_notifyLis
 				properties_pt props = NULL;
 				serviceRegistration_getProperties(registration, &props);
 				char *scope = properties_get(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE);
-				filter_pt filter = filter_create(scope, manager->pool);
+				filter_pt filter = filter_create(scope);
 				endpoint_listener_pt epl = NULL;
 				status = bundleContext_getService(manager->context, eplRef, (void **) &epl);
 				if (status == CELIX_SUCCESS) {

Modified: incubator/celix/trunk/remote_shell/private/include/shell_mediator.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/include/shell_mediator.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/include/shell_mediator.h (original)
+++ incubator/celix/trunk/remote_shell/private/include/shell_mediator.h Sat Jun  7 12:44:31 2014
@@ -29,6 +29,7 @@
 #define shellMediator_H_
 
 #include <apr_pools.h>
+#include <apr_network_io.h>
 
 #include <bundle_context.h>
 #include <celix_errno.h>

Modified: incubator/celix/trunk/remote_shell/private/src/shell_mediator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/src/shell_mediator.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/src/shell_mediator.c (original)
+++ incubator/celix/trunk/remote_shell/private/src/shell_mediator.c Sat Jun  7 12:44:31 2014
@@ -73,9 +73,9 @@ celix_status_t shellMediator_create(apr_
 		(*instance)->shellService = NULL;
 
 		status = apr_thread_mutex_create(&(*instance)->mutex, APR_THREAD_MUTEX_DEFAULT, pool);
-		status = CELIX_DO_IF(status, serviceTrackerCustomizer_create(pool, (*instance), shellMediator_addingService, shellMediator_addedService,
+		status = CELIX_DO_IF(status, serviceTrackerCustomizer_create((*instance), shellMediator_addingService, shellMediator_addedService,
 				shellMediator_modifiedService, shellMediator_removedService, &customizer));
-		status = CELIX_DO_IF(status, serviceTracker_create(pool, context, (char *)OSGI_SHELL_SERVICE_NAME, customizer, &(*instance)->tracker));
+		status = CELIX_DO_IF(status, serviceTracker_create(context, (char *)OSGI_SHELL_SERVICE_NAME, customizer, &(*instance)->tracker));
 		if (status == CELIX_SUCCESS) {
 			serviceTracker_open((*instance)->tracker);
 		}

Modified: incubator/celix/trunk/shell/private/include/shell_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/include/shell_private.h?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/include/shell_private.h (original)
+++ incubator/celix/trunk/shell/private/include/shell_private.h Sat Jun  7 12:44:31 2014
@@ -27,6 +27,8 @@
 #ifndef SHELL_PRIVATE_H_
 #define SHELL_PRIVATE_H_
 
+#include <apr_general.h>
+
 #include "shell.h"
 #include "hash_map.h"
 #include "command.h"

Modified: incubator/celix/trunk/shell/private/src/inspect_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/inspect_command.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/inspect_command.c (original)
+++ incubator/celix/trunk/shell/private/src/inspect_command.c Sat Jun  7 12:44:31 2014
@@ -25,8 +25,7 @@
  */
 
 #include <stdlib.h>
-
-#include <apr_strings.h>
+#include <string.h>
 
 #include "command_impl.h"
 #include "array_list.h"
@@ -64,20 +63,18 @@ void inspectCommand_execute(command_pt c
 	celix_status_t status = CELIX_SUCCESS;
 	char outString[256];
 	char *token;
-	char *commandStr = apr_strtok(commandline, " ", &token);
-	char *type = apr_strtok(NULL, " ", &token);
+	char *commandStr = strtok_r(commandline, " ", &token);
+	char *type = strtok_r(NULL, " ", &token);
 	if (type != NULL) {
-		char *direction = apr_strtok(NULL, " ", &token);
+		char *direction = strtok_r(NULL, " ", &token);
 		if (direction != NULL) {
-			apr_pool_t *pool = NULL;
 			array_list_pt ids = NULL;
-			char *id = apr_strtok(NULL, " ", &token);
+			char *id = strtok_r(NULL, " ", &token);
 
-			bundleContext_getMemoryPool(command->bundleContext, &pool);
 			arrayList_create(&ids);
 			while (id != NULL) {
 				arrayList_add(ids, id);
-				id = apr_strtok(NULL, " ", &token);
+				id = strtok_r(NULL, " ", &token);
 			}
 
 			if (strcmp(type, SERVICE_TYPE) == 0) {
@@ -120,10 +117,8 @@ celix_status_t inspectCommand_printExpor
 	if (arrayList_isEmpty(ids)) {
 		celix_status_t status = bundleContext_getBundles(command->bundleContext, &bundles);
 	} else {
-		apr_pool_t *pool = NULL;
 		unsigned int i;
 
-		bundleContext_getMemoryPool(command->bundleContext, &pool);
 		arrayList_create(&bundles);
 		for (i = 0; i < arrayList_size(ids); i++) {
 			char *idStr = (char *) arrayList_get(ids, i);
@@ -150,11 +145,9 @@ celix_status_t inspectCommand_printExpor
 			}
 
 			if (bundle != NULL) {
-				apr_pool_t *pool;
 				array_list_pt refs = NULL;
 
-				bundleContext_getMemoryPool(command->bundleContext, &pool);
-				if (bundle_getRegisteredServices(bundle, pool, &refs) == CELIX_SUCCESS) {
+				if (bundle_getRegisteredServices(bundle, &refs) == CELIX_SUCCESS) {
 					char line[256];
 					module_pt module = NULL;
 					char * name = NULL;
@@ -212,10 +205,8 @@ celix_status_t inspectCommand_printImpor
     if (arrayList_isEmpty(ids)) {
         celix_status_t status = bundleContext_getBundles(command->bundleContext, &bundles);
     } else {
-        apr_pool_t *pool = NULL;
         unsigned int i;
 
-        bundleContext_getMemoryPool(command->bundleContext, &pool);
         arrayList_create(&bundles);
         for (i = 0; i < arrayList_size(ids); i++) {
             char *idStr = (char *) arrayList_get(ids, i);
@@ -242,10 +233,8 @@ celix_status_t inspectCommand_printImpor
             }
 
             if (bundle != NULL) {
-                apr_pool_t *pool;
                 array_list_pt refs = NULL;
 
-                bundleContext_getMemoryPool(command->bundleContext, &pool);
                 if (bundle_getServicesInUse(bundle, &refs) == CELIX_SUCCESS) {
                     char line[256];
                     module_pt module = NULL;

Modified: incubator/celix/trunk/shell/private/src/install_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/install_command.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/install_command.c (original)
+++ incubator/celix/trunk/shell/private/src/install_command.c Sat Jun  7 12:44:31 2014
@@ -24,6 +24,7 @@
  *  \copyright	Apache License, Version 2.0
  */
 #include <stdlib.h>
+#include <string.h>
 
 #include "command_impl.h"
 #include "array_list.h"

Modified: incubator/celix/trunk/shell/private/src/log_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/log_command.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/log_command.c (original)
+++ incubator/celix/trunk/shell/private/src/log_command.c Sat Jun  7 12:44:31 2014
@@ -54,7 +54,6 @@ void logCommand_execute(command_pt comma
     service_reference_pt readerService = NULL;
     service_reference_pt logService = NULL;
     apr_pool_t *memory_pool = NULL;
-    apr_pool_t *bundle_memory_pool = NULL;
 
     bundleContext_getServiceReference(command->bundleContext, (char *) OSGI_LOGSERVICE_READER_SERVICE_NAME, &readerService);
     if (readerService != NULL) {
@@ -63,8 +62,7 @@ void logCommand_execute(command_pt comma
         linked_list_iterator_pt iter = NULL;
         log_reader_service_pt reader = NULL;
 
-        bundleContext_getMemoryPool(command->bundleContext, &bundle_memory_pool);
-        apr_pool_create(&memory_pool, bundle_memory_pool);
+        apr_pool_create(&memory_pool, NULL);
         if (memory_pool) {
             bundleContext_getService(command->bundleContext, readerService, (void **) &reader);
             reader->getLog(reader->reader, memory_pool, &list);
@@ -77,22 +75,22 @@ void logCommand_execute(command_pt comma
                 char *bundleSymbolicName = NULL;
                 char errorString[256];
 
-				celix_status_t status = bundle_getCurrentModule(entry->bundle, &module);
-				if (status == CELIX_SUCCESS) {
-					status = module_getSymbolicName(module, &bundleSymbolicName);
-
-					strftime(time, 20, "%Y-%m-%d %H:%M:%S", localtime(&entry->time));
-					logCommand_levelAsString(command, entry->level, &level);
-
-					if (entry->errorCode > 0) {
-						celix_strerror(entry->errorCode, errorString, 256);
-						sprintf(line, "%s - Bundle: %s - %s - %d %s\n", time, bundleSymbolicName, entry->message, entry->errorCode, errorString);
-						out(line);
-					} else {
-						sprintf(line, "%s - Bundle: %s - %s\n", time, bundleSymbolicName, entry->message);
-						out(line);
-					}
-				}
+                celix_status_t status = bundle_getCurrentModule(entry->bundle, &module);
+                if (status == CELIX_SUCCESS) {
+                    status = module_getSymbolicName(module, &bundleSymbolicName);
+
+                    strftime(time, 20, "%Y-%m-%d %H:%M:%S", localtime(&entry->time));
+                    logCommand_levelAsString(command, entry->level, &level);
+
+                    if (entry->errorCode > 0) {
+                        celix_strerror(entry->errorCode, errorString, 256);
+                        sprintf(line, "%s - Bundle: %s - %s - %d %s\n", time, bundleSymbolicName, entry->message, entry->errorCode, errorString);
+                        out(line);
+                    } else {
+                        sprintf(line, "%s - Bundle: %s - %s\n", time, bundleSymbolicName, entry->message);
+                        out(line);
+                    }
+                }
             }
             apr_pool_destroy(memory_pool);
         } else {

Modified: incubator/celix/trunk/shell/private/src/ps_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/ps_command.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/ps_command.c (original)
+++ incubator/celix/trunk/shell/private/src/ps_command.c Sat Jun  7 12:44:31 2014
@@ -24,6 +24,7 @@
  *  \copyright	Apache License, Version 2.0
  */
 #include <stdlib.h>
+#include <string.h>
 
 #include "command_impl.h"
 #include "array_list.h"

Modified: incubator/celix/trunk/shell/private/src/shell.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/shell.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/shell.c (original)
+++ incubator/celix/trunk/shell/private/src/shell.c Sat Jun  7 12:44:31 2014
@@ -46,6 +46,7 @@
 #include "utils.h"
 
 struct shellServiceActivator {
+    apr_pool_t *pool;
 	shell_pt shell;
 	shell_service_pt shellService;
 	service_registration_pt registration;
@@ -182,7 +183,9 @@ celix_status_t bundleActivator_create(bu
 	apr_pool_t *pool = NULL;
 	shell_pt shell = NULL;
 	*userData = malloc(sizeof(struct shellServiceActivator));
-	bundleContext_getMemoryPool(context, &pool);
+
+	apr_pool_create(&pool, NULL);
+
 	shell = shell_create(pool);
 //	struct shellServiceActivator * activator = (struct shellServiceActivator *) (*userData);
 	((struct shellServiceActivator *) (*userData))->shell = shell;
@@ -197,6 +200,7 @@ celix_status_t bundleActivator_create(bu
 	((struct shellServiceActivator *) (*userData))->inspectCommand = NULL;
 	((struct shellServiceActivator *) (*userData))->helpCommand = NULL;
 	((struct shellServiceActivator *) (*userData))->registration = NULL;
+	((struct shellServiceActivator *) (*userData))->pool = pool;
 
 	//(*userData) = &(*activator);
 
@@ -205,7 +209,6 @@ celix_status_t bundleActivator_create(bu
 
 celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
     celix_status_t status;
-	apr_pool_t *pool = NULL;
 
 	struct shellServiceActivator * activator = (struct shellServiceActivator *) userData;
 	activator->shell->bundleContext = context;
@@ -220,50 +223,48 @@ celix_status_t bundleActivator_start(voi
 
 	status = bundleContext_registerService(context, (char *) OSGI_SHELL_SERVICE_NAME, activator->shellService, NULL, &activator->registration);
 
-	bundleContext_getMemoryPool(context, &pool);
 	if (status == CELIX_SUCCESS) {
 	    service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener));
 	    activator->listener = listener;
-	    listener->pool = pool;
 	    listener->handle = activator->shell;
 	    listener->serviceChanged = (void *) shell_serviceChanged;
 	    status = bundleContext_addServiceListener(context, listener, "(objectClass=commandService)");
 
 	    if (status == CELIX_SUCCESS) {
 	        activator->psCmd = psCommand_create(context);
-	        shell_createCommandService(pool, activator->psCmd, &activator->psCmdSrv);
+	        shell_createCommandService(activator->pool, activator->psCmd, &activator->psCmdSrv);
 	        bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->psCmdSrv, NULL, &activator->psCommand);
 
 	        activator->startCmd = startCommand_create(context);
-	        shell_createCommandService(pool, activator->startCmd, &activator->startCmdSrv);
+	        shell_createCommandService(activator->pool, activator->startCmd, &activator->startCmdSrv);
 	        bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->startCmdSrv, NULL, &activator->startCommand);
 
 	        activator->stopCmd = stopCommand_create(context);
-	        shell_createCommandService(pool, activator->stopCmd, &activator->stopCmdSrv);
+	        shell_createCommandService(activator->pool, activator->stopCmd, &activator->stopCmdSrv);
 	        bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->stopCmdSrv, NULL, &activator->stopCommand);
 
 	        activator->installCmd = installCommand_create(context);
-	        shell_createCommandService(pool, activator->installCmd, &activator->installCmdSrv);
+	        shell_createCommandService(activator->pool, activator->installCmd, &activator->installCmdSrv);
 	        bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->installCmdSrv, NULL, &activator->installCommand);
 
 	        activator->uninstallCmd = uninstallCommand_create(context);
-	        shell_createCommandService(pool, activator->uninstallCmd, &activator->uninstallCmdSrv);
+	        shell_createCommandService(activator->pool, activator->uninstallCmd, &activator->uninstallCmdSrv);
 	        bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->uninstallCmdSrv, NULL, &activator->uninstallCommand);
 
 	        activator->updateCmd = updateCommand_create(context);
-	        shell_createCommandService(pool, activator->updateCmd, &activator->updateCmdSrv);
+	        shell_createCommandService(activator->pool, activator->updateCmd, &activator->updateCmdSrv);
 	        bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->updateCmdSrv, NULL, &activator->updateCommand);
 
 	        activator->logCmd = logCommand_create(context);
-	        shell_createCommandService(pool, activator->logCmd, &activator->logCmdSrv);
+	        shell_createCommandService(activator->pool, activator->logCmd, &activator->logCmdSrv);
             bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->logCmdSrv, NULL, &activator->logCommand);
 
             activator->inspectCmd = inspectCommand_create(context);
-            shell_createCommandService(pool, activator->inspectCmd, &activator->inspectCmdSrv);
+            shell_createCommandService(activator->pool, activator->inspectCmd, &activator->inspectCmdSrv);
 			bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->inspectCmdSrv, NULL, &activator->inspectCommand);
 
 			activator->helpCmd = helpCommand_create(context);
-			shell_createCommandService(pool, activator->helpCmd, &activator->helpCmdSrv);
+			shell_createCommandService(activator->pool, activator->helpCmd, &activator->helpCmdSrv);
 			bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->helpCmdSrv, NULL, &activator->helpCommand);
 	    }
 	}

Modified: incubator/celix/trunk/shell_tui/private/src/shell_tui.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell_tui/private/src/shell_tui.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/private/src/shell_tui.c (original)
+++ incubator/celix/trunk/shell_tui/private/src/shell_tui.c Sat Jun  7 12:44:31 2014
@@ -27,6 +27,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <apr_general.h>
+#include <apr_thread_proc.h>
+
 #include "bundle_context.h"
 #include "bundle_activator.h"
 #include "shell.h"
@@ -39,6 +42,7 @@ struct shellTuiActivator {
 	struct serviceListener * listener;
 	bool running;
 	apr_thread_t *runnable;
+	apr_pool_t *pool;
 };
 
 typedef struct shellTuiActivator * shell_tui_activator_pt;
@@ -104,17 +108,17 @@ void shellTui_serviceChanged(service_lis
 
 celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
 	apr_pool_t *pool = NULL;
-	celix_status_t status = bundleContext_getMemoryPool(context, &pool);
+	apr_pool_create(&pool, NULL);
 	shell_tui_activator_pt activator = (shell_tui_activator_pt) apr_palloc(pool, sizeof(*activator));
 	//shell_tui_activator_pt activator = (shell_tui_activator_pt) malloc(sizeof(*activator));
 	activator->shell = NULL;
+	activator->pool = pool;
 	(*userData) = activator;
 	return CELIX_SUCCESS;
 }
 
 celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
     celix_status_t status;
-	apr_pool_t *pool = NULL;
 
 	shell_tui_activator_pt act = (shell_tui_activator_pt) userData;
 	service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener));
@@ -122,17 +126,14 @@ celix_status_t bundleActivator_start(voi
 	act->context = context;
 	act->running = true;
 
-	
-	bundleContext_getMemoryPool(context, &pool);
 	act->listener = listener;
-	act->listener->pool = pool;
 	act->listener->handle = act;
 	act->listener->serviceChanged = (void *) shellTui_serviceChanged;
 	status = bundleContext_addServiceListener(context, act->listener, "(objectClass=shellService)");
 
 	if (status == CELIX_SUCCESS) {
         shellTui_initializeService(act);
-		apr_thread_create(&act->runnable, NULL, shellTui_runnable, act, pool);
+		apr_thread_create(&act->runnable, NULL, shellTui_runnable, act, act->pool);
 	}
 
 	return status;
@@ -156,5 +157,7 @@ celix_status_t bundleActivator_stop(void
 }
 
 celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
+    shell_tui_activator_pt act = (shell_tui_activator_pt) userData;
+    apr_pool_destroy(act->pool);
 	return CELIX_SUCCESS;
 }

Modified: incubator/celix/trunk/utils/private/test/array_list_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/test/array_list_test.cpp?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/test/array_list_test.cpp (original)
+++ incubator/celix/trunk/utils/private/test/array_list_test.cpp Sat Jun  7 12:44:31 2014
@@ -39,12 +39,8 @@ int main(int argc, char** argv) {
 
 TEST_GROUP(array_list) {
 	array_list_pt list;
-	apr_pool_t *pool;
 
 	void setup(void) {
-		apr_initialize();
-		apr_pool_create(&pool, NULL);
-
 		arrayList_create(&list);
 	}
 };

Modified: incubator/celix/trunk/utils/private/test/linked_list_test.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/test/linked_list_test.c?rev=1601103&r1=1601102&r2=1601103&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/test/linked_list_test.c (original)
+++ incubator/celix/trunk/utils/private/test/linked_list_test.c Sat Jun  7 12:44:31 2014
@@ -30,14 +30,10 @@
 #include <CUnit/Automated.h>
 #include "linked_list.h"
 
-apr_pool_t *memory_pool;
 linked_list_pt list;
 
 int setup(void) {
-    apr_initialize();
-    apr_pool_create(&memory_pool, NULL);
-
-    linkedList_create(memory_pool, &list);
+    linkedList_create(&list);
     if (list) {
         return 0;
     } else {
@@ -47,8 +43,6 @@ int setup(void) {
 }
 
 int teardown(void) {
-    apr_pool_destroy(memory_pool);
-    apr_terminate();
     return 0;
 }
 



Mime
View raw message