[13/50] [abbrv] celix git commit: CELIX-237: Implemented client server test and needed changes to get that working. There is still an issue in the export_registration

2015-10-13 Thread pnoltes 
CELIX-237: Implemented client server test and needed changes to get that 
working. There is still an issue in the export_registration


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

Branch: refs/heads/develop
Commit: 7dc2039f11b6fc3505ce2677ad2a59bfdb423d1f
Parents: fa52720
Author: Pepijn Noltes 
Authored: Tue Aug 11 20:18:15 2015 +0200
Committer: Pepijn Noltes 
Committed: Tue Aug 11 20:18:15 2015 +0200

--
 launcher/private/src/main.c |   8 +-
 remote_services/CMakeLists.txt  |   1 +
 .../remote_service_admin_dfi/CMakeLists.txt |   2 +-
 .../dynamic_function_interface/dyn_function.c   |   2 +
 .../dynamic_function_interface/dyn_type.c   |  16 +--
 .../json_serializer.c   |   6 +-
 .../json_serializer.h   |   1 +
 .../tst/dyn_function_tests.cpp  |   7 +-
 .../private/include/import_registration_dfi.h   |   5 +
 .../private/src/export_registration_dfi.c   |  81 ---
 .../private/src/import_registration_dfi.c   | 135 ---
 .../private/src/remote_service_admin_dfi.c  |  38 ++
 .../remote_service_admin_dfi/tst/CMakeLists.txt |   4 +-
 .../tst/bundle/CMakeLists.txt   |   5 +
 .../tst/bundle/tst_activator.c  |  86 +---
 .../tst/bundle/tst_service.h|   2 +-
 .../tst/client.properties.in|   1 +
 .../tst/rsa_client_server_tests.cpp |  19 +--
 .../tst/server.properties.in|   1 +
 19 files changed, 296 insertions(+), 124 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/7dc2039f/launcher/private/src/main.c
--
diff --git a/launcher/private/src/main.c b/launcher/private/src/main.c
index 82530e1..90e5612 100644
--- a/launcher/private/src/main.c
+++ b/launcher/private/src/main.c
@@ -63,9 +63,11 @@ int main(int argc, char *argv[]) {
 // Set signal handler
 (void) signal(SIGINT, shutdown_framework);
 
-celixLauncher_launch(config_file, );
-celixLauncher_waitForShutdown(framework);
-celixLauncher_destroy(framework);
+int rc = celixLauncher_launch(config_file, );
+if (rc == 0) {
+celixLauncher_waitForShutdown(framework);
+celixLauncher_destroy(framework);
+}
 }
 
 static void show_usage(char* prog_name) {

http://git-wip-us.apache.org/repos/asf/celix/blob/7dc2039f/remote_services/CMakeLists.txt
--
diff --git a/remote_services/CMakeLists.txt b/remote_services/CMakeLists.txt
index abc9177..f39b604 100644
--- a/remote_services/CMakeLists.txt
+++ b/remote_services/CMakeLists.txt
@@ -39,6 +39,7 @@ if (REMOTE_SERVICE_ADMIN)
 
 add_subdirectory(remote_service_admin)
 add_subdirectory(remote_service_admin_http)
+add_subdirectory(remote_service_admin_dfi/tst/bundle)
 add_subdirectory(remote_service_admin_dfi)
 add_subdirectory(remote_service_admin_shm)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/7dc2039f/remote_services/remote_service_admin_dfi/CMakeLists.txt
--
diff --git a/remote_services/remote_service_admin_dfi/CMakeLists.txt 
b/remote_services/remote_service_admin_dfi/CMakeLists.txt
index b7a66f3..83dfc41 100644
--- a/remote_services/remote_service_admin_dfi/CMakeLists.txt
+++ b/remote_services/remote_service_admin_dfi/CMakeLists.txt
@@ -44,7 +44,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI)
 
 SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_dfi")
 SET(BUNDLE_VERSION "0.0.1")
-SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin HTTP for 
dynamic function interface")
+SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin Dynamic 
Function Interface (DFI)")
 
 bundle(remote_service_admin_dfi SOURCES
 private/src/remote_service_admin_dfi.c

http://git-wip-us.apache.org/repos/asf/celix/blob/7dc2039f/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_function.c
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_function.c
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_function.c
index f80d26f..af3902c 100644
--- 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_function.c
+++ 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_function.c

celix git commit: CELIX-237: Implemented client server test and needed changes to get that working. There is still an issue in the export_registration

2015-08-11 Thread pnoltes 
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-237_rsa-ffi fa527209f - 7dc2039f1


CELIX-237: Implemented client server test and needed changes to get that 
working. There is still an issue in the export_registration


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

Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: 7dc2039f11b6fc3505ce2677ad2a59bfdb423d1f
Parents: fa52720
Author: Pepijn Noltes pepijnnol...@gmail.com
Authored: Tue Aug 11 20:18:15 2015 +0200
Committer: Pepijn Noltes pepijnnol...@gmail.com
Committed: Tue Aug 11 20:18:15 2015 +0200

--
 launcher/private/src/main.c |   8 +-
 remote_services/CMakeLists.txt  |   1 +
 .../remote_service_admin_dfi/CMakeLists.txt |   2 +-
 .../dynamic_function_interface/dyn_function.c   |   2 +
 .../dynamic_function_interface/dyn_type.c   |  16 +--
 .../json_serializer.c   |   6 +-
 .../json_serializer.h   |   1 +
 .../tst/dyn_function_tests.cpp  |   7 +-
 .../private/include/import_registration_dfi.h   |   5 +
 .../private/src/export_registration_dfi.c   |  81 ---
 .../private/src/import_registration_dfi.c   | 135 ---
 .../private/src/remote_service_admin_dfi.c  |  38 ++
 .../remote_service_admin_dfi/tst/CMakeLists.txt |   4 +-
 .../tst/bundle/CMakeLists.txt   |   5 +
 .../tst/bundle/tst_activator.c  |  86 +---
 .../tst/bundle/tst_service.h|   2 +-
 .../tst/client.properties.in|   1 +
 .../tst/rsa_client_server_tests.cpp |  19 +--
 .../tst/server.properties.in|   1 +
 19 files changed, 296 insertions(+), 124 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/7dc2039f/launcher/private/src/main.c
--
diff --git a/launcher/private/src/main.c b/launcher/private/src/main.c
index 82530e1..90e5612 100644
--- a/launcher/private/src/main.c
+++ b/launcher/private/src/main.c
@@ -63,9 +63,11 @@ int main(int argc, char *argv[]) {
 // Set signal handler
 (void) signal(SIGINT, shutdown_framework);
 
-celixLauncher_launch(config_file, framework);
-celixLauncher_waitForShutdown(framework);
-celixLauncher_destroy(framework);
+int rc = celixLauncher_launch(config_file, framework);
+if (rc == 0) {
+celixLauncher_waitForShutdown(framework);
+celixLauncher_destroy(framework);
+}
 }
 
 static void show_usage(char* prog_name) {

http://git-wip-us.apache.org/repos/asf/celix/blob/7dc2039f/remote_services/CMakeLists.txt
--
diff --git a/remote_services/CMakeLists.txt b/remote_services/CMakeLists.txt
index abc9177..f39b604 100644
--- a/remote_services/CMakeLists.txt
+++ b/remote_services/CMakeLists.txt
@@ -39,6 +39,7 @@ if (REMOTE_SERVICE_ADMIN)
 
 add_subdirectory(remote_service_admin)
 add_subdirectory(remote_service_admin_http)
+add_subdirectory(remote_service_admin_dfi/tst/bundle)
 add_subdirectory(remote_service_admin_dfi)
 add_subdirectory(remote_service_admin_shm)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/7dc2039f/remote_services/remote_service_admin_dfi/CMakeLists.txt
--
diff --git a/remote_services/remote_service_admin_dfi/CMakeLists.txt 
b/remote_services/remote_service_admin_dfi/CMakeLists.txt
index b7a66f3..83dfc41 100644
--- a/remote_services/remote_service_admin_dfi/CMakeLists.txt
+++ b/remote_services/remote_service_admin_dfi/CMakeLists.txt
@@ -44,7 +44,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI)
 
 SET_HEADER(BUNDLE_SYMBOLICNAME apache_celix_remote_service_admin_dfi)
 SET(BUNDLE_VERSION 0.0.1)
-SET_HEADERS(Bundle-Name: Apache Celix Remote Service Admin HTTP for 
dynamic function interface)
+SET_HEADERS(Bundle-Name: Apache Celix Remote Service Admin Dynamic 
Function Interface (DFI))
 
 bundle(remote_service_admin_dfi SOURCES
 private/src/remote_service_admin_dfi.c

http://git-wip-us.apache.org/repos/asf/celix/blob/7dc2039f/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_function.c
--
diff --git 
a/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_function.c
 
b/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_function.c
index f80d26f..af3902c 100644
---