From commits-return-1986-apmail-celix-commits-archive=celix.apache.org@celix.apache.org Sat Jul 4 11:20:55 2015 Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D49E18E10 for ; Sat, 4 Jul 2015 11:20:55 +0000 (UTC) Received: (qmail 84591 invoked by uid 500); 4 Jul 2015 11:20:55 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 84524 invoked by uid 500); 4 Jul 2015 11:20:55 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 84370 invoked by uid 99); 4 Jul 2015 11:20:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Jul 2015 11:20:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5A500E3638; Sat, 4 Jul 2015 11:20:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pnoltes@apache.org To: commits@celix.apache.org Date: Sat, 04 Jul 2015 11:21:08 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/16] celix git commit: CELIX-237 CELIX-237 Merge remote-tracking branch 'remotes/origin/develop' into dfi Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/549997b8 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/549997b8 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/549997b8 Branch: refs/heads/feature/CELIX-237_rsa-ffi Commit: 549997b88f99b1b4bbfd44be3c4841bb3296e034 Parents: fd7662c 3b36eb2 Author: Pepijn Noltes Authored: Sat Jul 4 13:25:31 2015 +0200 Committer: Pepijn Noltes Committed: Sat Jul 4 13:25:31 2015 +0200 ---------------------------------------------------------------------- .travis.yml | 18 + README.md | 2 +- .../private/src/deployment_package.c | 1 + .../device_access/private/src/device_manager.c | 1 + .../private/src/driver_attributes.c | 1 + .../device_access/private/src/driver_loader.c | 1 + framework/private/include/framework_private.h | 4 +- framework/private/src/framework.c | 97 +- .../private/src/log_writer_syslog.c | 2 - .../discovery/private/src/discovery.c | 1 + .../discovery/private/src/discovery_activator.c | 186 +- .../private/src/endpoint_discovery_server.c | 1 + .../discovery_etcd/private/src/etcd_watcher.c | 1 + .../discovery_shm/private/src/shm_watcher.c | 1 + .../private/src/calculator_endpoint_activator.c | 8 +- .../private/src/calculator_proxy_activator.c | 12 +- .../private/src/calculator_activator.c | 12 +- .../public/include/calculator_service.h | 2 + .../calculator_shell/private/src/sqrt_command.c | 1 + .../calculator_shell/private/src/sub_command.c | 1 + .../private/src/import_registration_impl.c | 1 + .../private/src/remote_proxy_factory_impl.c | 1 + .../src/remote_service_admin_activator.c | 3 +- .../private/src/remote_service_admin_impl.c | 16 +- .../private/src/remote_service_admin_impl.c | 1 + .../private/include/topology_manager.h | 5 + .../topology_manager/private/src/activator.c | 296 +- .../private/src/topology_manager.c | 920 +- .../utils/private/include/civetweb.h | 538 +- remote_services/utils/private/src/civetweb.c | 14923 ++++++++++------- remote_shell/private/src/activator.c | 2 +- remote_shell/private/src/connection_listener.c | 1 + remote_shell/private/src/remote_shell.c | 3 +- remote_shell/private/src/shell_mediator.c | 3 +- 34 files changed, 9858 insertions(+), 7208 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/549997b8/remote_services/examples/calculator_service/private/src/calculator_activator.c ---------------------------------------------------------------------- diff --cc remote_services/examples/calculator_service/private/src/calculator_activator.c index d280eaa,13ea995..a4dfa46 --- a/remote_services/examples/calculator_service/private/src/calculator_activator.c +++ b/remote_services/examples/calculator_service/private/src/calculator_activator.c @@@ -75,15 -75,14 +75,15 @@@ celix_status_t bundleActivator_start(vo properties = properties_create(); properties_set(properties, (char *) OSGI_RSA_SERVICE_EXPORTED_INTERFACES, (char *) CALCULATOR_SERVICE); + properties_set(properties, (char *) "protocol.schema", (char *)CALC_SCHEMA); - bundleContext_registerService(context, (char *) CALCULATOR_SERVICE, activator->service, properties, &activator->calculatorReg); + bundleContext_registerService(context, (char *) CALCULATOR_SERVICE, activator->service, properties, &activator->calculatorReg); - properties_pt properties2 = properties_create(); - properties_set(properties2, (char *) OSGI_RSA_SERVICE_EXPORTED_INTERFACES, (char *) "org.apache.celix.calc.api.Calculator2"); - bundleContext_registerService(context, "org.apache.celix.calc.api.Calculator2", activator->service, properties2, &activator->calculatorReg2); - } - } + properties_pt properties2 = properties_create(); + properties_set(properties2, (char *) OSGI_RSA_SERVICE_EXPORTED_INTERFACES, (char *) CALCULATOR2_SERVICE); + bundleContext_registerService(context, CALCULATOR2_SERVICE, activator->service, properties2, &activator->calculatorReg2); + } + } return status; } http://git-wip-us.apache.org/repos/asf/celix/blob/549997b8/remote_services/examples/calculator_service/public/include/calculator_service.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/549997b8/remote_services/examples/calculator_shell/private/src/sqrt_command.c ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/549997b8/remote_services/examples/calculator_shell/private/src/sub_command.c ----------------------------------------------------------------------