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/04/11 13:56:35 UTC
[1/2] incubator-nifi git commit: NIFI-502: - When adding a new
property entering into edit mode automatically. - Ensuring the markup for the
available actions are appended instead of replaced.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop f1c36e64f -> 7aca8eaea
NIFI-502:
- When adding a new property entering into edit mode automatically.
- Ensuring the markup for the available actions are appended instead of replaced.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9054dd4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9054dd4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9054dd4e
Branch: refs/heads/develop
Commit: 9054dd4e4273846ffd8c24e8ed1b26a6000209b6
Parents: df57555
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Apr 10 16:07:45 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Apr 10 16:07:45 2015 -0400
----------------------------------------------------------------------
.../webapp/js/jquery/propertytable/jquery.propertytable.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9054dd4e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
index 7ffaa3f..ca53709 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
@@ -1015,7 +1015,7 @@
// ensure the configured value is referencing a valid service
$.each(propertyDescriptor.allowableValues, function (_, allowableValue) {
if (allowableValue.value === dataContext.value) {
- markup = '<img src="images/iconGoTo.png" title="Go To" class="go-to-service pointer" style="margin-top: 2px" />';
+ markup += '<img src="images/iconGoTo.png" title="Go To" class="go-to-service pointer" style="margin-top: 2px" />';
return false;
}
});
@@ -1023,7 +1023,7 @@
// allow user defined properties to be removed
if (options.readOnly !== true && dataContext.type === 'userDefined') {
- markup = '<img src="images/iconDelete.png" title="Delete" class="delete-property pointer" style="margin-top: 2px" />';
+ markup += '<img src="images/iconDelete.png" title="Delete" class="delete-property pointer" style="margin-top: 2px" />';
}
return markup;
@@ -1414,8 +1414,8 @@
// select the new properties row
var row = propertyData.getRowById(id);
- propertyGrid.setSelectedRows([row]);
- propertyGrid.scrollRowIntoView(row);
+ propertyGrid.setActiveCell(row, propertyGrid.getColumnIndex('value'));
+ propertyGrid.editActiveCell();
});
} else {
nf.Dialog.showOkDialog({
[2/2] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by mc...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into 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/7aca8eae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/7aca8eae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/7aca8eae
Branch: refs/heads/develop
Commit: 7aca8eaeae7c8907bc1f5a4ba8e4fc74e011d710
Parents: 9054dd4 f1c36e6
Author: Matt Gilman <ma...@gmail.com>
Authored: Sat Apr 11 07:55:28 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Sat Apr 11 07:55:28 2015 -0400
----------------------------------------------------------------------
nifi/nifi-assembly/NOTICE | 49 +
nifi/nifi-assembly/pom.xml | 925 ++++++++++---------
.../nifi-hl7-query-language/.gitignore | 3 +
.../nifi-hl7-query-language/pom.xml | 125 +++
.../apache/nifi/hl7/query/antlr/HL7QueryLexer.g | 173 ++++
.../nifi/hl7/query/antlr/HL7QueryParser.g | 108 +++
.../org/apache/nifi/hl7/hapi/EmptyField.java | 37 +
.../org/apache/nifi/hl7/hapi/HapiField.java | 83 ++
.../org/apache/nifi/hl7/hapi/HapiMessage.java | 94 ++
.../org/apache/nifi/hl7/hapi/HapiSegment.java | 69 ++
.../apache/nifi/hl7/hapi/SingleValueField.java | 42 +
.../java/org/apache/nifi/hl7/io/HL7Reader.java | 27 +
.../hl7/io/exception/InvalidHL7Exception.java | 40 +
.../org/apache/nifi/hl7/model/HL7Component.java | 24 +
.../org/apache/nifi/hl7/model/HL7Field.java | 21 +
.../org/apache/nifi/hl7/model/HL7Message.java | 27 +
.../org/apache/nifi/hl7/model/HL7Segment.java | 27 +
.../org/apache/nifi/hl7/query/Declaration.java | 29 +
.../org/apache/nifi/hl7/query/HL7Query.java | 412 +++++++++
.../org/apache/nifi/hl7/query/QueryResult.java | 29 +
.../org/apache/nifi/hl7/query/ResultHit.java | 25 +
.../org/apache/nifi/hl7/query/Selection.java | 37 +
.../hl7/query/evaluator/BooleanEvaluator.java | 24 +
.../nifi/hl7/query/evaluator/Evaluator.java | 27 +
.../hl7/query/evaluator/IntegerEvaluator.java | 26 +
.../hl7/query/evaluator/StringEvaluator.java | 25 +
.../comparison/AbstractComparisonEvaluator.java | 106 +++
.../comparison/AbstractNumericComparison.java | 67 ++
.../evaluator/comparison/EqualsEvaluator.java | 32 +
.../comparison/GreaterThanEvaluator.java | 34 +
.../comparison/GreaterThanOrEqualEvaluator.java | 34 +
.../evaluator/comparison/IsNullEvaluator.java | 69 ++
.../evaluator/comparison/LessThanEvaluator.java | 31 +
.../comparison/LessThanOrEqualEvaluator.java | 31 +
.../comparison/NotEqualsEvaluator.java | 32 +
.../evaluator/comparison/NotEvaluator.java | 36 +
.../evaluator/comparison/NotNullEvaluator.java | 65 ++
.../literal/IntegerLiteralEvaluator.java | 36 +
.../literal/StringLiteralEvaluator.java | 35 +
.../hl7/query/evaluator/logic/AndEvaluator.java | 43 +
.../hl7/query/evaluator/logic/OrEvaluator.java | 43 +
.../message/DeclaredReferenceEvaluator.java | 42 +
.../query/evaluator/message/DotEvaluator.java | 88 ++
.../query/evaluator/message/FieldEvaluator.java | 67 ++
.../evaluator/message/MessageEvaluator.java | 34 +
.../evaluator/message/SegmentEvaluator.java | 51 +
.../exception/HL7QueryParsingException.java | 37 +
.../nifi/hl7/query/result/MissedResult.java | 56 ++
.../hl7/query/result/StandardQueryResult.java | 69 ++
.../hl7/query/result/StandardResultHit.java | 41 +
.../org/apache/nifi/hl7/query/TestHL7Query.java | 310 +++++++
.../src/test/resources/hyperglycemia | 5 +
.../src/test/resources/hypoglycemia | 5 +
.../client/socket/EndpointConnectionPool.java | 57 +-
.../nifi/remote/client/socket/SocketClient.java | 3 +-
.../protocol/socket/SocketClientProtocol.java | 8 +-
.../socket/SocketClientTransaction.java | 25 +-
nifi/nifi-commons/pom.xml | 1 +
.../nifi-framework/nifi-documentation/pom.xml | 8 -
.../html/HtmlDocumentationWriter.java | 15 +-
.../html/HtmlProcessorDocumentationWriter.java | 16 +-
.../html/HtmlDocumentationWriterTest.java | 8 +
.../repository/StandardRepositoryRecord.java | 15 +-
.../tasks/ContinuallyRunConnectableTask.java | 2 +-
.../nifi/remote/StandardRemoteGroupPort.java | 6 +-
.../nifi-geo-bundle/nifi-geo-nar/pom.xml | 33 +
.../nifi-geo-processors/.gitignore | 1 +
.../nifi-geo-bundle/nifi-geo-processors/pom.xml | 43 +
.../org/apache/nifi/processors/GeoEnrichIP.java | 210 +++++
.../nifi/processors/maxmind/DatabaseReader.java | 286 ++++++
.../org.apache.nifi.processor.Processor | 16 +
nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml | 42 +
.../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 36 +
.../nifi-hl7-processors/.gitignore | 1 +
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 120 +++
.../processors/hl7/ExtractHL7Attributes.java | 247 +++++
.../apache/nifi/processors/hl7/RouteHL7.java | 217 +++++
.../org.apache.nifi.processor.Processor | 16 +
.../hl7/TestExtractHL7Attributes.java | 48 +
.../src/test/resources/hypoglycemia.hl7 | 5 +
nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml | 33 +
.../nifi-language-translation-nar/pom.xml | 36 +
.../nifi-yandex-processors/.gitignore | 1 +
.../nifi-yandex-processors/pom.xml | 63 ++
.../nifi/processors/yandex/YandexTranslate.java | 333 +++++++
.../processors/yandex/model/Translation.java | 52 ++
.../nifi/processors/yandex/util/Languages.java | 86 ++
.../yandex/util/ObjectMapperResolver.java | 48 +
.../org.apache.nifi.processor.Processor | 16 +
.../processors/yandex/TestYandexTranslate.java | 226 +++++
.../nifi-language-translation-bundle/pom.xml | 48 +
.../nifi-social-media-nar/pom.xml | 36 +
.../nifi-twitter-processors/.gitignore | 1 +
.../nifi-twitter-processors/pom.xml | 60 ++
.../nifi/processors/twitter/GetTwitter.java | 360 ++++++++
.../org.apache.nifi.processor.Processor | 16 +
.../nifi-social-media-bundle/pom.xml | 33 +
nifi/nifi-nar-bundles/pom.xml | 4 +
nifi/pom.xml | 24 +
99 files changed, 6480 insertions(+), 488 deletions(-)
----------------------------------------------------------------------