Return-Path: X-Original-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C62B2109B8 for ; Mon, 2 Sep 2013 19:19:59 +0000 (UTC) Received: (qmail 45431 invoked by uid 500); 2 Sep 2013 19:19:59 -0000 Delivered-To: apmail-incubator-celix-commits-archive@incubator.apache.org Received: (qmail 45405 invoked by uid 500); 2 Sep 2013 19:19:59 -0000 Mailing-List: contact celix-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: celix-dev@incubator.apache.org Delivered-To: mailing list celix-commits@incubator.apache.org Received: (qmail 45397 invoked by uid 99); 2 Sep 2013 19:19:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Sep 2013 19:19:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Sep 2013 19:19:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id ACA9623888CD; Mon, 2 Sep 2013 19:19:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: celix-commits@incubator.apache.org From: pnoltes@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130902191933.ACA9623888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;