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 D0FF31802D for ; Tue, 3 Nov 2015 09:38:57 +0000 (UTC) Received: (qmail 88469 invoked by uid 500); 3 Nov 2015 09:38:57 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 88403 invoked by uid 500); 3 Nov 2015 09:38:57 -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 88161 invoked by uid 99); 3 Nov 2015 09:38:57 -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; Tue, 03 Nov 2015 09:38:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0A512E0F7D; Tue, 3 Nov 2015 09:38:57 +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: Tue, 03 Nov 2015 09:39:06 -0000 Message-Id: <24e96d3971524f61be5692cc242fc1c2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/13] celix git commit: CELIX-230: Merge branch 'feature/CELIX-230_Refactoring_of_the_shell_command_service' into develop CELIX-230: Merge branch 'feature/CELIX-230_Refactoring_of_the_shell_command_service' into develop explain why this merge is necessary, Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2e480a29 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2e480a29 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2e480a29 Branch: refs/heads/feature/CELIX-269_depman Commit: 2e480a297d689d0ab340fdfc32874abfc562b220 Parents: c58615d 4234d9b Author: Pepijn Noltes Authored: Tue Nov 3 10:07:29 2015 +0100 Committer: Pepijn Noltes Committed: Tue Nov 3 10:07:29 2015 +0100 ---------------------------------------------------------------------- framework/private/src/bundle_context.c | 3 + framework/private/src/service_reference.c | 1 - .../examples/calculator_shell/CMakeLists.txt | 1 - .../private/include/add_command.h | 5 +- .../private/include/sqrt_command.h | 5 +- .../private/include/sub_command.h | 5 +- .../calculator_shell/private/src/add_command.c | 46 +- .../private/src/calculator_shell_activator.c | 55 ++- .../calculator_shell/private/src/sqrt_command.c | 42 +- .../calculator_shell/private/src/sub_command.c | 46 +- remote_shell/private/include/shell_mediator.h | 2 +- remote_shell/private/src/remote_shell.c | 46 +- remote_shell/private/src/shell_mediator.c | 19 +- shell/CMakeLists.txt | 38 +- shell/private/include/help_command.h | 33 -- shell/private/include/inspect_command.h | 33 -- shell/private/include/install_command.h | 33 -- shell/private/include/log_command.h | 33 -- shell/private/include/ps_command.h | 33 -- shell/private/include/shell_private.h | 22 +- shell/private/include/start_command.h | 33 -- shell/private/include/std_commands.h | 44 ++ shell/private/include/stop_command.h | 33 -- shell/private/include/uninstall_command.h | 33 -- shell/private/include/update_command.h | 35 -- shell/private/src/activator.c | 415 ++++++++++--------- shell/private/src/help_command.c | 135 +++--- shell/private/src/inspect_command.c | 121 ++---- shell/private/src/install_command.c | 49 +-- shell/private/src/lb_command.c | 181 ++++++++ shell/private/src/log_command.c | 48 +-- shell/private/src/ps_command.c | 162 -------- shell/private/src/shell.c | 340 ++++++++++----- shell/private/src/start_command.c | 89 ++-- shell/private/src/stop_command.c | 93 ++--- shell/private/src/uninstall_command.c | 33 +- shell/private/src/update_command.c | 42 +- shell/public/include/command.h | 23 +- shell/public/include/command_impl.h | 48 --- shell/public/include/shell.h | 11 +- shell/public/src/command.c | 45 -- shell_tui/private/src/shell_tui.c | 5 +- 42 files changed, 1074 insertions(+), 1445 deletions(-) ----------------------------------------------------------------------