NIFI-250: Fixed handling of controller services on startup and resolved merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c63a8c05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c63a8c05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c63a8c05 Branch: refs/heads/NIFI-250 Commit: c63a8c05ff64196a0fc77a2386c60bac88784ad0 Parents: 800f80b 42f8e81 Author: Mark Payne <[email protected]> Authored: Thu Mar 19 09:31:46 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Thu Mar 19 09:31:46 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/web/ComponentConfiguration.java | 122 ++++++ .../apache/nifi/web/ConfigurationAction.java | 86 +++++ .../org/apache/nifi/web/NiFiWebContext.java | 1 + .../apache/nifi/web/NiFiWebContextConfig.java | 1 + .../nifi/web/ProcessorConfigurationAction.java | 1 + .../java/org/apache/nifi/web/ProcessorInfo.java | 1 + .../nifi/web/UiExtensionRequestContext.java | 95 +++++ .../web/HttpServletRequestContextConfig.java | 1 + .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 10 + .../nifi-ui-extension-controller/pom.xml | 66 ++++ .../extension/ConfigureComponentController.java | 253 +++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 26 ++ .../nifi-web/nifi-ui-extension/pom.xml | 21 ++ .../apache/nifi/ui/extension/UiExtension.java | 46 +++ .../nifi/ui/extension/UiExtensionMapping.java | 40 ++ .../nifi/ui/extension/UiExtensionType.java | 26 ++ .../controller/UiExtensionControllerFacade.java | 101 +++++ .../UiExtensionControllerRequest.java | 64 ++++ .../nifi-web/nifi-web-api/pom.xml | 5 + .../apache/nifi/web/StandardNiFiWebContext.java | 1 + .../StandardUiExtensionControllerFacade.java | 377 +++++++++++++++++++ .../src/main/resources/nifi-web-api-context.xml | 7 + .../nifi-framework/nifi-web/pom.xml | 13 +- nifi/pom.xml | 5 + 24 files changed, 1366 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
