Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a58891af Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a58891af Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a58891af Branch: refs/heads/develop Commit: a58891af1f232245188716fe292aea1e1dfd2c48 Parents: 89b0de8 2154b82 Author: bbende <[email protected]> Authored: Wed Apr 8 17:48:26 2015 -0400 Committer: bbende <[email protected]> Committed: Wed Apr 8 17:48:26 2015 -0400 ---------------------------------------------------------------------- .../nifi/web/api/dto/DocumentedTypeDTO.java | 14 - .../nifi/web/api/dto/PropertyDescriptorDTO.java | 9 +- .../org/apache/nifi/web/NiFiServiceFacade.java | 3 +- .../nifi/web/StandardNiFiServiceFacade.java | 4 +- .../apache/nifi/web/api/ControllerResource.java | 7 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 135 +-------- .../nifi/web/controller/ControllerFacade.java | 43 ++- .../org/apache/nifi/web/util/SnippetUtils.java | 6 +- .../nifi/web/docs/DocumentationController.java | 5 +- .../main/webapp/WEB-INF/jsp/documentation.jsp | 18 +- .../src/main/webapp/css/settings.css | 15 - .../propertytable/jquery.propertytable.css | 43 +++ .../propertytable/jquery.propertytable.js | 289 +++++++++++++++++-- .../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 ++------------- 17 files changed, 670 insertions(+), 605 deletions(-) ----------------------------------------------------------------------
