Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4ADAC200CB8 for ; Fri, 26 May 2017 10:44:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 497F9160BC8; Fri, 26 May 2017 08:44:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 71B11160BD9 for ; Fri, 26 May 2017 10:44:03 +0200 (CEST) Received: (qmail 45508 invoked by uid 500); 26 May 2017 08:44:02 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 45392 invoked by uid 99); 26 May 2017 08:44:02 -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; Fri, 26 May 2017 08:44:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 68E9FE04F2; Fri, 26 May 2017 08:44:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gzurowski@apache.org To: commits@camel.apache.org Date: Fri, 26 May 2017 08:44:05 -0000 Message-Id: In-Reply-To: <587d531331cd48fe8c94ed9db1dbc03c@git.apache.org> References: <587d531331cd48fe8c94ed9db1dbc03c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] camel git commit: Merge branch 'feature/CAMEL-11335-routes-endpoint' archived-at: Fri, 26 May 2017 08:44:04 -0000 Merge branch 'feature/CAMEL-11335-routes-endpoint' Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83ee9a5e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83ee9a5e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83ee9a5e Branch: refs/heads/master Commit: 83ee9a5e58375e7bec8795e76f57db2fd6b5558c Parents: 7f91e92 75de780 Author: Gregor Zurowski Authored: Fri May 26 09:42:27 2017 +0100 Committer: Gregor Zurowski Committed: Fri May 26 09:42:27 2017 +0100 ---------------------------------------------------------------------- .../actuate/endpoint/CamelRoutesEndpoint.java | 94 ++++++++++++++++++++ .../CamelRoutesEndpointAutoConfiguration.java | 47 ++++++++++ .../main/resources/META-INF/spring.factories | 1 + .../actuate/endpoint/ActuatorTestRoute.java | 30 +++++++ .../endpoint/CamelRoutesEndpointTest.java | 57 ++++++++++++ 5 files changed, 229 insertions(+) ----------------------------------------------------------------------