Repository: incubator-nifi
Updated Branches:
refs/heads/develop 953121929 -> edaa191d3
NIFI-232:
- Adding a note in the UI that the Event Driven scheduling strategy is experimental.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/edaa191d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/edaa191d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/edaa191d
Branch: refs/heads/develop
Commit: edaa191d37d0abe01a0be1da8c7a317bec96b4ec
Parents: 9531219
Author: Matt Gilman <matt.c.gilman@gmail.com>
Authored: Wed Jan 7 14:08:13 2015 -0500
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Wed Jan 7 14:08:13 2015 -0500
----------------------------------------------------------------------
.../partials/canvas/processor-configuration.jsp | 4 ++++
.../main/webapp/css/processor-configuration.css | 15 ++++++++++++
.../js/nf/canvas/nf-processor-configuration.js | 24 ++++++++++++--------
3 files changed, 34 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/edaa191d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
index fa390d3..9d9da2a 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
@@ -102,6 +102,10 @@
<div type="text" id="scheduling-strategy-combo"></div>
</div>
</div>
+ <div id="event-driven-warning" class="hidden">
+ <div id="event-driven-warning-icon"></div>
+ This strategy is experimental
+ </div>
<div class="clear"></div>
</div>
<div id="timer-driven-options" class="setting">
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/edaa191d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
index 5fa4f62..add52e0 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/processor-configuration.css
@@ -111,6 +111,21 @@ div.processor-enabled-container {
line-height: 18px;
}
+#event-driven-warning {
+ padding-top: 22px;
+ color: #f00;
+}
+
+#event-driven-warning-icon {
+ float: left;
+ margin-top: -2px;
+ margin-right: 5px;
+ margin-left: 5px;
+ width: 18px;
+ height: 16px;
+ background-image: url(../images/iconAlert.png);
+}
+
#auto-terminate-relationship-names {
border: 0 solid #CCCCCC;
height: 280px;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/edaa191d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
index 31bd79e..4dec734 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
@@ -37,14 +37,14 @@ nf.ProcessorConfiguration = (function () {
strategies.push({
text: 'Event driven',
value: 'EVENT_DRIVEN',
- description: 'Processor will be scheduled to run when triggered by an event
(e.g. a FlowFile enters an incoming queue).'
+ description: 'Processor will be scheduled to run when triggered by an event
(e.g. a FlowFile enters an incoming queue). This scheduling strategy is experimental.'
});
} else if (processor.config['schedulingStrategy'] === 'EVENT_DRIVEN') {
// the processor was once configured for event driven but no longer supports
it
strategies.push({
text: 'Event driven',
value: 'EVENT_DRIVEN',
- description: 'Processor will be scheduled to run when triggered by an event
(e.g. a FlowFile enters an incoming queue).',
+ description: 'Processor will be scheduled to run when triggered by an event
(e.g. a FlowFile enters an incoming queue). This scheduling strategy is experimental.',
disabled: true
});
}
@@ -506,17 +506,23 @@ nf.ProcessorConfiguration = (function () {
select: function (selectedOption) {
// show the appropriate panel
if (selectedOption.value === 'EVENT_DRIVEN') {
+ $('#event-driven-warning').show();
+
$('#timer-driven-options').hide();
$('#event-driven-options').show();
$('#cron-driven-options').hide();
- } else if (selectedOption.value === 'CRON_DRIVEN') {
- $('#timer-driven-options').hide();
- $('#event-driven-options').hide();
- $('#cron-driven-options').show();
} else {
- $('#timer-driven-options').show();
- $('#event-driven-options').hide();
- $('#cron-driven-options').hide();
+ $('#event-driven-warning').hide();
+
+ if (selectedOption.value === 'CRON_DRIVEN') {
+ $('#timer-driven-options').hide();
+ $('#event-driven-options').hide();
+ $('#cron-driven-options').show();
+ } else {
+ $('#timer-driven-options').show();
+ $('#event-driven-options').hide();
+ $('#cron-driven-options').hide();
+ }
}
}
});
|