NIFI-40: merged changes from NIFI-250 branch and 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/6e0575cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6e0575cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6e0575cf Branch: refs/heads/prov-query-language Commit: 6e0575cf1249c734423cb97f8c806783f1fb9f0d Parents: 8783c11 d122a83 Author: Mark Payne <[email protected]> Authored: Fri Mar 13 12:27:47 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Fri Mar 13 12:27:47 2015 -0400 ---------------------------------------------------------------------- .../nifi/web/api/dto/ReportingTaskDTO.java | 36 +- .../cluster/manager/impl/WebClusterManager.java | 368 +++++++++++++++++-- .../service/ControllerServiceProvider.java | 33 +- .../apache/nifi/controller/FlowController.java | 16 +- .../controller/StandardFlowSynchronizer.java | 2 +- .../StandardControllerServiceProvider.java | 20 + .../nifi/audit/ControllerServiceAuditor.java | 123 ++++--- .../nifi/web/api/ReportingTaskResource.java | 7 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 8 + .../dao/impl/StandardControllerServiceDAO.java | 8 +- .../web/dao/impl/StandardReportingTaskDAO.java | 92 ++++- .../canvas/controller-service-configuration.jsp | 2 +- .../canvas/reporting-task-configuration.jsp | 78 ++-- .../src/main/webapp/css/reporting-task.css | 30 ++ .../js/nf/canvas/nf-controller-service.js | 208 ++++++----- .../webapp/js/nf/canvas/nf-reporting-task.js | 106 +++++- .../src/main/webapp/js/nf/canvas/nf-settings.js | 136 ++++--- 17 files changed, 983 insertions(+), 290 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6e0575cf/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java index d1e24c0,a04ae3a..b77e94d --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java @@@ -2520,7 -2520,7 +2520,7 @@@ public class FlowController implements } catch (final InitializationException ie) { throw new ReportingTaskInstantiationException("Failed to initialize reporting task of type " + type, ie); } - - ++ try (final NarCloseable x = NarCloseable.withNarLoader()) { ReflectionUtils.invokeMethodsWithAnnotation(OnAdded.class, task); } catch (final Exception e) {
