[11/50] [abbrv] celix git commit: CELIX-237: Added setup for client - server ccputest. This test start two embedded Celix frameworks for remote services test

2015-10-13 Thread pnoltes 
CELIX-237: Added setup for client - server ccputest. This test start two 
embedded Celix frameworks for remote services test


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

Branch: refs/heads/develop
Commit: 30f7e8419c28d085e7e782a7dcd6828c1eb79e3f
Parents: da86474
Author: Pepijn Noltes 
Authored: Mon Aug 10 22:07:15 2015 +0200
Committer: Pepijn Noltes 
Committed: Mon Aug 10 22:07:15 2015 +0200

--
 remote_services/CMakeLists.txt  |   7 +-
 .../private/src/endpoint_discovery_poller.c |   5 +-
 .../examples/calculator_service/CMakeLists.txt  |   2 +-
 apache.celix.calc.api.Calculator.descriptor |  11 --
 ...apache.celix.calc.api.Calculator2.descriptor |  11 ++
 .../examples/calculator_shell/CMakeLists.txt|   4 +
 .../dynamic_function_interface/dyn_type.h   |   6 +-
 .../private/include/export_registration_dfi.h   |   2 +-
 .../private/src/export_registration_dfi.c   | 131 +++
 .../private/src/import_registration_dfi.c   |  12 +-
 .../private/src/remote_service_admin_dfi.c  |  32 +
 .../remote_service_admin_dfi/tst/CMakeLists.txt |  52 +---
 .../tst/bundle/CMakeLists.txt   |  20 +++
 .../tst/bundle/tst_activator.c  |  91 +
 .../tst/bundle/tst_service.h|  17 +++
 .../tst/client.properties.in|   7 +
 .../tst/config.properties.in|   3 +-
 .../tst/rsa_client_server_tests.cpp | 118 +
 .../remote_service_admin_dfi/tst/rsa_tests.cpp  |  28 +++-
 .../tst/server.properties.in|   7 +
 20 files changed, 464 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/30f7e841/remote_services/CMakeLists.txt
--
diff --git a/remote_services/CMakeLists.txt b/remote_services/CMakeLists.txt
index a16977f..abc9177 100644
--- a/remote_services/CMakeLists.txt
+++ b/remote_services/CMakeLists.txt
@@ -33,14 +33,15 @@ if (REMOTE_SERVICE_ADMIN)
 
 add_subdirectory(topology_manager)
 
+add_subdirectory(discovery_configured)
+add_subdirectory(discovery_etcd)
+add_subdirectory(discovery_shm)
+
 add_subdirectory(remote_service_admin)
 add_subdirectory(remote_service_admin_http)
 add_subdirectory(remote_service_admin_dfi)
 add_subdirectory(remote_service_admin_shm)
 
-add_subdirectory(discovery_configured)
-add_subdirectory(discovery_etcd)
-add_subdirectory(discovery_shm)
 
 endif (REMOTE_SERVICE_ADMIN)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/30f7e841/remote_services/discovery/private/src/endpoint_discovery_poller.c
--
diff --git a/remote_services/discovery/private/src/endpoint_discovery_poller.c 
b/remote_services/discovery/private/src/endpoint_discovery_poller.c
index 569d7a9..d8c16a5 100644
--- a/remote_services/discovery/private/src/endpoint_discovery_poller.c
+++ b/remote_services/discovery/private/src/endpoint_discovery_poller.c
@@ -325,6 +325,8 @@ static size_t endpointDiscoveryPoller_writeMemory(void 
*contents, size_t size, s
 static celix_status_t 
endpointDiscoveryPoller_getEndpoints(endpoint_discovery_poller_pt poller, char 
*url, array_list_pt *updatedEndpoints) {
 celix_status_t status = CELIX_SUCCESS;
 
+   logHelper_log(*poller->loghelper, OSGI_LOGSERVICE_DEBUG, "Polling url 
'%s'", url);
+
 CURL *curl = NULL;
 CURLcode res = CURLE_OK;
 
@@ -349,6 +351,7 @@ static celix_status_t 
endpointDiscoveryPoller_getEndpoints(endpoint_discovery_po
 
status = endpointDescriptorReader_create(poller, );
if (status == CELIX_SUCCESS) {
+   logHelper_log(*poller->loghelper, 
OSGI_LOGSERVICE_DEBUG, "Polled data '%s'", chunk.memory);
status = endpointDescriptorReader_parseDocument(reader, 
chunk.memory, updatedEndpoints);
}
 
@@ -356,7 +359,7 @@ static celix_status_t 
endpointDiscoveryPoller_getEndpoints(endpoint_discovery_po
endpointDescriptorReader_destroy(reader);
}
 } else {
-   logHelper_log(*poller->loghelper, OSGI_LOGSERVICE_ERROR, 
"ENDPOINT_POLLER: unable to read endpoints, reason: %s", 
curl_easy_strerror(res));
+   logHelper_log(*poller->loghelper, OSGI_LOGSERVICE_ERROR, 
"ENDPOINT_POLLER: unable to read endpoints at '%s', reason: %s", url, 
curl_easy_strerror(res));
 }
 
 // clean up endpoints file

celix git commit: CELIX-237: Added setup for client - server ccputest. This test start two embedded Celix frameworks for remote services test

2015-08-10 Thread pnoltes 
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-237_rsa-ffi da86474fb - 30f7e8419


CELIX-237: Added setup for client - server ccputest. This test start two 
embedded Celix frameworks for remote services test


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

Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: 30f7e8419c28d085e7e782a7dcd6828c1eb79e3f
Parents: da86474
Author: Pepijn Noltes pepijnnol...@gmail.com
Authored: Mon Aug 10 22:07:15 2015 +0200
Committer: Pepijn Noltes pepijnnol...@gmail.com
Committed: Mon Aug 10 22:07:15 2015 +0200

--
 remote_services/CMakeLists.txt  |   7 +-
 .../private/src/endpoint_discovery_poller.c |   5 +-
 .../examples/calculator_service/CMakeLists.txt  |   2 +-
 apache.celix.calc.api.Calculator.descriptor |  11 --
 ...apache.celix.calc.api.Calculator2.descriptor |  11 ++
 .../examples/calculator_shell/CMakeLists.txt|   4 +
 .../dynamic_function_interface/dyn_type.h   |   6 +-
 .../private/include/export_registration_dfi.h   |   2 +-
 .../private/src/export_registration_dfi.c   | 131 +++
 .../private/src/import_registration_dfi.c   |  12 +-
 .../private/src/remote_service_admin_dfi.c  |  32 +
 .../remote_service_admin_dfi/tst/CMakeLists.txt |  52 +---
 .../tst/bundle/CMakeLists.txt   |  20 +++
 .../tst/bundle/tst_activator.c  |  91 +
 .../tst/bundle/tst_service.h|  17 +++
 .../tst/client.properties.in|   7 +
 .../tst/config.properties.in|   3 +-
 .../tst/rsa_client_server_tests.cpp | 118 +
 .../remote_service_admin_dfi/tst/rsa_tests.cpp  |  28 +++-
 .../tst/server.properties.in|   7 +
 20 files changed, 464 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/30f7e841/remote_services/CMakeLists.txt
--
diff --git a/remote_services/CMakeLists.txt b/remote_services/CMakeLists.txt
index a16977f..abc9177 100644
--- a/remote_services/CMakeLists.txt
+++ b/remote_services/CMakeLists.txt
@@ -33,14 +33,15 @@ if (REMOTE_SERVICE_ADMIN)
 
 add_subdirectory(topology_manager)
 
+add_subdirectory(discovery_configured)
+add_subdirectory(discovery_etcd)
+add_subdirectory(discovery_shm)
+
 add_subdirectory(remote_service_admin)
 add_subdirectory(remote_service_admin_http)
 add_subdirectory(remote_service_admin_dfi)
 add_subdirectory(remote_service_admin_shm)
 
-add_subdirectory(discovery_configured)
-add_subdirectory(discovery_etcd)
-add_subdirectory(discovery_shm)
 
 endif (REMOTE_SERVICE_ADMIN)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/30f7e841/remote_services/discovery/private/src/endpoint_discovery_poller.c
--
diff --git a/remote_services/discovery/private/src/endpoint_discovery_poller.c 
b/remote_services/discovery/private/src/endpoint_discovery_poller.c
index 569d7a9..d8c16a5 100644
--- a/remote_services/discovery/private/src/endpoint_discovery_poller.c
+++ b/remote_services/discovery/private/src/endpoint_discovery_poller.c
@@ -325,6 +325,8 @@ static size_t endpointDiscoveryPoller_writeMemory(void 
*contents, size_t size, s
 static celix_status_t 
endpointDiscoveryPoller_getEndpoints(endpoint_discovery_poller_pt poller, char 
*url, array_list_pt *updatedEndpoints) {
 celix_status_t status = CELIX_SUCCESS;
 
+   logHelper_log(*poller-loghelper, OSGI_LOGSERVICE_DEBUG, Polling url 
'%s', url);
+
 CURL *curl = NULL;
 CURLcode res = CURLE_OK;
 
@@ -349,6 +351,7 @@ static celix_status_t 
endpointDiscoveryPoller_getEndpoints(endpoint_discovery_po
 
status = endpointDescriptorReader_create(poller, reader);
if (status == CELIX_SUCCESS) {
+   logHelper_log(*poller-loghelper, 
OSGI_LOGSERVICE_DEBUG, Polled data '%s', chunk.memory);
status = endpointDescriptorReader_parseDocument(reader, 
chunk.memory, updatedEndpoints);
}
 
@@ -356,7 +359,7 @@ static celix_status_t 
endpointDiscoveryPoller_getEndpoints(endpoint_discovery_po
endpointDescriptorReader_destroy(reader);
}
 } else {
-   logHelper_log(*poller-loghelper, OSGI_LOGSERVICE_ERROR, 
ENDPOINT_POLLER: unable to read endpoints, reason: %s, 
curl_easy_strerror(res));
+   logHelper_log(*poller-loghelper, OSGI_LOGSERVICE_ERROR, 
ENDPOINT_POLLER: unable to read endpoints at '%s', reason: %s, url, 
curl_easy_strerror(res));
 }