Merge branch 'NIFI-730' of https://git-wip-us.apache.org/repos/asf/nifi into NIFI-730
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9be37914 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9be37914 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9be37914 Branch: refs/heads/master Commit: 9be37914ddb9c8c017cc4d6b3209340a19a7cb8d Parents: 49a781d e0ac7cd Author: Mark Payne <[email protected]> Authored: Tue Oct 13 10:03:31 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Tue Oct 13 10:03:31 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/web/api/dto/DropRequestDTO.java | 129 +++++++++++ .../nifi/web/api/entity/DropRequestEntity.java | 44 ++++ .../org/apache/nifi/web/NiFiServiceFacade.java | 25 +++ .../nifi/web/StandardNiFiServiceFacade.java | 24 ++ .../apache/nifi/web/api/ConnectionResource.java | 217 ++++++++++++++++++- .../org/apache/nifi/web/dao/ConnectionDAO.java | 22 ++ .../web/dao/impl/StandardConnectionDAO.java | 15 ++ .../src/main/webapp/js/nf/canvas/nf-actions.js | 58 +++++ .../main/webapp/js/nf/canvas/nf-context-menu.js | 10 + 9 files changed, 542 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
