You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/02/04 19:57:29 UTC
[35/36] incubator-nifi git commit: Merge branch 'develop' into
NIFI-250
Merge branch 'develop' into NIFI-250
Conflicts:
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cc8b096f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cc8b096f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cc8b096f
Branch: refs/heads/NIFI-250
Commit: cc8b096ffa11ee44f6d5fb5f07de51826dd27b20
Parents: 13fb1a7 ed53b46
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Feb 4 12:44:56 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Feb 4 12:44:56 2015 -0500
----------------------------------------------------------------------
.gitignore | 7 +
README.md | 14 +
nifi-nar-maven-plugin/README.md | 14 +
nifi-nar-maven-plugin/pom.xml | 8 +-
nifi-site/Gruntfile.js | 137 ++
nifi-site/LICENSE | 202 +++
nifi-site/README.md | 119 ++
nifi-site/bower.json | 19 +
nifi-site/config.rb | 24 +
nifi-site/package.json | 24 +
nifi-site/robots.txt | 4 +
nifi-site/src/images/bgNifiLogo.png | Bin 0 -> 4232 bytes
nifi-site/src/images/egg-logo.png | Bin 0 -> 8626 bytes
nifi-site/src/images/feather-small.gif | Bin 0 -> 7129 bytes
nifi-site/src/images/flow.png | Bin 0 -> 503302 bytes
.../src/images/niFi-logo-horizontal-scaled.png | Bin 0 -> 4462 bytes
nifi-site/src/images/niFi-logo-horizontal.png | Bin 0 -> 13161 bytes
nifi-site/src/images/nifi16.ico | Bin 0 -> 1150 bytes
nifi-site/src/images/nifiDrop.svg | 217 +++
nifi-site/src/includes/disclaimer.hbs | 27 +
nifi-site/src/includes/footer.hbs | 6 +
nifi-site/src/includes/header.hbs | 22 +
nifi-site/src/includes/topbar.hbs | 70 +
nifi-site/src/js/app.js | 15 +
nifi-site/src/layouts/html.hbs | 3 +
nifi-site/src/layouts/markdown.hbs | 12 +
nifi-site/src/pages/html/download.hbs | 46 +
nifi-site/src/pages/html/faq.hbs | 33 +
nifi-site/src/pages/html/index.hbs | 210 +++
nifi-site/src/pages/html/mailing_lists.hbs | 70 +
nifi-site/src/pages/html/people.hbs | 136 ++
nifi-site/src/pages/html/roadmap.hbs | 30 +
nifi-site/src/pages/markdown/quickstart.md | 101 ++
nifi-site/src/pages/markdown/release-guide.md | 298 ++++
nifi-site/src/scss/_settings.scss | 1465 ++++++++++++++++++
nifi-site/src/scss/app.scss | 185 +++
nifi/README.md | 14 +
nifi/nifi-assembly/pom.xml | 1 +
.../src/main/java/MyProcessor.java | 10 +-
.../nifi/util/StandardProcessorTestRunner.java | 7 +-
.../util/TestStandardProcessorTestRunner.java | 2 +
.../src/main/resources/conf/logback.xml | 4 +-
.../nifi/web/controller/ControllerFacade.java | 15 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 14 +-
.../org/apache/nifi/web/servlet/ConvertSvg.java | 117 --
.../apache/nifi/web/servlet/DownloadSvg.java | 89 ++
.../nifi-web-ui/src/main/webapp/WEB-INF/web.xml | 30 +-
.../src/main/webapp/css/provenance.css | 5 +
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 17 +-
.../webapp/js/nf/canvas/nf-process-group.js | 6 +-
.../js/nf/canvas/nf-remote-process-group.js | 2 +-
.../webapp/js/nf/cluster/nf-cluster-table.js | 319 ++--
.../webapp/js/nf/counters/nf-counters-table.js | 63 +-
.../webapp/js/nf/history/nf-history-table.js | 149 +-
.../src/main/webapp/js/nf/nf-common.js | 7 +-
.../js/nf/provenance/nf-provenance-lineage.js | 17 +-
.../js/nf/provenance/nf-provenance-table.js | 103 +-
.../webapp/js/nf/summary/nf-summary-table.js | 523 +++----
.../src/main/webapp/js/nf/summary/nf-summary.js | 6 -
.../js/nf/templates/nf-templates-table.js | 73 +-
.../main/webapp/js/nf/users/nf-users-table.js | 440 +++---
.../nifi/processors/standard/BinFiles.java | 351 +++++
.../nifi/processors/standard/MergeContent.java | 403 ++---
.../nifi/processors/standard/PostHTTP.java | 42 +-
.../processors/standard/CaptureServlet.java | 54 +
.../nifi/processors/standard/TestPostHTTP.java | 249 +++
.../nifi/processors/standard/TestServer.java | 27 +-
.../update/attributes/api/RuleResource.java | 16 +-
nifi/pom.xml | 21 +-
69 files changed, 5268 insertions(+), 1446 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cc8b096f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cc8b096f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cc8b096f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
----------------------------------------------------------------------
diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
index 3d8a619,72fc549..8b3fbda
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
@@@ -356,74 -433,6 +433,6 @@@ nf.HistoryTable = (function ()
// request refresh of the current 'page'
historyGrid.onViewportChanged.notify();
- },
-
- /**
- * Shows the details for the specified action.
- *
- * @param {object} index
- */
- showActionDetails: function (index) {
- var historyGrid = $('#history-table').data('gridInstance');
- if (nf.Common.isDefinedAndNotNull(historyGrid)) {
- var historyModel = historyGrid.getData();
- var action = historyModel.getItem(index);
-
- // create the markup for the dialog
- var detailsMarkup = $('<div></div>').append(
- $('<div class="action-detail"><div class="history-details-name">Id</div>' + nf.Common.escapeHtml(action.sourceId) + '</div>'));
-
- // get any component details
- var componentDetails = action.componentDetails;
-
- // inspect the operation to determine if there are any component details
- if (nf.Common.isDefinedAndNotNull(componentDetails)) {
- if (action.sourceType === 'Processor' || action.sourceType === 'ControllerService') {
- detailsMarkup.append(
- $('<div class="action-detail"><div class="history-details-name">Type</div>' + nf.Common.escapeHtml(componentDetails.type) + '</div>'));
- } else if (action.sourceType === 'RemoteProcessGroup') {
- detailsMarkup.append(
- $('<div class="action-detail"><div class="history-details-name">Uri</div>' + nf.Common.formatValue(componentDetails.uri) + '</div>'));
- }
- }
-
- // get any action details
- var actionDetails = action.actionDetails;
-
- // inspect the operation to determine if there are any action details
- if (nf.Common.isDefinedAndNotNull(actionDetails)) {
- if (action.operation === 'Configure') {
- detailsMarkup.append(
- $('<div class="action-detail"><div class="history-details-name">Name</div>' + nf.Common.formatValue(actionDetails.name) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Value</div>' + nf.Common.formatValue(actionDetails.value) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Previous Value</div>' + nf.Common.formatValue(actionDetails.previousValue) + '</div>'));
- } else if (action.operation === 'Connect' || action.operation === 'Disconnect') {
- detailsMarkup.append(
- $('<div class="action-detail"><div class="history-details-name">Source Id</div>' + nf.Common.escapeHtml(actionDetails.sourceId) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Source Name</div>' + nf.Common.formatValue(actionDetails.sourceName) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Source Type</div>' + nf.Common.escapeHtml(actionDetails.sourceType) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Relationship(s)</div>' + nf.Common.formatValue(actionDetails.relationship) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Destination Id</div>' + nf.Common.escapeHtml(actionDetails.destinationId) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Destination Name</div>' + nf.Common.formatValue(actionDetails.destinationName) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Destination Type</div>' + nf.Common.escapeHtml(actionDetails.destinationType) + '</div>'));
- } else if (action.operation === 'Move') {
- detailsMarkup.append(
- $('<div class="action-detail"><div class="history-details-name">Group</div>' + nf.Common.formatValue(actionDetails.group) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Group Id</div>' + nf.Common.escapeHtml(actionDetails.groupId) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Previous Group</div>' + nf.Common.formatValue(actionDetails.previousGroup) + '</div>')).append(
- $('<div class="action-detail"><div class="history-details-name">Previous Group Id</div>' + nf.Common.escapeHtml(actionDetails.previousGroupId) + '</div>'));
- } else if (action.operation === 'Purge') {
- detailsMarkup.append(
- $('<div class="action-detail"><div class="history-details-name">End Date</div>' + nf.Common.escapeHtml(actionDetails.endDate) + '</div>'));
- }
- }
-
- // populate the dialog
- $('#action-details').append(detailsMarkup);
-
- // show the dialog
- $('#action-details-dialog').modal('show');
- }
}
};
--}());
++}());
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cc8b096f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
----------------------------------------------------------------------
diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
index 53ea076,b49a97b..0bd8061
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
@@@ -407,75 -406,8 +407,74 @@@ nf.Common =
}()),
/**
- * Creates a form inline in order to post the specified params to the specified URL.
+ * Determines if the specified property is sensitive.
+ *
+ * @argument {object} propertyDescriptor The property descriptor
+ */
+ isSensitiveProperty: function (propertyDescriptor) {
+ if (nf.Common.isDefinedAndNotNull(propertyDescriptor)) {
+ return propertyDescriptor.sensitive === true;
+ } else {
+ return false;
+ }
+ },
+
+ /**
+ * Determines if the specified property is required.
+ *
+ * @param {object} propertyDescriptor The property descriptor
+ */
+ isRequiredProperty: function (propertyDescriptor) {
+ if (nf.Common.isDefinedAndNotNull(propertyDescriptor)) {
+ return propertyDescriptor.required === true;
+ } else {
+ return false;
+ }
+ },
+
+ /**
+ * Determines if the specified property is required.
+ *
+ * @param {object} propertyDescriptor The property descriptor
+ */
+ isDynamicProperty: function (propertyDescriptor) {
+ if (nf.Common.isDefinedAndNotNull(propertyDescriptor)) {
+ return propertyDescriptor.dynamic === true;
+ } else {
+ return false;
+ }
+ },
+
+ /**
+ * Gets the allowable values for the specified property.
+ *
+ * @argument {object} propertyDescriptor The property descriptor
+ */
+ getAllowableValues: function (propertyDescriptor) {
+ if (nf.Common.isDefinedAndNotNull(propertyDescriptor)) {
+ return propertyDescriptor.allowableValues;
+ } else {
+ return null;
+ }
+ },
+
+ /**
+ * Returns whether the specified property supports EL.
+ *
+ * @param {object} propertyDescriptor The property descriptor
+ */
+ supportsEl: function (propertyDescriptor) {
+ if (nf.Common.isDefinedAndNotNull(propertyDescriptor)) {
+ return propertyDescriptor.supportsEl === true;
+ } else {
+ return false;
+ }
+ },
+
+ /**
+ * Creates a form inline in order to submit the specified params to the specified URL
+ * using the specified method.
*
- * @param {string} method The method to use
* @param {string} url The URL
* @param {object} params An object with the params to include in the submission
*/
@@@ -962,4 -894,4 +961,4 @@@
});
return formattedBulletins;
}
--};
++};