celix git commit: CELIX-280: fix some memory leaks

[bpetri]

Repository: celix
Updated Branches:
  refs/heads/develop 3e4e9d23b -> e62b5b553


CELIX-280: fix some memory leaks


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e62b5b55
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e62b5b55
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e62b5b55

Branch: refs/heads/develop
Commit: e62b5b5530d523f23c8ee22987d4c52607d5f28c
Parents: 3e4e9d2
Author: Bjoern Petri 
Authored: Tue Oct 27 08:16:24 2015 +0100
Committer: Bjoern Petri 
Committed: Tue Oct 27 08:16:24 2015 +0100

--
 deployment_admin/private/src/deployment_admin.c | 98 +++-
 .../private/src/deployment_package.c| 17 
 2 files changed, 72 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/e62b5b55/deployment_admin/private/src/deployment_admin.c
--
diff --git a/deployment_admin/private/src/deployment_admin.c 
b/deployment_admin/private/src/deployment_admin.c
index eaf2468..ce37b03 100644
--- a/deployment_admin/private/src/deployment_admin.c
+++ b/deployment_admin/private/src/deployment_admin.c
@@ -77,7 +77,10 @@ celix_status_t 
deploymentAdmin_processDeploymentPackageResources(deployment_admi
 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);
-static celix_status_t deploymentAdmin_updateAuditPool(deployment_admin_pt 
admin, DEPLOYMENT_ADMIN_AUDIT_EVENT auditEvent);
+
+static celix_status_t deploymentAdmin_performRequest(deployment_admin_pt 
admin, char* entry);
+static celix_status_t 
deploymentAdmin_auditEventTargetPropertiesSet(deployment_admin_pt admin);
+static celix_status_t 
deploymentAdmin_auditEventFrameworkStarted(deployment_admin_pt admin);
 
 celix_status_t deploymentAdmin_create(bundle_context_pt context, 
deployment_admin_pt *admin) {
celix_status_t status = CELIX_SUCCESS;
@@ -344,6 +347,10 @@ static void *deploymentAdmin_poll(void *deploymentAdmin) {
 
sleep(5);
 
+   for (i = arrayList_size(versions); i > 0; --i) {
+   free(arrayList_remove(versions, 0));
+   }
+
arrayList_destroy(versions);
}
 
@@ -603,6 +610,8 @@ celix_status_t 
deploymentAdmin_startDeploymentPackageCustomizerBundles(deploymen
bundle_start(bundle);
}
 
+arrayList_destroy(bundles);
+
return status;
 }
 
@@ -650,61 +659,64 @@ celix_status_t 
deploymentAdmin_processDeploymentPackageResources(deployment_admi
}
}
 
-   if(services!=NULL){
+   if(services != NULL) {
arrayList_destroy(services);
}
+   }
 
+arrayList_destroy(infos);
 
-   }
 
return status;
 }
 
 celix_status_t 
deploymentAdmin_dropDeploymentPackageResources(deployment_admin_pt admin, 
deployment_package_pt source, deployment_package_pt target) {
-   celix_status_t status = CELIX_SUCCESS;
+celix_status_t status = CELIX_SUCCESS;
 
-   if (target != NULL) {
-   array_list_pt infos = NULL;
-   deploymentPackage_getResourceInfos(target, );
-   int i;
-   for (i = 0; i < arrayList_size(infos); i++) {
-   resource_info_pt info = arrayList_get(infos, i);
-   resource_info_pt sourceInfo = NULL;
-   deploymentPackage_getResourceInfoByPath(source, 
info->path, );
-   if (sourceInfo == NULL) {
-   array_list_pt services = NULL;
-   int length = strlen(OSGI_FRAMEWORK_SERVICE_PID) 
+ strlen(info->resourceProcessor) + 4;
-   char filter[length];
-
-   snprintf(filter, length, "(%s=%s)", 
OSGI_FRAMEWORK_SERVICE_PID, info->resourceProcessor);
-   status = 
bundleContext_getServiceReferences(admin->context, 
DEPLOYMENTADMIN_RESOURCE_PROCESSOR_SERVICE, filter, );
-   if (status == CELIX_SUCCESS) {
-   if (services != NULL && 
arrayList_size(services) > 0) {
-   service_reference_pt ref = 
arrayList_get(services, 0);
-   // In Felix a check is done to 
assure the 

celix git commit: CELIX-280: fixed fix

[bpetri]

Repository: celix
Updated Branches:
  refs/heads/develop e62b5b553 -> 5463a35c2


CELIX-280: fixed fix


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/5463a35c
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/5463a35c
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/5463a35c

Branch: refs/heads/develop
Commit: 5463a35c2fa08de519fe34ce26833309fc2ff7db
Parents: e62b5b5
Author: Bjoern Petri 
Authored: Tue Oct 27 09:27:20 2015 +0100
Committer: Bjoern Petri 
Committed: Tue Oct 27 09:27:20 2015 +0100

--
 deployment_admin/private/src/deployment_admin.c | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/5463a35c/deployment_admin/private/src/deployment_admin.c
--
diff --git a/deployment_admin/private/src/deployment_admin.c 
b/deployment_admin/private/src/deployment_admin.c
index ce37b03..1e70a02 100644
--- a/deployment_admin/private/src/deployment_admin.c
+++ b/deployment_admin/private/src/deployment_admin.c
@@ -258,6 +258,8 @@ static void *deploymentAdmin_poll(void *deploymentAdmin) {
 deploymentAdmin_auditEventTargetPropertiesSet(admin);
 
while (admin->running) {
+int i;
+
//poll ace
array_list_pt versions = NULL;
arrayList_create();

celix git commit: CELIX-237: add test for serializing char*

[bpetri]

Repository: celix
Updated Branches:
  refs/heads/develop 5463a35c2 -> e5dfdf536


CELIX-237: add test for serializing char*


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e5dfdf53
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e5dfdf53
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e5dfdf53

Branch: refs/heads/develop
Commit: e5dfdf5366575846a86b6cec65b137cf85e90b72
Parents: 5463a35
Author: Bjoern Petri 
Authored: Tue Oct 27 14:29:52 2015 +0100
Committer: Bjoern Petri 
Committed: Tue Oct 27 14:29:52 2015 +0100

--
 .../json_serializer_tests.cpp   | 33 +++-
 1 file changed, 32 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/e5dfdf53/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
index 1d64ad1..e20cea4 100644
--- 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
+++ 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
@@ -142,7 +142,7 @@ static void check_example4(void *data) {
 }
 
 
-/*** example 4 /
+/*** example 5 /
 /** structs within a struct (by reference)***/
 const char *example5_descriptor = "Tleaf={ts name 
age};Tnode={Lnode;Lnode;Lleaf; left right value};{Lnode; head}";
 
@@ -224,6 +224,22 @@ static void check_example6(struct ex6_sequence seq) {
 }
 
 
+/*** example 7 /
+const char *example7_descriptor = "{t a}";
+
+const char *example7_input = "{ \
+\"a\" : \"apache celix\" \
+}";
+
+struct example7 {
+char* a;   //0
+};
+
+static void check_example7(void *data) {
+struct example7 *ex = (struct example7 *)data;
+STRCMP_EQUAL("apache celix", ex->a);
+}
+
 static void parseTests(void) {
 dyn_type *type;
 void *inst;
@@ -288,6 +304,17 @@ static void parseTests(void) {
 check_example6((*seq));
 dynType_free(type, seq);
 dynType_destroy(type);
+
+
+type = NULL;
+inst = NULL;
+rc = dynType_parseWithStr(example7_descriptor, NULL, NULL, );
+CHECK_EQUAL(0, rc);
+rc = jsonSerializer_deserialize(type, example7_input, );
+CHECK_EQUAL(0, rc);
+check_example7(inst);
+dynType_free(type, inst);
+dynType_destroy(type);
 }
 
 const char *write_example1_descriptor = "{BSIJsijFDN a b c d e f g h i j}";
@@ -433,6 +460,8 @@ void writeTest3(void) {
 free(result);
 }
 
+
+
 }
 
 TEST_GROUP(JsonSerializerTests) {
@@ -460,3 +489,5 @@ TEST(JsonSerializerTests, WriteTest2) {
 TEST(JsonSerializerTests, WriteTest3) {
 writeTest3();
 }
+
+

[19/50] celix git commit: CELIX-237: Added remove of standard installed libffi

[pnoltes]

CELIX-237: Added remove of standard installed libffi


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/a5d95e94
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/a5d95e94
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/a5d95e94

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: a5d95e94e183da68496645d808c3c9db809110c6
Parents: 9562f3d
Author: Pepijn Noltes 
Authored: Wed Oct 14 11:11:51 2015 +0200
Committer: Pepijn Noltes 
Committed: Wed Oct 14 11:11:51 2015 +0200

--
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/a5d95e94/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index f875ced..66f4c2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: c
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov pkg-config
+  - sudo apt-get remove -y libffi
 
 matrix:
   include:

[36/50] celix git commit: CELIX-263: fixed wrong constants used in celix_thread_test

[pnoltes]

CELIX-263: fixed wrong constants used in celix_thread_test


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/9806a809
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/9806a809
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/9806a809

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 9806a809220a3fd47a91519a2ca152cfb7a31f66
Parents: fe81655
Author: Bjoern Petri 
Authored: Sun Oct 18 20:05:09 2015 +0200
Committer: Bjoern Petri 
Committed: Sun Oct 18 20:05:09 2015 +0200

--
 utils/private/test/celix_threads_test.cpp | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/9806a809/utils/private/test/celix_threads_test.cpp
--
diff --git a/utils/private/test/celix_threads_test.cpp 
b/utils/private/test/celix_threads_test.cpp
index d5a01b4..6d62bad 100644
--- a/utils/private/test/celix_threads_test.cpp
+++ b/utils/private/test/celix_threads_test.cpp
@@ -172,6 +172,9 @@ TEST(celix_thread_mutex, lock) {
 
//possible race condition, not perfect test
celixThreadMutex_unlock(>mu);
+
+   sleep(2);
+
celixThreadMutex_lock(>mu2);
LONGS_EQUAL(666, params->i);
celixThreadMutex_unlock(>mu2);
@@ -191,14 +194,14 @@ TEST(celix_thread_mutex, attrSettype) {
celixThreadMutexAttr_create(_attr);
 
//test recursive mutex
-   celixThreadMutexAttr_settype(_attr, PTHREAD_MUTEX_RECURSIVE);
+   celixThreadMutexAttr_settype(_attr, CELIX_THREAD_MUTEX_RECURSIVE);
celixThreadMutex_create(, _attr);
//if program doesnt deadlock: succes! also check factorial of 10, for 
reasons unknown
LONGS_EQUAL(3628800, thread_test_func_recur_lock(, 10));
celixThreadMutex_destroy();
 
//test deadlock check mutex
-   celixThreadMutexAttr_settype(_attr, PTHREAD_MUTEX_ERRORCHECK);
+   celixThreadMutexAttr_settype(_attr, CELIX_THREAD_MUTEX_ERRORCHECK);
celixThreadMutex_create(, _attr);
//get deadlock error
celixThreadMutex_lock();

[35/50] celix git commit: CELIX-237: Reversed disableling rsa dfi build. Now rsa dfi should not be build for clang

[pnoltes]

CELIX-237: Reversed disableling rsa dfi build. Now rsa dfi should not be build 
for clang


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/fe816550
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/fe816550
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/fe816550

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: fe816550e1ef7b9aa483069b431e46ce029e70b7
Parents: e3ce10b
Author: Pepijn Noltes 
Authored: Fri Oct 16 14:29:29 2015 +0200
Committer: Pepijn Noltes 
Committed: Fri Oct 16 14:29:29 2015 +0200

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/fe816550/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 8b46bec..11f04eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_script:
 
 script:
 - cd build
-- if [ "$CC" = "clang" ]; then export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; else export 
BUILD_OPTS=""; fi
+- if [ "$CC" = "clang" ]; then export BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
 - cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON 
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..
 - make all && make deploy && make install-all
 - export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage

[29/50] celix git commit: CELIX-237: Added destroy of import reg when removing imported services

[pnoltes]

CELIX-237: Added destroy of import reg when removing imported services


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/523bd657
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/523bd657
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/523bd657

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 523bd657d993e6fe31e4b0615fc5b0f01a620af6
Parents: aa1797a
Author: Pepijn Noltes 
Authored: Thu Oct 15 09:58:57 2015 +0200
Committer: Pepijn Noltes 
Committed: Thu Oct 15 09:58:57 2015 +0200

--
 .../rsa/private/src/remote_service_admin_dfi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/523bd657/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
--
diff --git 
a/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
 
b/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
index db48634..a66bd27 100644
--- 
a/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
+++ 
b/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
@@ -623,7 +623,7 @@ celix_status_t 
remoteServiceAdmin_removeImportedService(remote_service_admin_pt
 if (current == registration) {
 arrayList_remove(admin->importedServices, i);
 importRegistration_close(current);
-//TODO, FIXME -> segfault. importRegistration_destroy(current);
+importRegistration_destroy(current);
 break;
 }
 }

[28/50] celix git commit: CELIX-237: Fixed an issue in service_regisration, the ungetService for a service factory was not correctly called (wrong handle).

[pnoltes]

CELIX-237: Fixed an issue in service_regisration, the ungetService for a 
service factory was not correctly called (wrong handle).


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/aa1797ab
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/aa1797ab
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/aa1797ab

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: aa1797ab90090ea556d4e367c390e5430cefea6c
Parents: 2fe04c0
Author: Pepijn Noltes 
Authored: Thu Oct 15 09:56:00 2015 +0200
Committer: Pepijn Noltes 
Committed: Thu Oct 15 09:56:00 2015 +0200

--
 framework/private/src/service_registration.c|  2 +-
 .../rsa/private/src/import_registration_dfi.c   | 16 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/aa1797ab/framework/private/src/service_registration.c
--
diff --git a/framework/private/src/service_registration.c 
b/framework/private/src/service_registration.c
index 82d0ee9..1817784 100644
--- a/framework/private/src/service_registration.c
+++ b/framework/private/src/service_registration.c
@@ -163,7 +163,7 @@ celix_status_t 
serviceRegistration_getService(service_registration_pt registrati
 celix_status_t serviceRegistration_ungetService(service_registration_pt 
registration, bundle_pt bundle, void **service) {
 if (registration->isServiceFactory) {
 service_factory_pt factory = registration->serviceFactory;
-factory->ungetService(registration->serviceFactory, bundle, 
registration, service);
+factory->ungetService(factory->factory, bundle, registration, service);
 }
 return CELIX_SUCCESS;
 }

http://git-wip-us.apache.org/repos/asf/celix/blob/aa1797ab/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c
--
diff --git 
a/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c
 
b/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c
index 8616f0c..cb40f0b 100644
--- 
a/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c
+++ 
b/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c
@@ -13,7 +13,6 @@ struct import_registration {
 const char *classObject; //NOTE owned by endpoint
 
 celix_thread_mutex_t mutex; //protects send & sendhandle
-
 send_func_type send;
 void *sendHandle;
 
@@ -27,7 +26,7 @@ struct import_registration {
 struct service_proxy {
 dyn_interface_type *intf;
 void *service;
-int count;
+size_t count;
 };
 
 static celix_status_t importRegistration_createProxy(import_registration_pt 
import, bundle_pt bundle,
@@ -128,12 +127,13 @@ celix_status_t 
importRegistration_start(import_registration_pt import) {
 celix_status_t importRegistration_stop(import_registration_pt import) {
 celix_status_t status = CELIX_SUCCESS;
 
-importRegistration_clearProxies(import);
-
 if (import->factoryReg != NULL) {
 serviceRegistration_unregister(import->factoryReg);
+import->factoryReg = NULL;
 }
 
+importRegistration_clearProxies(import);
+
 return status;
 }
 
@@ -289,10 +289,6 @@ static void importRegistration_proxyFunc(void *userData, 
void *args[], void *ret
 celix_status_t importRegistration_ungetService(import_registration_pt import, 
bundle_pt bundle, service_registration_pt registration, void **out) {
 celix_status_t  status = CELIX_SUCCESS;
 
-return status;
-
-/* TODO, FIXME ungetService can happen after importRegistration destroy 
leading to segfaults
-
 assert(import != NULL);
 assert(import->proxies != NULL);
 
@@ -307,14 +303,14 @@ celix_status_t 
importRegistration_ungetService(import_registration_pt import, bu
 }
 
 if (proxy->count == 0) {
+hashMap_remove(import->proxies, bundle);
 importRegistration_destroyProxy(proxy);
 }
 }
 
-pthread_mutex_lock(>proxiesMutex);
+pthread_mutex_unlock(>proxiesMutex);
 
 return status;
- */
 }
 
 static void importRegistration_destroyProxy(struct service_proxy *proxy) {

[05/50] celix git commit: CELIX-237: Changed intialization of test structs.

[pnoltes]

CELIX-237: Changed intialization of test structs.


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/22797e10
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/22797e10
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/22797e10

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 22797e1005681ade3b6a2b189a1430fffe7c3250
Parents: c5de698
Author: Pepijn Noltes 
Authored: Tue Oct 13 19:27:26 2015 +0200
Committer: Pepijn Noltes 
Committed: Tue Oct 13 19:27:26 2015 +0200

--
 .../json_serializer_tests.cpp   | 41 
 1 file changed, 34 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/22797e10/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
index db81ade..1d64ad1 100644
--- 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
+++ 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_serializer_tests.cpp
@@ -306,7 +306,18 @@ struct write_example1 {
 };
 
 void writeTest1(void) {
-struct write_example1 ex1 = {.a=1, .b=2, .c=3, .d=4, .e=5, .f=6, .g=7, 
.h=8.8f, .i=9.9, .j=10};
+struct write_example1 ex1;
+ex1.a=1;
+ex1.b=2;
+ex1.c=3;
+ex1.d=4;
+ex1.e=5;
+ex1.f=6;
+ex1.g=7;
+ex1.h=8.8f;
+ex1.i=9.9;
+ex1.j=10;
+
 dyn_type *type = NULL;
 char *result = NULL;
 int rc = dynType_parseWithStr(write_example1_descriptor, "ex1", NULL, 
);
@@ -344,8 +355,12 @@ struct write_example2 {
 };
 
 void writeTest2(void) {
-struct write_example2_sub sub1 = { .a = 1, .b = 2 };
-struct write_example2 ex = { .sub1 =  };
+struct write_example2_sub sub1;
+sub1.a = 1;
+sub1.b = 2;
+
+struct write_example2 ex;
+ex.sub1=
 ex.sub2.c = 3;
 ex.sub2.d = 4;
 
@@ -378,10 +393,22 @@ struct write_example3 {
 };
 
 void writeTest3(void) {
-struct write_example3_person p1 = {.name = "John", .age = 33};
-struct write_example3_person p2 = {.name = "Peter", .age = 44};
-struct write_example3_person p3 = {.name = "Carol", .age = 55};
-struct write_example3_person p4 = {.name = "Elton", .age = 66};
+struct write_example3_person p1;
+p1.name = "John";
+p1.age = 33;
+
+struct write_example3_person p2;
+p2.name = "Peter";
+p2.age = 44;
+
+struct write_example3_person p3;
+p3.name = "Carol";
+p3.age = 55;
+
+struct write_example3_person p4;
+p4.name = "Elton";
+p4.age = 66;
+
 struct write_example3 seq;
 seq.buf = (struct write_example3_person **) calloc(4, sizeof(void *));
 seq.len = seq.cap = 4;

[11/50] celix git commit: CELIX-237: Update in FindFFI.cmake for lib name

[pnoltes]

CELIX-237: Update in FindFFI.cmake for lib name


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/13b82745
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/13b82745
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/13b82745

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 13b82745e00377c478c93ecfb5c9c6d6172456e9
Parents: 6559744
Author: Pepijn Noltes 
Authored: Tue Oct 13 22:48:16 2015 +0200
Committer: Pepijn Noltes 
Committed: Tue Oct 13 22:48:16 2015 +0200

--
 cmake/FindFFI.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/13b82745/cmake/FindFFI.cmake
--
diff --git a/cmake/FindFFI.cmake b/cmake/FindFFI.cmake
index 15680b7..0493633 100644
--- a/cmake/FindFFI.cmake
+++ b/cmake/FindFFI.cmake
@@ -32,9 +32,8 @@ endif ()
 
 mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY)
 
-find_library(FFI_LIBRARY NAMES ffi
+find_library(FFI_LIBRARY NAMES ffi libffi
 PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr/local /opt/local
-PATH_SUFFIXES lib
 HINTS ${PC_LIBFFI_LIBDIR} ${PC_LIBFFI_LIBRARY_DIRS}
 )
 

[46/50] celix git commit: CELIX-272: remove arraylist_destroy of exportList (this is allocated in the rsa and also destroyed there)

[pnoltes]

CELIX-272: remove arraylist_destroy of exportList (this is allocated in the rsa 
and also destroyed there)


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/80a4f03f
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/80a4f03f
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/80a4f03f

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 80a4f03fcaaca8db77205af86aef3d8bd339c02f
Parents: 78bb1e3
Author: Bjoern Petri 
Authored: Thu Oct 22 15:09:01 2015 +0200
Committer: Bjoern Petri 
Committed: Thu Oct 22 15:09:01 2015 +0200

--
 remote_services/topology_manager/private/src/topology_manager.c | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/80a4f03f/remote_services/topology_manager/private/src/topology_manager.c
--
diff --git a/remote_services/topology_manager/private/src/topology_manager.c 
b/remote_services/topology_manager/private/src/topology_manager.c
index 68be8c8..424c00c 100644
--- a/remote_services/topology_manager/private/src/topology_manager.c
+++ b/remote_services/topology_manager/private/src/topology_manager.c
@@ -287,9 +287,6 @@ celix_status_t topologyManager_rsaRemoved(void * handle, 
service_reference_pt re
 topologyManager_notifyListenersEndpointRemoved(manager, rsa, 
export);
 rsa->exportRegistration_close(export);
 }
-
-arrayList_destroy(exports_list);
-exports_list = NULL;
 }
 
 hashMap_remove(exports, rsa);

[06/50] celix git commit: CELIX-237: Updated log levels for dfi lib

[pnoltes]

CELIX-237: Updated log levels for dfi lib


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/0da1becf
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/0da1becf
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/0da1becf

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 0da1becf6ffdddffd76a3ba36d2e85edb2227637
Parents: 22797e1
Author: Pepijn Noltes 
Authored: Tue Oct 13 19:34:16 2015 +0200
Committer: Pepijn Noltes 
Committed: Tue Oct 13 19:34:16 2015 +0200

--
 .../dynamic_function_interface_tst/dyn_closure_tests.cpp | 8 
 .../dynamic_function_interface_tst/dyn_function_tests.cpp| 7 ---
 .../dynamic_function_interface_tst/dyn_type_tests.cpp| 2 +-
 .../dynamic_function_interface_tst/json_rpc_tests.cpp| 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/0da1becf/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_closure_tests.cpp
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_closure_tests.cpp
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_closure_tests.cpp
index b2b11d7..6a79678 100644
--- 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_closure_tests.cpp
+++ 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_closure_tests.cpp
@@ -132,10 +132,10 @@ static void tests() {
 
 TEST_GROUP(DynClosureTests) {
 void setup() {
-dynFunction_logSetup(stdLog, NULL, 3);
-dynType_logSetup(stdLog, NULL, 3);
-//TODO dynType_logSetup(stdLog, NULL, 4);
-dynCommon_logSetup(stdLog, NULL, 3);
+int lvl = 1;
+dynFunction_logSetup(stdLog, NULL, lvl);
+dynType_logSetup(stdLog, NULL, lvl);
+dynCommon_logSetup(stdLog, NULL, lvl);
 g_count = 0;
 }
 };

http://git-wip-us.apache.org/repos/asf/celix/blob/0da1becf/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_function_tests.cpp
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_function_tests.cpp
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_function_tests.cpp
index 14f2f54..d1bc82e 100644
--- 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_function_tests.cpp
+++ 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_function_tests.cpp
@@ -209,9 +209,10 @@ extern "C" {
 
 TEST_GROUP(DynFunctionTests) {
 void setup() {
-dynFunction_logSetup(stdLog, NULL, 3);
-dynType_logSetup(stdLog, NULL, 3);
-dynCommon_logSetup(stdLog, NULL, 3);
+int lvl = 1;
+dynFunction_logSetup(stdLog, NULL, lvl);
+dynType_logSetup(stdLog, NULL, lvl);
+dynCommon_logSetup(stdLog, NULL, lvl);
 }
 };
 

http://git-wip-us.apache.org/repos/asf/celix/blob/0da1becf/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
index e2fe950..9cf81c5 100644
--- 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
+++ 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
@@ -52,7 +52,7 @@ extern "C" {
 
 TEST_GROUP(DynTypeTests) {
void setup() {
-   dynType_logSetup(stdLog, NULL, 4);
+   dynType_logSetup(stdLog, NULL, 1);
}
 };
 

http://git-wip-us.apache.org/repos/asf/celix/blob/0da1becf/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_rpc_tests.cpp
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_rpc_tests.cpp
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_rpc_tests.cpp
index c7a3350..f49f9a5 100644
--- 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_rpc_tests.cpp
+++ 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/json_rpc_tests.cpp
@@ -290,7 +290,7 @@ static void stdLog(void *handle, int level, const char 
*file, int line, const ch
 
 TEST_GROUP(JsonRpcTests) {
 void setup() {
-int lvl = 4;
+

[40/50] celix git commit: CELIX-237: disabled rsa_dfi for osx builds (2)

[pnoltes]

CELIX-237: disabled rsa_dfi for osx builds (2)


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/71bf3302
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/71bf3302
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/71bf3302

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 71bf330256aa3294c9eaa0854b620d72a7c3e2f5
Parents: e462854
Author: Bjoern Petri 
Authored: Mon Oct 19 16:16:33 2015 +0200
Committer: Bjoern Petri 
Committed: Mon Oct 19 16:16:33 2015 +0200

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/71bf3302/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 89f11a7..b23d297 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ script:
  # RSA_DISCOVERY_SHM is only working on linux, but both compilers (see 
CELIX-277)
  # RSA_SHM is only working on linux, but both compilers (see CELIX-277)
 - cd build
-- if [ "$CC" = "clang" OR "$TRAVIS_OS_NAME" = "osx" ]; then export 
BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
+- if [ "$CC" = "clang"] || [ "$TRAVIS_OS_NAME" = "osx" ]; then export 
BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then  cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=OFF -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=OFF 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
 - make all && make deploy && make install-all

[32/50] celix git commit: CELIX-237: Added interface check to that method must return an int. This to always be able to throw "exceptions". disabled printing dyn_types to stdout.

[pnoltes]

CELIX-237: Added interface check to that method must return an int. This to 
always be able to throw "exceptions". disabled printing dyn_types to stdout.


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/75773baf
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/75773baf
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/75773baf

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 75773baf300fea80a790efa0d7f53a7acb68ef86
Parents: f60ca0d
Author: Pepijn Noltes 
Authored: Fri Oct 16 13:26:47 2015 +0200
Committer: Pepijn Noltes 
Committed: Fri Oct 16 13:26:47 2015 +0200

--
 .../dynamic_function_interface/dyn_interface.c   | 11 +++
 .../dynamic_function_interface_tst/dyn_type_tests.cpp|  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/75773baf/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c
index 9bb7bcc..823957b 100644
--- 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c
+++ 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c
@@ -95,6 +95,17 @@ static int dynInterface_checkInterface(dyn_interface_type 
*intf) {
 status = ERROR;
 LOG_ERROR("Parse Error. There must be a header section with a 
type, version and name entry");
 }
+
+struct method_entry *mEntry = NULL;
+TAILQ_FOREACH(mEntry, >methods, entries) {
+dyn_type *type = dynFunction_returnType(mEntry->dynFunc);
+int descriptor = dynType_descriptorType(type);
+if (descriptor != 'N') {
+status = ERROR;
+LOG_ERROR("Parse Error. Only method with a return type 'N' 
(native int) are supported. Got return type '%c'\n", descriptor);
+break;
+}
+}
 }
 
 return status;

http://git-wip-us.apache.org/repos/asf/celix/blob/75773baf/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
index 9cf81c5..4b9bd41 100644
--- 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
+++ 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface_tst/dyn_type_tests.cpp
@@ -43,7 +43,7 @@ extern "C" {
 }
 
 FILE *stream = fopen("/dev/null", "w");
-dynType_print(type, stdout);
+dynType_print(type, stream);
 fclose(stream);
 dynType_destroy(type);
 //printf("--\n\n");

celix git commit: CELIX-230: Removed unneeded install of command_impl.h header

[pnoltes]

Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service 
b63c0d9fc -> 97b667949


CELIX-230: Removed unneeded install of command_impl.h header


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/97b66794
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/97b66794
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/97b66794

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 97b667949b928d410cc6349253b70a22ea5973f0
Parents: b63c0d9
Author: Pepijn Noltes 
Authored: Tue Oct 27 17:00:09 2015 +0100
Committer: Pepijn Noltes 
Committed: Tue Oct 27 17:00:09 2015 +0100

--
 shell/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/97b66794/shell/CMakeLists.txt
--
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 26252c4..40df757 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -39,7 +39,7 @@ if (SHELL)
 
 install_bundle(shell
HEADERS
-   public/include/shell.h public/include/command.h 
public/include/command_impl.h
+   public/include/shell.h public/include/command.h
RESOURCES 
public/src/command.c
)

celix git commit: CELIX-230: Refactored shell command for remote service calculator example. Added missing include in command.h

[pnoltes]

Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service 
3bf493eb0 -> b63c0d9fc


CELIX-230: Refactored shell command for remote service calculator example. 
Added missing include in command.h


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/b63c0d9f
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/b63c0d9f
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/b63c0d9f

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: b63c0d9fc96ec198437f5360e4cfb6f1152a056b
Parents: 3bf493e
Author: Pepijn Noltes 
Authored: Tue Oct 27 16:54:44 2015 +0100
Committer: Pepijn Noltes 
Committed: Tue Oct 27 16:54:44 2015 +0100

--
 .../examples/calculator_shell/CMakeLists.txt|  1 -
 .../private/include/add_command.h   |  5 +-
 .../private/include/sqrt_command.h  |  5 +-
 .../private/include/sub_command.h   |  5 +-
 .../calculator_shell/private/src/add_command.c  | 46 +---
 .../private/src/calculator_shell_activator.c| 55 +---
 .../calculator_shell/private/src/sqrt_command.c | 42 ---
 .../calculator_shell/private/src/sub_command.c  | 46 +---
 shell/CMakeLists.txt|  6 +--
 shell/public/include/command.h  |  1 +
 10 files changed, 71 insertions(+), 141 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/b63c0d9f/remote_services/examples/calculator_shell/CMakeLists.txt
--
diff --git a/remote_services/examples/calculator_shell/CMakeLists.txt 
b/remote_services/examples/calculator_shell/CMakeLists.txt
index dcb8c8f..b93afca 100644
--- a/remote_services/examples/calculator_shell/CMakeLists.txt
+++ b/remote_services/examples/calculator_shell/CMakeLists.txt
@@ -32,7 +32,6 @@ bundle(calculator_shell SOURCES
 private/include/add_command.h
 private/include/sqrt_command.h
 private/include/sub_command.h
-../../../shell/public/src/command.c
 
 
 FILES

http://git-wip-us.apache.org/repos/asf/celix/blob/b63c0d9f/remote_services/examples/calculator_shell/private/include/add_command.h
--
diff --git 
a/remote_services/examples/calculator_shell/private/include/add_command.h 
b/remote_services/examples/calculator_shell/private/include/add_command.h
index 1ff9d96..58a7bda 100644
--- a/remote_services/examples/calculator_shell/private/include/add_command.h
+++ b/remote_services/examples/calculator_shell/private/include/add_command.h
@@ -27,9 +27,6 @@
 #ifndef ADD_COMMAND_H_
 #define ADD_COMMAND_H_
 
-#include "command_impl.h"
-
-command_pt addCommand_create(bundle_context_pt context);
-void addCommand_destroy(command_pt command);
+void addCommand_execute(bundle_context_pt context, char *line, FILE *out, FILE 
*err);
 
 #endif /* ADD_COMMAND_H_ */

http://git-wip-us.apache.org/repos/asf/celix/blob/b63c0d9f/remote_services/examples/calculator_shell/private/include/sqrt_command.h
--
diff --git 
a/remote_services/examples/calculator_shell/private/include/sqrt_command.h 
b/remote_services/examples/calculator_shell/private/include/sqrt_command.h
index 257abff..c9d07d2 100644
--- a/remote_services/examples/calculator_shell/private/include/sqrt_command.h
+++ b/remote_services/examples/calculator_shell/private/include/sqrt_command.h
@@ -27,9 +27,6 @@
 #ifndef SQRT_COMMAND_H_
 #define SQRT_COMMAND_H_
 
-#include "command_impl.h"
-
-command_pt sqrtCommand_create(bundle_context_pt context);
-void sqrtCommand_destroy(command_pt command);
+void sqrtCommand_execute(bundle_context_pt context, char *line, FILE *out, 
FILE *err);
 
 #endif /* SQRT_COMMAND_H_ */

http://git-wip-us.apache.org/repos/asf/celix/blob/b63c0d9f/remote_services/examples/calculator_shell/private/include/sub_command.h
--
diff --git 
a/remote_services/examples/calculator_shell/private/include/sub_command.h 
b/remote_services/examples/calculator_shell/private/include/sub_command.h
index d584835..cf13616 100644
--- a/remote_services/examples/calculator_shell/private/include/sub_command.h
+++ b/remote_services/examples/calculator_shell/private/include/sub_command.h
@@ -27,9 +27,6 @@
 #ifndef SUB_COMMAND_H_
 #define SUB_COMMAND_H_
 
-#include "command_impl.h"
-
-command_pt subCommand_create(bundle_context_pt context);
-void subCommand_destroy(command_pt command);
+void subCommand_execute(bundle_context_pt context, char *line, FILE *out, FILE 
*err);
 
 #endif /* SUB_COMMAND_H_ */

[47/50] celix git commit: CELIX-276: remove unused variable

[pnoltes]

CELIX-276: remove unused variable


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/4023f366
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/4023f366
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/4023f366

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 4023f3665e1bb0db2a4857c36bde80d73cc39514
Parents: 80a4f03
Author: Bjoern Petri 
Authored: Fri Oct 23 13:58:13 2015 +0200
Committer: Bjoern Petri 
Committed: Fri Oct 23 13:58:13 2015 +0200

--
 remote_services/topology_manager/private/src/topology_manager.c | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/4023f366/remote_services/topology_manager/private/src/topology_manager.c
--
diff --git a/remote_services/topology_manager/private/src/topology_manager.c 
b/remote_services/topology_manager/private/src/topology_manager.c
index 424c00c..acc6941 100644
--- a/remote_services/topology_manager/private/src/topology_manager.c
+++ b/remote_services/topology_manager/private/src/topology_manager.c
@@ -311,7 +311,6 @@ celix_status_t topologyManager_rsaRemoved(void * handle, 
service_reference_pt re
 
 while (hashMapIterator_hasNext(iter)) {
 hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
-endpoint_description_pt ep = hashMapEntry_getKey(entry);
 hash_map_pt imports = hashMapEntry_getValue(entry);
 
 import_registration_pt import = hashMap_get(imports, rsa);

[41/50] celix git commit: CELIX-237: disabled rsa_dfi for osx builds (3)

[pnoltes]

 CELIX-237: disabled rsa_dfi for osx builds (3)


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/d3b68dad
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/d3b68dad
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/d3b68dad

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: d3b68dad15121db9eabca9516bc5252add37d0c8
Parents: 71bf330
Author: Bjoern Petri 
Authored: Mon Oct 19 16:21:51 2015 +0200
Committer: Bjoern Petri 
Committed: Mon Oct 19 16:21:51 2015 +0200

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/d3b68dad/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index b23d297..caba64f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ script:
  # RSA_DISCOVERY_SHM is only working on linux, but both compilers (see 
CELIX-277)
  # RSA_SHM is only working on linux, but both compilers (see CELIX-277)
 - cd build
-- if [ "$CC" = "clang"] || [ "$TRAVIS_OS_NAME" = "osx" ]; then export 
BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
+- if [ "$CC" = "clang" ] || [ "$TRAVIS_OS_NAME" = "osx" ]; then export 
BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then  cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=OFF -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=OFF 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
 - make all && make deploy && make install-all

[31/50] celix git commit: CELIX-276: added handling of importedServices when rsa gets removed.

[pnoltes]

CELIX-276: added handling of importedServices when rsa gets removed.


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/48558e8b
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/48558e8b
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/48558e8b

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 48558e8bc090979c7866be0c8ccde5d4d89b88ad
Parents: f60ca0d
Author: Bjoern Petri 
Authored: Fri Oct 16 09:10:31 2015 +0200
Committer: Bjoern Petri 
Committed: Fri Oct 16 09:10:31 2015 +0200

--
 .../private/include/topology_manager.h  |  2 +
 .../topology_manager/private/src/activator.c|  2 +-
 .../private/src/topology_manager.c  | 47 +---
 3 files changed, 33 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/48558e8b/remote_services/topology_manager/private/include/topology_manager.h
--
diff --git 
a/remote_services/topology_manager/private/include/topology_manager.h 
b/remote_services/topology_manager/private/include/topology_manager.h
index f0f9884..ade5a1e 100644
--- a/remote_services/topology_manager/private/include/topology_manager.h
+++ b/remote_services/topology_manager/private/include/topology_manager.h
@@ -32,6 +32,8 @@
 #include "bundle_context.h"
 #include "log_helper.h"
 
+#define OSGI_RSA_REMOTE_SERVICE_ADMIN "remote_service_admin"
+
 typedef struct topology_manager *topology_manager_pt;
 
 celix_status_t topologyManager_create(bundle_context_pt context, log_helper_pt 
logHelper, topology_manager_pt *manager);

http://git-wip-us.apache.org/repos/asf/celix/blob/48558e8b/remote_services/topology_manager/private/src/activator.c
--
diff --git a/remote_services/topology_manager/private/src/activator.c 
b/remote_services/topology_manager/private/src/activator.c
index b83c060..42046b3 100644
--- a/remote_services/topology_manager/private/src/activator.c
+++ b/remote_services/topology_manager/private/src/activator.c
@@ -124,7 +124,7 @@ static celix_status_t 
bundleActivator_createRSATracker(struct activator *activat
 status = serviceTrackerCustomizer_create(activator->manager, 
topologyManager_rsaAdding, topologyManager_rsaAdded, 
topologyManager_rsaModified, topologyManager_rsaRemoved, );
 
 if (status == CELIX_SUCCESS) {
-status = serviceTracker_create(activator->context, 
"remote_service_admin", customizer, tracker);
+status = serviceTracker_create(activator->context, 
OSGI_RSA_REMOTE_SERVICE_ADMIN, customizer, tracker);
 }
 
 return status;

http://git-wip-us.apache.org/repos/asf/celix/blob/48558e8b/remote_services/topology_manager/private/src/topology_manager.c
--
diff --git a/remote_services/topology_manager/private/src/topology_manager.c 
b/remote_services/topology_manager/private/src/topology_manager.c
index f78bde5..68be8c8 100644
--- a/remote_services/topology_manager/private/src/topology_manager.c
+++ b/remote_services/topology_manager/private/src/topology_manager.c
@@ -214,12 +214,7 @@ celix_status_t topologyManager_rsaAdded(void * handle, 
service_reference_pt refe
 
 if (status == CELIX_SUCCESS) {
 hash_map_pt imports = hashMapEntry_getValue(entry);
-
-if (imports == NULL) {
-imports = hashMap_create(NULL, NULL, NULL, NULL);
-}
-
-hashMap_put(imports, service, import);
+hashMap_put(imports, rsa, import);
 }
 }
 
@@ -244,10 +239,6 @@ celix_status_t topologyManager_rsaAdded(void * handle, 
service_reference_pt refe
 if (status == CELIX_SUCCESS) {
 hash_map_pt exports = hashMapEntry_getValue(entry);
 
-if (exports == NULL) {
-exports = hashMap_create(NULL, NULL, NULL, NULL);
-}
-
 hashMap_put(exports, rsa, endpoints);
 status = topologyManager_notifyListenersEndpointAdded(manager, 
rsa, endpoints);
 }
@@ -317,6 +308,30 @@ celix_status_t topologyManager_rsaRemoved(void * handle, 
service_reference_pt re
 
 status = celixThreadMutex_unlock(>exportedServicesLock);
 
+status = celixThreadMutex_lock(>importedServicesLock);
+
+iter = hashMapIterator_create(manager->importedServices);
+
+while (hashMapIterator_hasNext(iter)) {
+hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+endpoint_description_pt ep = hashMapEntry_getKey(entry);
+hash_map_pt imports = hashMapEntry_getValue(entry);
+
+import_registration_pt import = hashMap_get(imports, rsa);
+
+if (import != 

[49/50] celix git commit: CELIX-280: 280 fixed deployment_admin shutdown

[pnoltes]

CELIX-280: 280 fixed deployment_admin shutdown


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/6c938519
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/6c938519
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/6c938519

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 6c9385199bf2bb026c4919b2def71d2eda4f0ff0
Parents: 9550e63
Author: Bjoern Petri 
Authored: Sun Oct 25 16:00:57 2015 +0100
Committer: Bjoern Petri 
Committed: Sun Oct 25 16:00:57 2015 +0100

--
 deployment_admin/private/src/deployment_admin.c | 24 ++--
 1 file changed, 17 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/6c938519/deployment_admin/private/src/deployment_admin.c
--
diff --git a/deployment_admin/private/src/deployment_admin.c 
b/deployment_admin/private/src/deployment_admin.c
index 7a78012..7e936e4 100644
--- a/deployment_admin/private/src/deployment_admin.c
+++ b/deployment_admin/private/src/deployment_admin.c
@@ -67,7 +67,7 @@ static void* deploymentAdmin_poll(void *deploymentAdmin);
 celix_status_t deploymentAdmin_download(deployment_admin_pt admin, 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);
-celix_status_t deploymentAdmin_readVersions(deployment_admin_pt admin, 
array_list_pt *versions);
+celix_status_t deploymentAdmin_readVersions(deployment_admin_pt admin, 
array_list_pt versions);
 
 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);
@@ -145,6 +145,10 @@ celix_status_t deploymentAdmin_create(bundle_context_pt 
context, deployment_admi
 celix_status_t deploymentAdmin_destroy(deployment_admin_pt admin) {
celix_status_t status = CELIX_SUCCESS;
 
+admin->running = false;
+
+celixThread_join(admin->poller, NULL);
+
hash_map_iterator_pt iter = hashMapIterator_create(admin->packages);
 
while (hashMapIterator_hasNext(iter)) {
@@ -214,7 +218,9 @@ static void *deploymentAdmin_poll(void *deploymentAdmin) {
while (admin->running) {
//poll ace
array_list_pt versions = NULL;
-   deploymentAdmin_readVersions(admin, );
+   arrayList_create();
+
+   deploymentAdmin_readVersions(admin, versions);
 
char *last = arrayList_get(versions, arrayList_size(versions) - 
1);
 
@@ -299,10 +305,12 @@ static void *deploymentAdmin_poll(void *deploymentAdmin) {
}
}
}
+
sleep(5);
+
+   arrayList_destroy(versions);
}
 
-   celixThread_exit(NULL);
return NULL;
 }
 
@@ -329,9 +337,9 @@ size_t deploymentAdmin_parseVersions(void *contents, size_t 
size, size_t nmemb,
return realsize;
 }
 
-celix_status_t deploymentAdmin_readVersions(deployment_admin_pt admin, 
array_list_pt *versions) {
+celix_status_t deploymentAdmin_readVersions(deployment_admin_pt admin, 
array_list_pt versions) {
celix_status_t status = CELIX_SUCCESS;
-   arrayList_create(versions);
+
CURL *curl;
CURLcode res;
curl = curl_easy_init();
@@ -353,12 +361,14 @@ celix_status_t 
deploymentAdmin_readVersions(deployment_admin_pt admin, array_lis
char *last;
char *token = strtok_r(chunk.memory, "\n", );
while (token != NULL) {
-   arrayList_add(*versions, strdup(token));
+   arrayList_add(versions, strdup(token));
token = strtok_r(NULL, "\n", );
}
}
 
-
+if (chunk.memory) {
+free(chunk.memory);
+}
 
return status;
 }

[22/50] celix git commit: CELIX-237: remote_service_admin.h is dependent on export_registration.h, import_registration.h - so they should be exported as well

[pnoltes]

CELIX-237: remote_service_admin.h is dependent on export_registration.h, 
import_registration.h - so they should be exported as well


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/93902231
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/93902231
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/93902231

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 939022312e8f17e0e5e42dc7db68d0e1d96f5b59
Parents: e14cc7d
Author: Bjoern Petri 
Authored: Wed Oct 14 15:25:28 2015 +0200
Committer: Bjoern Petri 
Committed: Wed Oct 14 15:25:28 2015 +0200

--
 remote_services/remote_service_admin/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/93902231/remote_services/remote_service_admin/CMakeLists.txt
--
diff --git a/remote_services/remote_service_admin/CMakeLists.txt 
b/remote_services/remote_service_admin/CMakeLists.txt
index 310dafa..9d0f4f7 100644
--- a/remote_services/remote_service_admin/CMakeLists.txt
+++ b/remote_services/remote_service_admin/CMakeLists.txt
@@ -25,6 +25,8 @@ install (FILES
 public/include/remote_endpoint.h
 public/include/remote_proxy.h
 public/include/remote_service_admin.h
+public/include/export_registration.h
+public/include/import_registration.h
 public/include/endpoint_description.h
 public/include/endpoint_listener.h
 public/include/remote_constants.h

[34/50] celix git commit: CELIX-237: Disabled rsa dfi for clang. There seems to be an issue with clang icm the travis linux env. Cannot reproduce this locally, so for now disableing it.

[pnoltes]

CELIX-237: Disabled rsa dfi for clang. There seems to be an issue with clang 
icm the travis linux env. Cannot reproduce this locally, so for now disableing 
it.


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e3ce10b3
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e3ce10b3
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e3ce10b3

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: e3ce10b3200083f62636e82f5553e8d58745b208
Parents: 2963e3c
Author: Pepijn Noltes 
Authored: Fri Oct 16 13:50:47 2015 +0200
Committer: Pepijn Noltes 
Committed: Fri Oct 16 13:50:47 2015 +0200

--
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/e3ce10b3/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 8b7f0d3..8b46bec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,8 @@ before_script:
 
 script:
 - cd build
-- cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON 
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DCMAKE_INSTALL_PREFIX=../install ..
+- if [ "$CC" = "clang" ]; then export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; else export 
BUILD_OPTS=""; fi
+- cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON 
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..
 - make all && make deploy && make install-all
 - export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage
 

[09/50] celix git commit: CELIX-237: Updated FindFFI to use pkg-config when available. Also tryin to build/test again

[pnoltes]

CELIX-237: Updated FindFFI to use pkg-config when available. Also tryin to 
build/test again


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/a6272090
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/a6272090
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/a6272090

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: a6272090a42e467ab9e4277a7d189b7da9257f3a
Parents: 24d6d11
Author: Pepijn Noltes 
Authored: Tue Oct 13 22:34:47 2015 +0200
Committer: Pepijn Noltes 
Committed: Tue Oct 13 22:34:47 2015 +0200

--
 .travis.yml |  2 +-
 cmake/FindFFI.cmake | 27 +++
 2 files changed, 16 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/a6272090/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index f91ab76..5a86242 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_script:
 
 script:
 - cd build
-- cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON 
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON -DCMAKE_INSTALL_PREFIX=../install 
..
+- cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON 
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DCMAKE_INSTALL_PREFIX=../install ..
 - make all && make deploy && make install-all
 - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage
 

http://git-wip-us.apache.org/repos/asf/celix/blob/a6272090/cmake/FindFFI.cmake
--
diff --git a/cmake/FindFFI.cmake b/cmake/FindFFI.cmake
index 7fd04e4..15680b7 100644
--- a/cmake/FindFFI.cmake
+++ b/cmake/FindFFI.cmake
@@ -23,23 +23,26 @@
 #  FFI_INCLUDE_DIRS - The package include directories
 #  FFI_LIBRARIES - The libraries needed to use this package
 
-find_library(FFI_LIBRARY NAMES ffi
-   PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr/local /opt/local ENV FFI_DIR
-   PATH_SUFFIXES lib lib/x86_64-linux-gnu NO_DEFAULT_PATH)
+if (NOT WIN32)
+   # try using pkg-config to get the directories and then use these values
+   # in the find_path() and find_library() calls
+   find_package(PkgConfig QUIET)
+   PKG_CHECK_MODULES(PC_LIBFFI QUIET libffi)
+endif ()
 
-find_library(FFI_LIBRARY NAMES ffi
-   PATH_SUFFIXES lib)
+mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY)
 
-#NOTE on OSX ffi.h from macport is located at 
/opt/local/lib/libffi-/ffi.h 
-#Using FFI_LIBRARY location as hint to find it
-find_path(FFI_INCLUDE_DIR ffi.h
-   HINTS /opt/local/lib/*
-PATH_SUFFIXES include include/ffi) 
+find_library(FFI_LIBRARY NAMES ffi
+PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr/local /opt/local
+PATH_SUFFIXES lib
+HINTS ${PC_LIBFFI_LIBDIR} ${PC_LIBFFI_LIBRARY_DIRS}
+)
 
 find_path(FFI_INCLUDE_DIR ffi.h
PATHS $ENV{FFI_DIR} ${FFI_DIR} /usr /usr/local /opt/local 
-PATH_SUFFIXES include include/ffi include/x86_64-linux-gnu) 
-
+PATH_SUFFIXES include include/ffi
+HINTS ${PC_LIBFFI_INCLUDEDIR} ${PC_LIBFFI_INCLUDE_DIRS}
+)
 
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set FFI_FOUND to TRUE

[45/50] celix git commit: CELIX-237: add missing strdup

[pnoltes]

CELIX-237: add missing strdup


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/78bb1e3f
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/78bb1e3f
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/78bb1e3f

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 78bb1e3fe71f3d8c80fc0b7b33df6505bd2d6fb1
Parents: d2c53ed
Author: Bjoern Petri 
Authored: Thu Oct 22 15:03:55 2015 +0200
Committer: Bjoern Petri 
Committed: Thu Oct 22 15:03:55 2015 +0200

--
 .../rsa/private/src/remote_service_admin_dfi.c   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/78bb1e3f/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
--
diff --git 
a/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
 
b/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
index a66bd27..066c3da 100644
--- 
a/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
+++ 
b/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
@@ -169,7 +169,7 @@ celix_status_t remoteServiceAdmin_create(bundle_context_pt 
context, remote_servi
 }
 else {
 logHelper_log((*admin)->loghelper, OSGI_LOGSERVICE_WARNING, "RSA: 
No IP address for service annunciation set. Using %s", DEFAULT_IP);
-(*admin)->ip = (char*) DEFAULT_IP;
+(*admin)->ip = strdup((char*) DEFAULT_IP);
 }
 
 if (detectedIp != NULL) {
@@ -734,4 +734,4 @@ static void remoteServiceAdmin_log(remote_service_admin_pt 
admin, int level, con
 char buf2[256];
 vsnprintf(buf2, 256, msg, ap);
 logHelper_log(admin->loghelper, levels[level], "%s%s", buf1, buf2);
-}
\ No newline at end of file
+}

[44/50] celix git commit: CELIX-237: fix json serialization

[pnoltes]

CELIX-237: fix json serialization


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/d2c53ed9
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/d2c53ed9
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/d2c53ed9

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: d2c53ed93373cd7010ec960ac4de6f66f5540131
Parents: ade96be
Author: Bjoern Petri 
Authored: Wed Oct 21 21:53:24 2015 +0200
Committer: Bjoern Petri 
Committed: Wed Oct 21 21:53:24 2015 +0200

--
 .../examples/calculator_proxy/private/src/calculator_proxy_impl.c  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/d2c53ed9/remote_services/examples/calculator_proxy/private/src/calculator_proxy_impl.c
--
diff --git 
a/remote_services/examples/calculator_proxy/private/src/calculator_proxy_impl.c 
b/remote_services/examples/calculator_proxy/private/src/calculator_proxy_impl.c
index af2cfc3..fc21412 100644
--- 
a/remote_services/examples/calculator_proxy/private/src/calculator_proxy_impl.c
+++ 
b/remote_services/examples/calculator_proxy/private/src/calculator_proxy_impl.c
@@ -68,7 +68,7 @@ celix_status_t calculatorProxy_add(calculator_pt calculator, 
double a, double b,
 
if (calculator->endpoint != NULL) {
json_t *root;
-   root = json_pack("{s:s, s:[fmt]}", "m", "add(DD)D", "a", a, b);
+   root = json_pack("{s:s, s:[ff]}", "m", "add(DD)D", "a", a, b);
 
char *data = json_dumps(root, 0);
char *reply = NULL;

[39/50] celix git commit: CELIX-237: disabled rsa_dfi for osx builds

[pnoltes]

CELIX-237: disabled rsa_dfi for osx builds


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e462854a
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e462854a
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e462854a

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: e462854a35749cc061d0cc3ee5b4f48912c21fbd
Parents: fabe667
Author: Bjoern Petri 
Authored: Mon Oct 19 16:00:21 2015 +0200
Committer: Bjoern Petri 
Committed: Mon Oct 19 16:00:21 2015 +0200

--
 .travis.yml | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/e462854a/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 18dc507..89f11a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ compiler:
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update && sudo 
apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov libffi-dev; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov 
libffi; fi
 
 before_script:
 - wget 
https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true
 -O /tmp/cpputest.tar.gz
@@ -24,10 +24,14 @@ before_script:
 - mkdir build install
 
 script:
+ # the following setup is broken:
+ # RSA_DFI is only working for gcc on linux
+ # RSA_DISCOVERY_SHM is only working on linux, but both compilers (see 
CELIX-277)
+ # RSA_SHM is only working on linux, but both compilers (see CELIX-277)
 - cd build
-- if [ "$CC" = "clang" ]; then export BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
+- if [ "$CC" = "clang" OR "$TRAVIS_OS_NAME" = "osx" ]; then export 
BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then  cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=OFF -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=OFF 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then  cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=OFF -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=OFF 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
 - make all && make deploy && make install-all
 - export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage
 

[50/50] celix git commit: CELIX-230: Merge branch 'develop' into shell refactor. Refactored shell service and update shell_tui and remote_shell for refactored shell service

[pnoltes]

CELIX-230: Merge branch 'develop' into shell refactor. Refactored shell service 
and update shell_tui and remote_shell for refactored shell service

Conflicts:
launcher/private/src/launcher.c
shell/private/src/help_command.c


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/c35a74c7
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/c35a74c7
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/c35a74c7

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: c35a74c762837711df59fcde447889164cb29402
Parents: bafe2ef 6c93851
Author: Pepijn Noltes 
Authored: Tue Oct 27 16:19:18 2015 +0100
Committer: Pepijn Noltes 
Committed: Tue Oct 27 16:19:18 2015 +0100

--
 .gitignore  |4 +
 .travis.yml |   41 +
 CMakeLists.txt  |   17 +-
 LICENSE |   26 +-
 README.md   |2 +-
 cmake/CMakeCelix.cmake  |6 +-
 cmake/FindCppUTest.cmake|   34 +-
 cmake/FindFFI.cmake |   57 +
 cmake/cmake_celix/CodeCoverage.cmake|   48 +-
 cmake/cmake_celix/Test.cmake|   52 -
 dependency_manager_2/CMakeLists.txt |2 +-
 deployment_admin/CMakeLists.txt |   10 +-
 deployment_admin/private/src/deployment_admin.c |   55 +-
 .../private/src/deployment_package.c|1 +
 device_access/device_access/CMakeLists.txt  |4 +-
 .../device_access/private/src/device_manager.c  |1 +
 .../private/src/driver_attributes.c |1 +
 .../device_access/private/src/driver_loader.c   |1 +
 device_access/driver_locator/CMakeLists.txt |4 +-
 .../example/base_driver/CMakeLists.txt  |4 +-
 .../base_driver/private/src/base_driver.c   |2 +-
 .../example/consuming_driver/CMakeLists.txt |4 +-
 .../private/src/consuming_driver.c  |1 +
 .../example/refining_driver/CMakeLists.txt  |4 +-
 .../private/src/refining_driver.c   |1 +
 examples/CMakeLists.txt |7 +-
 examples/deploy.cmake   |6 +-
 framework/CMakeLists.txt|  144 +-
 framework/private/include/framework_private.h   |6 +-
 framework/private/mock/bundle_context_mock.c|   25 +-
 framework/private/mock/bundle_mock.c|   13 +-
 framework/private/mock/framework_mock.c |6 +-
 framework/private/src/bundle_archive.c  |2 +-
 framework/private/src/bundle_cache.c|5 +-
 framework/private/src/celix_launcher.c  |  190 +++
 framework/private/src/celix_log.c   |5 +-
 framework/private/src/framework.c   |  318 ++--
 framework/private/src/properties.c  |   13 +-
 framework/private/src/service_registration.c|   13 +-
 framework/private/src/service_registry.c|2 +-
 framework/private/test/bundle_context_test.cpp  |   75 +-
 framework/public/include/celix_launcher.h   |   41 +
 framework/public/include/properties.h   |3 +
 framework/tst/CMakeLists.txt|   30 +
 framework/tst/config.properties.in  |2 +
 framework/tst/framework1.properties.in  |3 +
 framework/tst/framework2.properties.in  |3 +
 framework/tst/multiple_frameworks_test.cpp  |   89 ++
 framework/tst/run_tests.cpp |9 +
 framework/tst/single_framework_test.cpp |   69 +
 launcher/CMakeLists.txt |   10 +-
 launcher/private/src/launcher.c |  202 ---
 launcher/private/src/main.c |   88 ++
 log_service/CMakeLists.txt  |2 +-
 log_service/private/src/log_factory.c   |2 +-
 log_writer/CMakeLists.txt   |2 +-
 .../private/src/log_writer_syslog.c |2 -
 remote_services/CMakeLists.txt  |   11 +-
 .../discovery/private/src/discovery.c   |1 +
 .../discovery/private/src/discovery_activator.c |  186 +--
 .../private/src/endpoint_discovery_poller.c |  191 ++-
 .../private/src/endpoint_discovery_server.c |   51 +-
 .../discovery_configured/CMakeLists.txt |   24 +-
 remote_services/discovery_etcd/CMakeLists.txt   |2 +-
 .../discovery_etcd/private/include/etcd.h   |2 +-
 .../discovery_etcd/private/src/discovery_impl.c |9 +-
 .../discovery_etcd/private/src/etcd.c   |  135 +-
 .../discovery_etcd/private/src/etcd_watcher.c   |   78 +-
 .../discovery_shm/private/src/shm_watcher.c |3 +-
 

[15/50] celix git commit: CELIX-237: Enabled building & testing rsa dfi

[pnoltes]

CELIX-237: Enabled building & testing rsa dfi


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/9e991050
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/9e991050
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/9e991050

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 9e9910505f02be686ac48d78c8ebc5b9c8d05a40
Parents: 331417b
Author: Pepijn Noltes 
Authored: Wed Oct 14 10:12:05 2015 +0200
Committer: Pepijn Noltes 
Committed: Wed Oct 14 10:12:05 2015 +0200

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/9e991050/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 8911bc7..9816f17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ before_script:
 
 script:
 - cd build
-- cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON 
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON -DCMAKE_INSTALL_PREFIX=../install 
..
+- cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON 
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DCMAKE_INSTALL_PREFIX=../install ..
 - make all && make deploy && make install-all
 - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage
 

[42/50] celix git commit: CELIX-237: travis: remove default ffi-installation for osx, enable RSA_DI

[pnoltes]

CELIX-237: travis: remove default ffi-installation for osx, enable RSA_DI


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/485c43a7
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/485c43a7
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/485c43a7

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 485c43a7e8c90d49dc9e1a11deb5f20ccf74f2c5
Parents: d3b68da
Author: Bjoern Petri 
Authored: Tue Oct 20 14:26:57 2015 +0200
Committer: Bjoern Petri 
Committed: Tue Oct 20 14:26:57 2015 +0200

--
 .travis.yml | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/485c43a7/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index caba64f..c753d97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ compiler:
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update && sudo 
apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov libffi-dev; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov 
libffi; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov 
libffi && sudo rm -rf /usr/include/ffi; fi
 
 before_script:
 - wget 
https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true
 -O /tmp/cpputest.tar.gz
@@ -25,13 +25,12 @@ before_script:
 
 script:
  # the following setup is broken:
- # RSA_DFI is only working for gcc on linux
  # RSA_DISCOVERY_SHM is only working on linux, but both compilers (see 
CELIX-277)
  # RSA_SHM is only working on linux, but both compilers (see CELIX-277)
 - cd build
-- if [ "$CC" = "clang" ] || [ "$TRAVIS_OS_NAME" = "osx" ]; then export 
BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
+- if [ "$CC" = "clang" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export 
BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then  cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=OFF -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=OFF 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then  cmake 
-DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON 
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=OFF -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=OFF 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON  
-DFFI_INCLUDE_DIR=/usr/local/opt/libffi/lib/libffi-3.0.13/include 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
 - make all && make deploy && make install-all
 - export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage
 

[21/50] celix git commit: CELIX-237: Disabling rsa dfi build & test

[pnoltes]

CELIX-237: Disabling rsa dfi build & test


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e14cc7da
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e14cc7da
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e14cc7da

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: e14cc7dad2e273914e6c77b7489b686f115998a6
Parents: 05ece94
Author: Pepijn Noltes 
Authored: Wed Oct 14 12:29:44 2015 +0200
Committer: Pepijn Noltes 
Committed: Wed Oct 14 12:29:44 2015 +0200

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/e14cc7da/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 55d4008..678a47f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ before_script:
 
 script:
 - cd build
-- cmake -DFFI_LIBRARY=/usr/local/lib/libffi.so 
-DFFI_INCLUDE_DIR=/usr/local/include -DBUILD_DEPLOYMENT_ADMIN=ON 
-DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON 
-DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON 
-DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON 
-DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DCMAKE_INSTALL_PREFIX=../install ..
+- cmake -DFFI_LIBRARY=/usr/local/lib/libffi.so 
-DFFI_INCLUDE_DIR=/usr/local/include -DBUILD_DEPLOYMENT_ADMIN=ON 
-DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON 
-DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON 
-DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON 
-DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON -DCMAKE_INSTALL_PREFIX=../install 
..
 - make all && make deploy && make install-all
 - export LD_PRELOAD=/usr/local/lib/libffi.so && export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage
 

[10/50] celix git commit: CELIX-237: Added pkg-config package to build env

[pnoltes]

CELIX-237: Added pkg-config package to build env


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/65597447
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/65597447
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/65597447

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 65597447850143b8191b5d1d6a516c5353718e2a
Parents: a627209
Author: Pepijn Noltes 
Authored: Tue Oct 13 22:41:41 2015 +0200
Committer: Pepijn Noltes 
Committed: Tue Oct 13 22:41:41 2015 +0200

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/65597447/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 5a86242..fc9ecb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: c
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov libffi-dev
+  - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov 
libffi-dev pkg-config
 
 matrix:
   include:

[26/50] celix git commit: CELIX-237: Removed src build libffi from travis config

[pnoltes]

CELIX-237: Removed src build libffi from travis config


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/46144818
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/46144818
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/46144818

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 46144818a7349f4c7fb35e2fd88f5be837ef2f2d
Parents: f202325
Author: Pepijn Noltes 
Authored: Wed Oct 14 21:48:16 2015 +0200
Committer: Pepijn Noltes 
Committed: Wed Oct 14 21:48:16 2015 +0200

--
 .travis.yml | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/46144818/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 55d4008..8b7f0d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: c
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov pkg-config
+  - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov 
pkg-config libffi-dev
 
 matrix:
   include:
@@ -18,18 +18,13 @@ before_script:
 - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . && 
make
 - sudo make install
 - cd -
-- wget ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz -O 
/tmp/libffi.tar.gz
-- tar xzf /tmp/libffi.tar.gz 
-- cd libffi*
-- ./configure --prefix=/usr/local && make && sudo make install 
-- cd -
 - mkdir build install
 
 script:
 - cd build
-- cmake -DFFI_LIBRARY=/usr/local/lib/libffi.so 
-DFFI_INCLUDE_DIR=/usr/local/include -DBUILD_DEPLOYMENT_ADMIN=ON 
-DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON 
-DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON 
-DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON 
-DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DCMAKE_INSTALL_PREFIX=../install ..
+- cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON 
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DCMAKE_INSTALL_PREFIX=../install ..
 - make all && make deploy && make install-all
-- export LD_PRELOAD=/usr/local/lib/libffi.so && export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage
+- export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage
 
 after_success:
 - cd ${TRAVIS_BUILD_DIR}/build

[02/50] celix git commit: CELIX-237: fixed travis cfg

[pnoltes]

CELIX-237: fixed travis cfg


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/db286555
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/db286555
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/db286555

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: db28655510ffc423f4d752b9bfb6e0a6109e3748
Parents: 38931fd
Author: Bjoern Petri 
Authored: Tue Oct 13 18:40:32 2015 +0200
Committer: Bjoern Petri 
Committed: Tue Oct 13 18:40:32 2015 +0200

--
 .travis.yml | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/db286555/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index e12d4c4..32ff300 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,23 +13,19 @@ before_script:
 - wget 
https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true
 -O /tmp/cpputest.tar.gz
 - tar -xzvf /tmp/cpputest.tar.gz -C /tmp 
 - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd 
/tmp/cpputest-3.7.1 && ./configure --prefix=/usr && make && sudo make install 
&& cd -
-- mkdir build install
 - git clone -b 2.7 --single-branch https://github.com/akheron/jansson.git 
jansson-build
 - cd jansson-build
 - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . && 
make
 - sudo make install
-- cd -
 - mkdir build install
+
+script:
 - cd build
 - cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON 
-DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON 
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON 
-DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON 
-DENABLE_TESTING=ON -DCMAKE_INSTALL_PREFIX=../install ..
 - make all && make deploy && make install-all
-- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test && make coverage
+- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && 
make test ARGS="-V" && make coverage
 
 after_success:
 - cd ${TRAVIS_BUILD_DIR}/build
 - gem install coveralls-lcov
 - lcx="lcov --output-file=coverage.info " && for i in `find . -name 
"*.info.cleaned"`; do lcx+=" --add-tracefile=$i"; done && $lcx && 
coveralls-lcov --repo-token=9dpeTAjiGoQU5hgXFe0ezk65iu40oc3WY coverage.info
-
-script: 
-- make all 
-- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils && make test 
ARGS="-V"

[07/50] celix git commit: CELIX-274: Merge remote-tracking branch 'remotes/origin/feature/CELIX-274_mutiple_frameworks' into develop

[pnoltes]

CELIX-274: Merge remote-tracking branch 
'remotes/origin/feature/CELIX-274_mutiple_frameworks' into develop


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/ae8bd202
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/ae8bd202
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/ae8bd202

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: ae8bd2023f7ed3aba7aedae4630ad11666dcd484
Parents: 0da1bec 32b1d86
Author: Pepijn Noltes 
Authored: Tue Oct 13 19:43:38 2015 +0200
Committer: Pepijn Noltes 
Committed: Tue Oct 13 19:43:38 2015 +0200

--
 framework/CMakeLists.txt   |  8 +++
 framework/tst/CMakeLists.txt   | 30 +
 framework/tst/config.properties.in |  2 +
 framework/tst/framework1.properties.in |  3 +
 framework/tst/framework2.properties.in |  3 +
 framework/tst/multiple_frameworks_test.cpp | 88 +
 framework/tst/run_tests.cpp|  9 +++
 framework/tst/single_framework_test.cpp| 69 +++
 8 files changed, 212 insertions(+)
--

[27/50] celix git commit: CELIX-237: Fixed an issue with handling import registrations

[pnoltes]

CELIX-237: Fixed an issue with handling import registrations


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2fe04c0f
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2fe04c0f
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2fe04c0f

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 2fe04c0f4c0b284bfb0c2251098878e53083f259
Parents: 4614481
Author: Pepijn Noltes 
Authored: Thu Oct 15 09:34:07 2015 +0200
Committer: Pepijn Noltes 
Committed: Thu Oct 15 09:34:07 2015 +0200

--
 .../rsa/private/src/remote_service_admin_dfi.c  | 62 ++--
 1 file changed, 31 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/2fe04c0f/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
--
diff --git 
a/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
 
b/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
index 4bd8c58..db48634 100644
--- 
a/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
+++ 
b/remote_services/remote_service_admin_dfi/rsa/private/src/remote_service_admin_dfi.c
@@ -50,13 +50,13 @@
 #define MAX_NUMBER_OF_RESTARTS 5
 
 
-#define LOG_ERROR(admin, msg, ...) \
+#define RSA_LOG_ERROR(admin, msg, ...) \
 logHelper_log((admin)->loghelper, OSGI_LOGSERVICE_ERROR, (msg),  
##__VA_ARGS__)
 
-#define LOG_WARNING(admin, msg, ...) \
+#define RSA_LOG_WARNING(admin, msg, ...) \
 logHelper_log((admin)->loghelper, OSGI_LOGSERVICE_ERROR, (msg),  
##__VA_ARGS__)
 
-#define LOG_DEBUG(admin, msg, ...) \
+#define RSA_LOG_DEBUG(admin, msg, ...) \
 logHelper_log((admin)->loghelper, OSGI_LOGSERVICE_ERROR, (msg),  
##__VA_ARGS__)
 
 struct remote_service_admin {
@@ -67,7 +67,7 @@ struct remote_service_admin {
 hash_map_pt exportedServices;
 
 celix_thread_mutex_t importedServicesLock;
-hash_map_pt importedServices;
+array_list_pt importedServices;
 
 char *port;
 char *ip;
@@ -128,7 +128,7 @@ celix_status_t remoteServiceAdmin_create(bundle_context_pt 
context, remote_servi
 char *detectedIp = NULL;
 (*admin)->context = context;
 (*admin)->exportedServices = hashMap_create(NULL, NULL, NULL, NULL);
-(*admin)->importedServices = hashMap_create(NULL, NULL, NULL, NULL);
+ arrayList_create(&(*admin)->importedServices);
 
 celixThreadMutex_create(&(*admin)->exportedServicesLock, NULL);
 celixThreadMutex_create(&(*admin)->importedServicesLock, NULL);
@@ -251,20 +251,14 @@ celix_status_t 
remoteServiceAdmin_stop(remote_service_admin_pt admin) {
 celixThreadMutex_unlock(>exportedServicesLock);
 
 celixThreadMutex_lock(>importedServicesLock);
-
-iter = hashMapIterator_create(admin->importedServices);
-while (hashMapIterator_hasNext(iter))
-{
-
-hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
-import_registration_pt import = hashMapEntry_getValue(entry);
-
+int i;
+int size = arrayList_size(admin->importedServices);
+for (i = 0; i < size ; i += 1) {
+import_registration_pt import = arrayList_get(admin->importedServices, 
i);
 if (import != NULL) {
 importRegistration_stop(import);
 }
 }
-
-hashMapIterator_destroy(iter);
 celixThreadMutex_unlock(>importedServicesLock);
 
 if (admin->ctx != NULL) {
@@ -274,7 +268,7 @@ celix_status_t 
remoteServiceAdmin_stop(remote_service_admin_pt admin) {
 }
 
 hashMap_destroy(admin->exportedServices, false, false);
-hashMap_destroy(admin->importedServices, false, false);
+arrayList_destroy(admin->importedServices);
 
 logHelper_stop(admin->loghelper);
 logHelper_destroy(>loghelper);
@@ -344,16 +338,13 @@ static int remoteServiceAdmin_callback(struct 
mg_connection *conn) {
 char *response = NULL;
 int responceLength = 0;
 int rc = exportRegistration_call(export, data, -1, , 
);
-//TODO check rc
+if (rc != CELIX_SUCCESS) {
+RSA_LOG_ERROR(rsa, "Error trying to invoke remove service, 
got error %i\n", rc);
+}
 
-if (response != NULL) {
+if (rc == CELIX_SUCCESS && response != NULL) {
 mg_write(conn, data_response_headers, 
strlen(data_response_headers));
-//  mg_write(conn, no_content_response_headers, 
strlen(no_content_response_headers));
-//printf("writing response '%s'\n", response);
 mg_write(conn, response,