[NIFI-3359] Modularize all of nifi-web-ui except canvas directory - Removing shell.jsp from summary.jsp. - This closes #1428
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/dc934cbb Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/dc934cbb Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/dc934cbb Branch: refs/heads/master Commit: dc934cbb8e4ad7078de555a112d92f05fd1e879f Parents: 516075d Author: Scott Aslan <[email protected]> Authored: Fri Jan 20 15:55:31 2017 -0500 Committer: Matt Gilman <[email protected]> Committed: Fri Jan 20 16:18:08 2017 -0500 ---------------------------------------------------------------------- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 115 +- .../resources/filters/bulletin-board.properties | 7 +- .../main/resources/filters/canvas.properties | 21 +- .../main/resources/filters/cluster.properties | 11 +- .../main/resources/filters/counters.properties | 11 +- .../main/resources/filters/history.properties | 12 +- .../src/main/resources/filters/login.properties | 7 +- .../resources/filters/provenance.properties | 16 +- .../main/resources/filters/summary.properties | 18 +- .../main/resources/filters/templates.properties | 11 +- .../src/main/resources/filters/users.properties | 9 +- .../src/main/webapp/WEB-INF/pages/canvas.jsp | 4 +- .../src/main/webapp/WEB-INF/pages/summary.jsp | 2 +- .../src/main/webapp/WEB-INF/pages/users.jsp | 2 +- .../WEB-INF/partials/canvas/about-dialog.jsp | 2 +- .../WEB-INF/partials/canvas/flow-status.jsp | 2 +- .../main/webapp/js/jquery/combo/jquery.combo.js | 3 + .../js/jquery/nfeditor/jquery.nfeditor.js | 84 +- .../webapp/js/jquery/nfeditor/languages/nfel.js | 24 +- .../propertytable/jquery.propertytable.js | 318 ++- .../js/jquery/tagcloud/jquery.tagcloud.js | 2 +- .../js/nf/bulletin-board/nf-bulletin-board.js | 779 +++--- .../nf-ng-canvas-flow-status-controller.js | 52 +- .../nf-ng-canvas-global-menu-controller.js | 8 +- .../nf-ng-canvas-header-controller.js | 6 +- .../header/components/nf-ng-funnel-component.js | 2 +- .../header/components/nf-ng-group-component.js | 12 +- .../components/nf-ng-input-port-component.js | 8 +- .../header/components/nf-ng-label-component.js | 2 +- .../components/nf-ng-output-port-component.js | 8 +- .../components/nf-ng-processor-component.js | 28 +- .../nf-ng-remote-process-group-component.js | 6 +- .../components/nf-ng-template-component.js | 14 +- .../src/main/webapp/js/nf/canvas/nf-actions.js | 14 +- .../js/nf/canvas/nf-canvas-error-handler.js | 60 + .../src/main/webapp/js/nf/canvas/nf-canvas.js | 93 +- .../webapp/js/nf/canvas/nf-component-state.js | 22 +- .../js/nf/canvas/nf-connection-configuration.js | 14 +- .../main/webapp/js/nf/canvas/nf-connection.js | 4 +- .../js/nf/canvas/nf-controller-service.js | 24 +- .../js/nf/canvas/nf-controller-services.js | 64 +- .../main/webapp/js/nf/canvas/nf-custom-ui.js | 100 +- .../main/webapp/js/nf/canvas/nf-draggable.js | 4 +- .../src/main/webapp/js/nf/canvas/nf-go-to.js | 4 +- .../js/nf/canvas/nf-label-configuration.js | 2 +- .../webapp/js/nf/canvas/nf-policy-management.js | 35 +- .../js/nf/canvas/nf-port-configuration.js | 2 +- .../nf/canvas/nf-process-group-configuration.js | 4 +- .../js/nf/canvas/nf-processor-configuration.js | 11 +- .../webapp/js/nf/canvas/nf-queue-listing.js | 24 +- .../nf-remote-process-group-configuration.js | 2 +- .../nf/canvas/nf-remote-process-group-ports.js | 6 +- .../webapp/js/nf/canvas/nf-reporting-task.js | 15 +- .../src/main/webapp/js/nf/canvas/nf-settings.js | 25 +- .../webapp/js/nf/cluster/nf-cluster-table.js | 460 +++- .../src/main/webapp/js/nf/cluster/nf-cluster.js | 85 +- .../webapp/js/nf/counters/nf-counters-table.js | 111 +- .../main/webapp/js/nf/counters/nf-counters.js | 87 +- .../webapp/js/nf/history/nf-history-model.js | 378 +-- .../webapp/js/nf/history/nf-history-table.js | 152 +- .../src/main/webapp/js/nf/history/nf-history.js | 123 +- .../src/main/webapp/js/nf/login/nf-login.js | 75 +- .../src/main/webapp/js/nf/nf-ajax-setup.js | 54 +- .../src/main/webapp/js/nf/nf-client.js | 30 +- .../src/main/webapp/js/nf/nf-cluster-summary.js | 81 + .../src/main/webapp/js/nf/nf-common.js | 584 ++-- .../main/webapp/js/nf/nf-connection-details.js | 56 +- .../src/main/webapp/js/nf/nf-dialog.js | 83 +- .../src/main/webapp/js/nf/nf-error-handler.js | 147 + .../src/main/webapp/js/nf/nf-ng-app-config.js | 168 +- .../main/webapp/js/nf/nf-ng-app-controller.js | 50 +- .../src/main/webapp/js/nf/nf-ng-bridge.js | 20 +- .../main/webapp/js/nf/nf-ng-service-provider.js | 61 +- .../main/webapp/js/nf/nf-processor-details.js | 113 +- .../src/main/webapp/js/nf/nf-shell.js | 110 +- .../src/main/webapp/js/nf/nf-status-history.js | 85 +- .../src/main/webapp/js/nf/nf-storage.js | 50 +- .../main/webapp/js/nf/nf-universal-capture.js | 188 +- .../js/nf/provenance/nf-provenance-lineage.js | 2447 ++++++++--------- .../js/nf/provenance/nf-provenance-table.js | 2556 +++++++++--------- .../webapp/js/nf/provenance/nf-provenance.js | 553 ++-- .../webapp/js/nf/summary/nf-cluster-search.js | 50 +- .../webapp/js/nf/summary/nf-summary-table.js | 353 +-- .../src/main/webapp/js/nf/summary/nf-summary.js | 162 +- .../js/nf/templates/nf-templates-table.js | 151 +- .../main/webapp/js/nf/templates/nf-templates.js | 83 +- .../main/webapp/js/nf/users/nf-users-table.js | 204 +- .../src/main/webapp/js/nf/users/nf-users.js | 98 +- 88 files changed, 6873 insertions(+), 5270 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml index b38a2f0..d04f207 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml @@ -422,18 +422,23 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/js/nf/canvas/nf-canvas-all.js</output> <includes> - <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> - <include>${staging.dir}/js/nf/canvas/nf-canvas-utils.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> - <include>${staging.dir}/js/nf/nf-shell.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-client.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/canvas/nf-context-menu.js</include> + <include>${staging.dir}/js/nf/nf-ng-bridge.js</include> + <include>${staging.dir}/js/nf/nf-cluster-summary.js</include> + <include>${staging.dir}/js/nf/canvas/nf-canvas.js</include> + <include>${staging.dir}/js/nf/canvas/nf-canvas-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> + <include>${staging.dir}/js/nf/nf-shell.js</include> <include>${staging.dir}/js/nf/canvas/nf-snippet.js</include> - <include>${staging.dir}/js/nf/canvas/nf-custom-ui.js</include> <include>${staging.dir}/js/nf/canvas/nf-queue-listing.js</include> <include>${staging.dir}/js/nf/canvas/nf-component-state.js</include> + <include>${staging.dir}/js/nf/canvas/nf-custom-ui.js</include> <include>${staging.dir}/js/nf/canvas/nf-controller-service.js</include> <include>${staging.dir}/js/nf/canvas/nf-controller-services.js</include> <include>${staging.dir}/js/nf/canvas/nf-reporting-task.js</include> @@ -449,6 +454,7 @@ <include>${staging.dir}/js/nf/canvas/nf-label-configuration.js</include> <include>${staging.dir}/js/nf/canvas/nf-connection-configuration.js</include> <include>${staging.dir}/js/nf/nf-connection-details.js</include> + <include>${staging.dir}/js/nf/nf-status-history.js</include> <include>${staging.dir}/js/nf/canvas/nf-graph.js</include> <include>${staging.dir}/js/nf/canvas/nf-processor.js</include> <include>${staging.dir}/js/nf/canvas/nf-label.js</include> @@ -458,18 +464,14 @@ <include>${staging.dir}/js/nf/canvas/nf-funnel.js</include> <include>${staging.dir}/js/nf/canvas/nf-connection.js</include> <include>${staging.dir}/js/nf/canvas/nf-draggable.js</include> - <include>${staging.dir}/js/nf/canvas/nf-selectable.js</include> <include>${staging.dir}/js/nf/canvas/nf-connectable.js</include> + <include>${staging.dir}/js/nf/canvas/nf-selectable.js</include> <include>${staging.dir}/js/nf/canvas/nf-birdseye.js</include> <include>${staging.dir}/js/nf/canvas/nf-settings.js</include> <include>${staging.dir}/js/nf/canvas/nf-go-to.js</include> <include>${staging.dir}/js/nf/canvas/nf-actions.js</include> - <include>${staging.dir}/js/nf/canvas/nf-context-menu.js</include> - <include>${staging.dir}/js/nf/nf-status-history.js</include> - <include>${staging.dir}/js/nf/canvas/nf-canvas.js</include> <include>${staging.dir}/js/nf/canvas/nf-clipboard.js</include> - <include>${staging.dir}/js/nf/nf-ng-app-config.js</include> - <include>${staging.dir}/js/nf/nf-ng-app-controller.js</include> + <include>${staging.dir}/js/nf/nf-ng-service-provider.js</include> <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js</include> <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-header-controller.js</include> <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js</include> @@ -488,78 +490,84 @@ <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-label-component.js</include> <include>${staging.dir}/js/nf/canvas/directives/nf-ng-breadcrumbs-directive.js</include> <include>${staging.dir}/js/nf/canvas/directives/nf-ng-draggable-directive.js</include> - <include>${staging.dir}/js/nf/nf-ng-bridge.js</include> - <include>${staging.dir}/js/nf/nf-ng-service-provider.js</include> + <include>${staging.dir}/js/nf/nf-ng-app-controller.js</include> + <include>${staging.dir}/js/nf/nf-ng-app-config.js</include> + <include>${staging.dir}/js/nf/canvas/nf-canvas-utils.js</include> </includes> </aggregation> <aggregation> <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/js/nf/history/nf-history-all.js</output> <includes> - <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> - <include>${staging.dir}/js/nf/history/nf-history.js</include> - <include>${staging.dir}/js/nf/history/nf-history-table.js</include> + <include>${staging.dir}/js/nf/nf-cluster-summary.js</include> <include>${staging.dir}/js/nf/history/nf-history-model.js</include> + <include>${staging.dir}/js/nf/history/nf-history-table.js</include> + <include>${staging.dir}/js/nf/history/nf-history.js</include> </includes> </aggregation> <aggregation> <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/js/nf/provenance/nf-provenance-all.js</output> <includes> - <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> <include>${staging.dir}/js/nf/nf-ng-bridge.js</include> - <include>${staging.dir}/js/nf/nf-ng-service-provider.js</include> - <include>${staging.dir}/js/nf/nf-ng-app-config.js</include> <include>${staging.dir}/js/nf/nf-ng-app-controller.js</include> - <include>${staging.dir}/js/nf/provenance/nf-provenance.js</include> + <include>${staging.dir}/js/nf/nf-ng-app-config.js</include> <include>${staging.dir}/js/nf/provenance/nf-provenance-table.js</include> <include>${staging.dir}/js/nf/provenance/nf-provenance-lineage.js</include> + <include>${staging.dir}/js/nf/provenance/nf-provenance.js</include> </includes> </aggregation> <aggregation> <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/js/nf/summary/nf-summary-all.js</output> <includes> - <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> + <include>${staging.dir}/js/nf/nf-client.js</include> + <include>${staging.dir}/js/nf/canvas/nf-custom-ui.js</include> + <include>${staging.dir}/js/nf/nf-cluster-summary.js</include> <include>${staging.dir}/js/nf/nf-processor-details.js</include> + <include>${staging.dir}/js/nf/canvas/nf-settings.js</include> + <include>${staging.dir}/js/nf/canvas/nf-process-group-configuration.js</include> <include>${staging.dir}/js/nf/nf-connection-details.js</include> <include>${staging.dir}/js/nf/nf-status-history.js</include> <include>${staging.dir}/js/nf/nf-ng-bridge.js</include> + <include>${staging.dir}/js/nf/summary/nf-summary-table.js</include> + <include>${staging.dir}/js/nf/summary/nf-cluster-search.js</include> <include>${staging.dir}/js/nf/nf-ng-service-provider.js</include> - <include>${staging.dir}/js/nf/nf-ng-app-config.js</include> <include>${staging.dir}/js/nf/nf-ng-app-controller.js</include> + <include>${staging.dir}/js/nf/nf-ng-app-config.js</include> <include>${staging.dir}/js/nf/summary/nf-summary.js</include> - <include>${staging.dir}/js/nf/summary/nf-summary-table.js</include> - <include>${staging.dir}/js/nf/summary/nf-cluster-search.js</include> </includes> </aggregation> <aggregation> <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/js/nf/counters/nf-counters-all.js</output> <includes> - <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> - <include>${staging.dir}/js/nf/counters/nf-counters.js</include> <include>${staging.dir}/js/nf/counters/nf-counters-table.js</include> + <include>${staging.dir}/js/nf/counters/nf-counters.js</include> </includes> </aggregation> <aggregation> @@ -567,57 +575,58 @@ <output>${project.build.directory}/${project.build.finalName}/js/nf/users/nf-users-all.js</output> <includes> <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> - <include>${staging.dir}/js/nf/users/nf-users.js</include> <include>${staging.dir}/js/nf/users/nf-users-table.js</include> + <include>${staging.dir}/js/nf/users/nf-users.js</include> </includes> </aggregation> <aggregation> <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/js/nf/templates/nf-templates-all.js</output> <includes> - <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> - <include>${staging.dir}/js/nf/templates/nf-templates.js</include> <include>${staging.dir}/js/nf/templates/nf-templates-table.js</include> + <include>${staging.dir}/js/nf/templates/nf-templates.js</include> </includes> </aggregation> <aggregation> <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/js/nf/cluster/nf-cluster-all.js</output> <includes> - <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> - <include>${staging.dir}/js/nf/cluster/nf-cluster.js</include> <include>${staging.dir}/js/nf/cluster/nf-cluster-table.js</include> + <include>${staging.dir}/js/nf/cluster/nf-cluster.js</include> </includes> </aggregation> <aggregation> <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/js/nf/bulletin-board/nf-bulletin-board-all.js</output> <includes> - <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> <include>${staging.dir}/js/nf/nf-ng-bridge.js</include> <include>${staging.dir}/js/nf/nf-ng-service-provider.js</include> - <include>${staging.dir}/js/nf/nf-ng-app-config.js</include> <include>${staging.dir}/js/nf/nf-ng-app-controller.js</include> + <include>${staging.dir}/js/nf/nf-ng-app-config.js</include> <include>${staging.dir}/js/nf/bulletin-board/nf-bulletin-board.js</include> </includes> </aggregation> @@ -625,11 +634,11 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/js/nf/login/nf-login-all.js</output> <includes> - <include>${staging.dir}/js/nf/nf-client.js</include> - <include>${staging.dir}/js/nf/nf-common.js</include> - <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-dialog.js</include> <include>${staging.dir}/js/nf/nf-storage.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-error-handler.js</include> + <include>${staging.dir}/js/nf/nf-universal-capture.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> <include>${staging.dir}/js/nf/login/nf-login.js</include> </includes> http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties index a24e743..328622f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties @@ -13,10 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -nf.bulletin.board.script.tags=<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +nf.bulletin.board.script.tags=<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ng-bridge.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ng-service-provider.js?${project.version}"></script>\n\ http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties index 738abc1..dbc2ac2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties @@ -13,14 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -nf.canvas.script.tags=<script type="text/javascript" src="js/nf/nf-client.js?${project.version}"></script>\n\ +nf.canvas.script.tags=<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-client.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/nf-context-menu.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-ng-bridge.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-cluster-summary.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/nf-canvas.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/nf-canvas-error-handler.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/canvas/nf-canvas-utils.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-shell.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-snippet.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-queue-listing.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-component-state.js?${project.version}"></script>\n\ @@ -56,10 +61,7 @@ nf.canvas.script.tags=<script type="text/javascript" src="js/nf/nf-client.js?${p <script type="text/javascript" src="js/nf/canvas/nf-settings.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-go-to.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-actions.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/canvas/nf-context-menu.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/canvas/nf-canvas.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-clipboard.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-ng-bridge.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ng-service-provider.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-canvas-header-controller.js?${project.version}"></script>\n\ @@ -80,6 +82,7 @@ nf.canvas.script.tags=<script type="text/javascript" src="js/nf/nf-client.js?${p <script type="text/javascript" src="js/nf/canvas/directives/nf-ng-breadcrumbs-directive.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/directives/nf-ng-draggable-directive.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ng-app-controller.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-ng-app-config.js?${project.version}"></script> +<script type="text/javascript" src="js/nf/nf-ng-app-config.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/nf-canvas-utils.js?${project.version}"></script> nf.canvas.style.tags=<link rel="stylesheet" href="css/canvas.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/common-ui.css?${project.version}" type="text/css" /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster.properties index 4c57327..b909227 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster.properties @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -nf.cluster.script.tags=<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +nf.cluster.script.tags=<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/cluster/nf-cluster.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/cluster/nf-cluster-table.js?${project.version}"></script> +<script type="text/javascript" src="js/nf/cluster/nf-cluster-table.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/cluster/nf-cluster.js?${project.version}"></script> nf.cluster.style.tags=<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/dialog.css?${project.version}" type="text/css" />\n\ http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters.properties index dd4b89d..60f923b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters.properties @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -nf.counters.script.tags=<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +nf.counters.script.tags=<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/counters/nf-counters.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/counters/nf-counters-table.js?${project.version}"></script> +<script type="text/javascript" src="js/nf/counters/nf-counters-table.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/counters/nf-counters.js?${project.version}"></script> nf.counters.style.tags=<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/common-ui.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\ http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history.properties index 63da6bf..092c1b7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history.properties @@ -13,14 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -nf.history.script.tags=<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +nf.history.script.tags=<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/history/nf-history.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-cluster-summary.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/history/nf-history-model.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/history/nf-history-table.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/history/nf-history-model.js?${project.version}"></script> +<script type="text/javascript" src="js/nf/history/nf-history.js?${project.version}"></script> nf.history.style.tags=<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/common-ui.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\ http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties index c3754b3..333bd37 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties @@ -13,10 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -nf.login.script.tags=<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +nf.login.script.tags=<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/login/nf-login.js?${project.version}"></script> nf.login.style.tags=<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\ http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance.properties index a8c5815..909e901 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance.properties @@ -13,18 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -nf.provenance.script.tags=<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +nf.provenance.script.tags=<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/provenance/nf-provenance.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/provenance/nf-provenance-table.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/provenance/nf-provenance-lineage.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ng-bridge.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-ng-service-provider.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ng-app-controller.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-ng-app-config.js?${project.version}"></script> +<script type="text/javascript" src="js/nf/nf-ng-app-config.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/provenance/nf-provenance-table.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/provenance/nf-provenance-lineage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/provenance/nf-provenance.js?${project.version}"></script> nf.provenance.style.tags=<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/common-ui.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\ http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties index 1786454..40d180a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties @@ -13,21 +13,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -nf.summary.script.tags=<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +nf.summary.script.tags=<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-client.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/nf-custom-ui.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-cluster-summary.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-processor-details.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/nf-settings.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/nf-process-group-configuration.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-connection-details.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-status-history.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/summary/nf-summary.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-ng-bridge.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/summary/nf-summary-table.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/summary/nf-cluster-search.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-ng-bridge.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ng-service-provider.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ng-app-controller.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-ng-app-config.js?${project.version}"></script> +<script type="text/javascript" src="js/nf/nf-ng-app-config.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/summary/nf-summary.js?${project.version}"></script> nf.summary.style.tags=<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/common-ui.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\ http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties index 5528874..cb036e0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -nf.templates.script.tags=<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +nf.templates.script.tags=<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/templates/nf-templates.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/templates/nf-templates-table.js?${project.version}"></script> +<script type="text/javascript" src="js/nf/templates/nf-templates-table.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/templates/nf-templates.js?${project.version}"></script> nf.templates.style.tags=<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/common-ui.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\ http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users.properties index 256cb72..ed8ff5d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users.properties @@ -14,13 +14,14 @@ # limitations under the License. nf.users.script.tags=<script type="text/javascript" src="js/nf/nf-client.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-error-handler.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-universal-capture.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/users/nf-users.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/users/nf-users-table.js?${project.version}"></script> +<script type="text/javascript" src="js/nf/users/nf-users-table.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/users/nf-users.js?${project.version}"></script> nf.users.style.tags=<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/common-ui.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\ http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp index 3626ba4..3ecead7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp @@ -52,8 +52,6 @@ <script type="text/javascript" src="assets/jquery-form/jquery.form.js"></script> <script type="text/javascript" src="js/jquery/tabbs/jquery.tabbs.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/combo/jquery.combo.js?${project.version}"></script> - <script type="text/javascript" src="js/jquery/propertytable/jquery.propertytable.js?${project.version}"></script> - <script type="text/javascript" src="js/jquery/tagcloud/jquery.tagcloud.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> <script type="text/javascript" src="assets/jquery-minicolors/jquery.minicolors.min.js"></script> <script type="text/javascript" src="assets/qtip2/dist/jquery.qtip.min.js"></script> @@ -81,6 +79,8 @@ ${nf.canvas.script.tags} <script type="text/javascript" src="js/jquery/nfeditor/languages/nfel.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/nfeditor/jquery.nfeditor.js?${project.version}"></script> + <script type="text/javascript" src="js/jquery/propertytable/jquery.propertytable.js?${project.version}"></script> + <script type="text/javascript" src="js/jquery/tagcloud/jquery.tagcloud.js?${project.version}"></script> </head> <body ng-controller="ngCanvasAppCtrl" id="canvas-body"> <div id="splash"> http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp index 490e42b..81394d0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp @@ -46,7 +46,6 @@ <script type="text/javascript" src="js/jquery/jquery.center.js"></script> <script type="text/javascript" src="js/jquery/tabbs/jquery.tabbs.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/combo/jquery.combo.js?${project.version}"></script> - <script type="text/javascript" src="js/jquery/propertytable/jquery.propertytable.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/jquery.ellipsis.js"></script> <script type="text/javascript" src="js/jquery/jquery.each.js"></script> @@ -73,6 +72,7 @@ ${nf.summary.script.tags} <script type="text/javascript" src="js/jquery/nfeditor/languages/nfel.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/nfeditor/jquery.nfeditor.js?${project.version}"></script> + <script type="text/javascript" src="js/jquery/propertytable/jquery.propertytable.js?${project.version}"></script> </head> <body ng-controller="ngSummaryAppCtrl"> <jsp:include page="/WEB-INF/partials/message-pane.jsp"/> http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp index 6bd353b..19a6146 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp @@ -39,7 +39,6 @@ <script type="text/javascript" src="js/jquery/jquery.center.js"></script> <script type="text/javascript" src="js/jquery/tabbs/jquery.tabbs.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/combo/jquery.combo.js?${project.version}"></script> - <script type="text/javascript" src="js/jquery/propertytable/jquery.propertytable.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/jquery.ellipsis.js"></script> <script type="text/javascript" src="js/jquery/jquery.each.js"></script> @@ -57,6 +56,7 @@ <script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script> <script type="text/javascript" src="js/nf/nf-ng-namespace.js?${project.version}"></script> ${nf.users.script.tags} + <script type="text/javascript" src="js/jquery/propertytable/jquery.propertytable.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/nfeditor/languages/nfel.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/nfeditor/jquery.nfeditor.js?${project.version}"></script> </head> http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp index 0d99aaa..6453da6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp @@ -35,7 +35,7 @@ </div> <p> Apache NiFi is a framework to support highly scalable and flexible dataflows. - It can be run on on laptops up through clusters of enterprise class servers. + It can be run on laptops up through clusters of enterprise class servers. Instead of dictating a particular dataflow or behavior it empowers you to design your own optimal dataflow tailored to your specific environment. </p> http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp index 63ecd3a..81e9ef0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp @@ -17,7 +17,7 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <div id="flow-status" flex layout="row" layout-align="space-between center"> <div id="flow-status-container" layout="row" layout-align="space-around center"> - <div class="fa fa-cubes" ng-if="appCtrl.nf.Canvas.isClustered()"><span id="connected-nodes-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.connectedNodesCount}}</span></div> + <div class="fa fa-cubes" ng-if="appCtrl.nf.ClusterSummary.isClustered()"><span id="connected-nodes-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.connectedNodesCount}}</span></div> <div class="icon icon-threads"><span id="active-thread-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.activeThreadCount}}</span></div> <div class="fa fa-list"><span id="total-queued">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.totalQueued}}</span></div> <div class="fa fa-bullseye"><span id="controller-transmitting-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerTransmittingCount}}</span></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js index c025ddd..b6d324b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js @@ -14,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +/* requires qtip plugin to be loaded first*/ + /** * Create a new combo box. The options are specified in the following * format: http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js index 41353d7..ba673a4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js @@ -15,27 +15,26 @@ * limitations under the License. */ -/* global CodeMirror, nf */ - -/** - * Create a new nf editor. The options are specified in the following - * format: - * - * { - * languageId: 'nfel', - * resizable: true, - * sensitive: false, - * readOnly: false, - * content: '${attribute}', - * width: 200, - * height: 200, - * minWidth: 150, - * minHeight: 150 - * } - * - * @param {type} $ - */ -(function ($) { +/* global define, module, require, exports */ + +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + define(['jquery', + 'CodeMirror', + 'nf'], + function ($, common) { + factory($, common); + }); + } else if (typeof exports === 'object' && typeof module === 'object') { + factory(require('jquery'), + require('CodeMirror'), + require('nf')); + } else { + factory(root.$, + root.CodeMirror, + root.nf); + } +}(this, function ($, CodeMirror, nf) { var isUndefined = function (obj) { return typeof obj === 'undefined'; @@ -58,10 +57,23 @@ }; var methods = { - + /** - * Initializes the nf editor. - * + * Create a new nf editor. The options are specified in the following + * format: + * + * { + * languageId: 'nfel', + * resizable: true, + * sensitive: false, + * readOnly: false, + * content: '${attribute}', + * width: 200, + * height: 200, + * minWidth: 150, + * minHeight: 150 + * } + * * @param {object} options The options for this editor. */ init: function (options) { @@ -118,7 +130,7 @@ } } }); - + // set the size var width = null; if (isDefinedAndNotNull(options.width)) { @@ -192,7 +204,7 @@ } }); }, - + /** * Refreshes the editor. */ @@ -206,10 +218,10 @@ } }); }, - + /** * Sets the size of the editor. - * + * * @param {integer} width * @param {integer} height */ @@ -223,7 +235,7 @@ } }); }, - + /** * Gets the value of the editor in the first matching selector. */ @@ -243,10 +255,10 @@ return value; }, - + /** * Sets the value of the editor. - * + * * @param {string} value */ setValue: function (value) { @@ -262,7 +274,7 @@ } }); }, - + /** * Sets the focus. */ @@ -276,7 +288,7 @@ } }); }, - + /** * Sets the focus. */ @@ -290,7 +302,7 @@ } }); }, - + /** * Gets whether the value of the editor in the first matching selector has been modified. */ @@ -304,7 +316,7 @@ return modified; }, - + /** * Destroys the editor. */ @@ -320,4 +332,4 @@ return methods.init.apply(this, arguments); } }; -})(jQuery); \ No newline at end of file +})); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/dc934cbb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js index 9635337..807cf11 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js @@ -15,9 +15,27 @@ * limitations under the License. */ -/* global nf, CodeMirror */ +/* global nf, define, module, require, exports */ -nf.nfel = (function() { +/* requires qtip plugin to be loaded first*/ + +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + define(['jquery', + 'CodeMirror'], + function ($, CodeMirror) { + return (nf.nfel = factory($, CodeMirror)); + }); + } else if (typeof exports === 'object' && typeof module === 'object') { + module.exports = (nf.nfel = + factory(require('jquery'), + require('CodeMirror'))); + } else { + nf.nfel = factory(root.$, + root.CodeMirror); + } +}(this, function ($, CodeMirror) { + 'use strict'; /** * Formats the specified arguments for the EL function tooltip. @@ -853,4 +871,4 @@ nf.nfel = (function() { return completions; } }; -}()); \ No newline at end of file +})); \ No newline at end of file
