Merge branch 'CAMEL-7261' of https://github.com/grgrzybek/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea2863e1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea2863e1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea2863e1 Branch: refs/heads/master Commit: ea2863e133c81934220533e900d592fc593de4db Parents: e245099 97aa17c Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Mar 3 11:59:51 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Mar 3 11:59:51 2014 +0100 ---------------------------------------------------------------------- .../karaf/commands/AbstractContextCommand.java | 44 ++++++++++++++++++++ .../camel/karaf/commands/ContextResume.java | 33 +++++++++++++++ .../camel/karaf/commands/ContextStart.java | 15 ++----- .../camel/karaf/commands/ContextStop.java | 15 ++----- .../camel/karaf/commands/ContextSuspend.java | 33 +++++++++++++++ .../OSGI-INF/blueprint/camel-commands.xml | 18 ++++++++ .../src/main/resources/OSGI-INF/bundle.info | 2 + 7 files changed, 136 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
