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/01/29 15:06:09 UTC
[4/4] incubator-nifi git commit: Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

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


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

Branch: refs/heads/NIFI-250
Commit: d60710b6fbbddc8bb1b6d8f5a7b078bbf7e4bd0a
Parents: f18aca1 bb628b0
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 09:05:57 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 09:05:57 2015 -0500

----------------------------------------------------------------------
 .../org/apache/nifi/admin/dao/ActionDAO.java    |    6 +-
 .../nifi/admin/dao/impl/StandardActionDAO.java  |   60 +-
 .../apache/nifi/admin/service/AuditService.java |    6 +-
 .../admin/service/action/GetPreviousValues.java |    8 +-
 .../service/impl/StandardAuditService.java      |    4 +-
 .../nifi/web/api/dto/ComponentHistoryDTO.java   |   56 +
 .../web/api/dto/ControllerConfigurationDTO.java |   18 +
 .../nifi/web/api/dto/ControllerServiceDTO.java  |  111 +-
 .../nifi/web/api/dto/ProcessorHistoryDTO.java   |   56 -
 .../component/details/ComponentDetailsDTO.java  |    2 +-
 .../component/details/ExtensionDetailsDTO.java  |   41 +
 .../component/details/ProcessorDetailsDTO.java  |   41 -
 .../web/api/entity/ComponentHistoryEntity.java  |   45 +
 .../web/api/entity/ProcessorHistoryEntity.java  |   45 -
 .../java/org/apache/nifi/action/Component.java  |    3 +-
 .../component/details/ExtensionDetails.java     |   34 +
 .../component/details/ProcessorDetails.java     |   34 -
 .../nifi/audit/ControllerServiceAuditor.java    |  355 +++++
 .../org/apache/nifi/audit/FunnelAuditor.java    |    8 +-
 .../java/org/apache/nifi/audit/NiFiAuditor.java |    1 +
 .../java/org/apache/nifi/audit/PortAuditor.java |   17 +-
 .../apache/nifi/audit/ProcessGroupAuditor.java  |   18 +-
 .../org/apache/nifi/audit/ProcessorAuditor.java |   20 +-
 .../apache/nifi/audit/RelationshipAuditor.java  |   18 +-
 .../nifi/audit/RemoteProcessGroupAuditor.java   |   22 +-
 .../org/apache/nifi/audit/SnippetAuditor.java   |   13 +-
 .../org/apache/nifi/web/NiFiServiceFacade.java  |    8 +-
 .../nifi/web/StandardNiFiServiceFacade.java     |   11 +-
 .../apache/nifi/web/StandardNiFiWebContext.java |    4 +-
 .../nifi/web/api/ControllerServiceResource.java |   87 +-
 .../apache/nifi/web/api/HistoryResource.java    |   39 +-
 .../org/apache/nifi/web/api/dto/DtoFactory.java |   35 +-
 .../dao/impl/StandardControllerServiceDAO.java  |  136 +-
 .../src/main/resources/nifi-web-api-context.xml |    5 +
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |    6 +-
 .../main/resources/filters/canvas.properties    |    5 +-
 .../src/main/webapp/WEB-INF/pages/canvas.jsp    |    4 +-
 .../src/main/webapp/WEB-INF/pages/summary.jsp   |    2 +
 .../canvas/controller-service-configuration.jsp |   80 ++
 .../canvas/new-controller-service-dialog.jsp    |    7 -
 .../canvas/new-processor-property-dialog.jsp    |   34 -
 .../partials/canvas/new-property-dialog.jsp     |   34 +
 .../partials/canvas/processor-configuration.jsp |   18 +-
 .../partials/canvas/settings-content.jsp        |   28 +-
 .../WEB-INF/partials/processor-details.jsp      |    4 -
 .../nifi-web-ui/src/main/webapp/css/canvas.css  |    1 +
 .../css/controller-service-configuration.css    |  131 ++
 .../nifi-web-ui/src/main/webapp/css/dialog.css  |   10 -
 .../css/new-controller-service-dialog.css       |   15 +-
 .../main/webapp/css/processor-configuration.css |  152 ---
 .../src/main/webapp/css/processor-details.css   |   26 -
 .../src/main/webapp/css/settings.css            |   38 +
 .../main/webapp/images/buttonNewProperty.png    |  Bin 590 -> 0 bytes
 .../src/main/webapp/images/iconUndo.png         |  Bin 642 -> 0 bytes
 .../jquery/propertytable/buttonNewProperty.png  |  Bin 0 -> 590 bytes
 .../propertytable/jquery.propertytable.css      |  177 +++
 .../propertytable/jquery.propertytable.js       | 1292 ++++++++++++++++++
 .../js/jquery/tagcloud/jquery.tagcloud.js       |   10 -
 .../webapp/js/nf/canvas/nf-canvas-header.js     |   55 +-
 .../src/main/webapp/js/nf/canvas/nf-canvas.js   |   13 +-
 .../nf-controller-service-configuration.js      |  435 ++++++
 .../js/nf/canvas/nf-processor-configuration.js  |   47 +-
 .../nf-processor-property-combo-editor.js       |  177 ---
 .../canvas/nf-processor-property-nfel-editor.js |  207 ---
 .../js/nf/canvas/nf-processor-property-table.js |  567 --------
 .../canvas/nf-processor-property-text-editor.js |  212 ---
 .../src/main/webapp/js/nf/canvas/nf-settings.js |  352 +++--
 .../webapp/js/nf/history/nf-history-table.js    |    2 +-
 .../src/main/webapp/js/nf/nf-common.js          |   66 +
 .../main/webapp/js/nf/nf-processor-details.js   |  348 +----
 70 files changed, 3665 insertions(+), 2257 deletions(-)
----------------------------------------------------------------------