incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject svn commit: r1519499 - in /incubator/celix/trunk/remote_services: deploy.cmake example_proxy/private/src/example_proxy_impl.c remote_service_admin/private/src/import_registration_impl.c
Date Mon, 02 Sep 2013 19:19:33 GMT
Author: pnoltes
Date: Mon Sep  2 19:19:33 2013
New Revision: 1519499

URL: http://svn.apache.org/r1519499
Log:
CELIX-65: Changed deploy order for remote-service-client so that discovered remote services
will not be lost. add some \n for printfs.

Modified:
    incubator/celix/trunk/remote_services/deploy.cmake
    incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c

Modified: incubator/celix/trunk/remote_services/deploy.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/deploy.cmake?rev=1519499&r1=1519498&r2=1519499&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/deploy.cmake (original)
+++ incubator/celix/trunk/remote_services/deploy.cmake Mon Sep  2 19:19:33 2013
@@ -17,8 +17,12 @@
 is_enabled(REMOTE_SERVICE_ADMIN)
 if (REMOTE_SERVICE_ADMIN)
 	#deploy("remote-services" BUNDLES discovery_bonjour topology_manager remote_service_admin
example example_endpoint shell shell_tui log_service log_writer)
-	#deploy("remote-services-client" BUNDLES discovery_bonjour topology_manager remote_service_admin
example_proxy shell shell_tui log_service log_writer calc_shell)
+	#deploy("remote-services-client" BUNDLES topology_manager remote_service_admin example_proxy
shell shell_tui log_service log_writer calc_shell discovery_bonjour)
 	
 	deploy("remote-services" BUNDLES discovery_slp topology_manager remote_service_admin example
example_endpoint shell shell_tui log_service log_writer)
-	deploy("remote-services-client" BUNDLES discovery_slp topology_manager remote_service_admin
example_proxy shell shell_tui log_service log_writer calc_shell)
+	deploy("remote-services-client" BUNDLES topology_manager remote_service_admin example_proxy
shell shell_tui log_service log_writer calc_shell discovery_slp)
+	
+	#TODO for remote-service-client the discovery should be added as last. If this is not done,

+	#discovery will discover services before the topology manager is registered as 
+	#endpoint listener and services will be lost. This needs further study.
 endif (REMOTE_SERVICE_ADMIN)

Modified: incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c?rev=1519499&r1=1519498&r2=1519499&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c (original)
+++ incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c Mon
Sep  2 19:19:33 2013
@@ -90,7 +90,7 @@ celix_status_t exampleProxy_add(example_
 			json_unpack(reply, "{s:f}", "result", result);
 		}
 	} else {
-		printf("CALCULATOR_PROXY: No endpoint information available");
+		printf("CALCULATOR_PROXY: No endpoint information available\n");
 	}
 
 	return status;
@@ -121,7 +121,7 @@ celix_status_t exampleProxy_sub(example_
 			json_unpack(reply, "{s:f}", "result", result);
 		}
 	} else {
-		printf("CALCULATOR_PROXY: No endpoint information available");
+		printf("CALCULATOR_PROXY: No endpoint information available\n");
 	}
 
 	return status;
@@ -152,7 +152,7 @@ celix_status_t exampleProxy_sqrt(example
 			json_unpack(reply, "{s:f}", "result", result);
 		}
 	} else {
-		printf("CALCULATOR_PROXY: No endpoint information available");
+		printf("CALCULATOR_PROXY: No endpoint information available\n");
 	}
 
 	return status;

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c?rev=1519499&r1=1519498&r2=1519499&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
(original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
Mon Sep  2 19:19:33 2013
@@ -121,7 +121,7 @@ celix_status_t importRegistration_proxyA
 	celix_status_t status = CELIX_SUCCESS;
 	import_registration_pt registration = handle;
 
-	printf("PROXY added called!");
+	printf("PROXY added called!\n");
 	remote_proxy_service_pt proxy = service;
 	if (registration->proxy == NULL) {
 		registration->reference = reference;



Mime
View raw message