Merge branch 'NIFI-108' of https://git-wip-us.apache.org/repos/asf/nifi into NIFI-108
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f4ef8847 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f4ef8847 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f4ef8847 Branch: refs/heads/NIFI-108 Commit: f4ef8847571889aa4627654a912bdbb7308865bf Parents: 9408507 6707337 Author: Mark Payne <[email protected]> Authored: Thu Dec 17 16:46:14 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Thu Dec 17 16:46:14 2015 -0500 ---------------------------------------------------------------------- .../apache/nifi/web/api/dto/FlowFileDTO.java | 40 +++ .../nifi/web/api/dto/FlowFileSummaryDTO.java | 32 ++ .../nifi/web/api/entity/FlowFileEntity.java | 44 +++ .../org/apache/nifi/web/NiFiServiceFacade.java | 22 ++ .../nifi/web/StandardNiFiServiceFacade.java | 11 + .../apache/nifi/web/api/ConnectionResource.java | 333 ++++++++++++++++--- .../org/apache/nifi/web/api/dto/DtoFactory.java | 14 + .../org/apache/nifi/web/dao/ConnectionDAO.java | 25 +- .../web/dao/impl/StandardConnectionDAO.java | 79 +++++ 9 files changed, 556 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f4ef8847/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f4ef8847/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java ----------------------------------------------------------------------
