You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/04/10 15:44:36 UTC
[61/62] [abbrv] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c201aa1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c201aa1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c201aa1d

Branch: refs/heads/NIFI-25
Commit: c201aa1d088e6e041fce8a25ca974c5759e5d61c
Parents: e18c0a7 c1959b3
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Apr 10 09:39:20 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Apr 10 09:39:20 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/nifi/util/EscapeUtils.java  |  42 +++
 .../nifi/web/api/dto/DocumentedTypeDTO.java     |  14 -
 .../nifi/web/api/dto/PropertyDescriptorDTO.java |   9 +-
 .../org/apache/nifi/web/NiFiServiceFacade.java  |   3 +-
 .../nifi/web/StandardNiFiContentAccess.java     |  10 +-
 .../nifi/web/StandardNiFiServiceFacade.java     |   4 +-
 .../apache/nifi/web/api/ControllerResource.java |   7 +-
 .../web/api/config/NotFoundExceptionMapper.java |  48 +++
 .../org/apache/nifi/web/api/dto/DtoFactory.java | 135 +-------
 .../nifi/web/controller/ControllerFacade.java   |  43 ++-
 .../org/apache/nifi/web/util/SnippetUtils.java  |   6 +-
 .../src/main/resources/nifi-web-api-context.xml |   1 +
 .../nifi/web/ContentViewerController.java       |  18 +-
 .../src/main/webapp/WEB-INF/jsp/header.jsp      |  20 +-
 .../src/main/webapp/js/hexview/hexview.js       |   4 +-
 .../nifi-web/nifi-web-docs/pom.xml              |   6 +
 .../nifi/web/docs/DocumentationController.java  |   5 +-
 .../main/webapp/WEB-INF/jsp/documentation.jsp   |  20 +-
 .../src/main/webapp/js/application.js           |   7 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |   6 +
 .../main/webapp/WEB-INF/pages/message-page.jsp  |   6 +-
 .../src/main/webapp/css/settings.css            |  15 -
 .../propertytable/jquery.propertytable.css      |  43 +++
 .../propertytable/jquery.propertytable.js       | 337 ++++++++++++++++---
 .../js/nf/canvas/nf-controller-service.js       | 186 +++++-----
 .../js/nf/canvas/nf-processor-configuration.js  | 136 +++++---
 .../webapp/js/nf/canvas/nf-reporting-task.js    | 135 +++++---
 .../src/main/webapp/js/nf/canvas/nf-settings.js | 227 ++-----------
 .../nifi-standard-content-viewer/pom.xml        |   5 +
 .../src/main/webapp/WEB-INF/jsp/codemirror.jsp  |   7 +-
 .../nifi-update-attribute-ui/pom.xml            |   5 +
 .../src/main/webapp/WEB-INF/jsp/worksheet.jsp   |   8 +-
 32 files changed, 854 insertions(+), 664 deletions(-)
----------------------------------------------------------------------