[jgitflow-maven-plugin]merging 'feature-UNOMI-102' into 'master' Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/5166fc23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/5166fc23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/5166fc23
Branch: refs/heads/master Commit: 5166fc23ebfd01f5d122c2e75fdbf96823701f3b Parents: 9db8296 69e249c Author: Abdelkader Midani <amid...@apache.org> Authored: Thu Jun 29 03:11:16 2017 +0200 Committer: Abdelkader Midani <amid...@apache.org> Committed: Thu Jun 29 03:11:16 2017 +0200 ---------------------------------------------------------------------- .../unomi/router/api/RouterConstants.java | 9 +- .../router/core/bean/CollectProfileBean.java | 38 +++++++ .../router/core/context/RouterCamelContext.java | 33 ++++-- .../core/processor/ConfigUpdateProcessor.java | 1 - .../ExportRouteCompletionProcessor.java | 76 ++++++++++++++ .../ImportRouteCompletionProcessor.java | 105 +++++++++++++++++++ .../core/processor/LineBuildProcessor.java | 54 ++++++++++ .../processor/RouteCompletionProcessor.java | 105 ------------------- .../core/route/ConfigUpdateRouteBuilder.java | 1 - .../route/ProfileExportCollectRouteBuilder.java | 53 +++++++--- .../ProfileExportProducerRouteBuilder.java | 69 ++++++++++++ .../ProfileImportAbstractRouteBuilder.java | 83 --------------- .../ProfileImportFromSourceRouteBuilder.java | 18 ++-- .../route/ProfileImportOneShotRouteBuilder.java | 26 ++--- .../route/ProfileImportToUnomiRouteBuilder.java | 21 ++-- .../core/route/RouterAbstractRouteBuilder.java | 98 +++++++++++++++++ .../strategy/ArrayListAggregationStrategy.java | 2 - .../StringLinesAggregationStrategy.java | 41 ++++++++ .../resources/OSGI-INF/blueprint/blueprint.xml | 43 +++++--- .../main/resources/org.apache.unomi.router.cfg | 17 ++- 20 files changed, 608 insertions(+), 285 deletions(-) ----------------------------------------------------------------------
