Merge branch 'develop' into NIFI-25
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e8134870 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e8134870 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e8134870 Branch: refs/heads/NIFI-271 Commit: e8134870fda7b2b8eac4033b6c9217ae2839f04c Parents: 0211d0d 7aca8ea Author: Mark Payne <marka...@hotmail.com> Authored: Sat Apr 11 14:38:51 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Sat Apr 11 14:38:51 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/nifi/bootstrap/RunNiFi.java | 131 +++--------------- .../nifi-hl7-query-language/pom.xml | 10 ++ .../apache/nifi/hl7/query/antlr/HL7QueryLexer.g | 17 +++ .../nifi/hl7/query/antlr/HL7QueryParser.g | 17 +++ .../org/apache/nifi/hl7/query/TestHL7Query.java | 52 +------ .../src/test/resources/hyperglycemia | 8 +- .../src/test/resources/hypoglycemia | 8 +- .../src/test/resources/metabolic-panel | 23 ---- .../resources/unsolicited-vaccine-update-long | 16 --- .../resources/unsolicited-vaccine-update-short | 4 - .../src/test/resources/vaccine-query | 3 - .../src/test/resources/vaers-message-long | 60 --------- .../tasks/ContinuallyRunConnectableTask.java | 2 +- .../src/main/resources/conf/bootstrap.conf | 5 - .../src/main/webapp/WEB-INF/jsp/hexview.jsp | 2 +- .../src/main/webapp/css/main.css | 2 +- .../propertytable/jquery.propertytable.js | 78 +++++++---- .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 7 +- .../src/main/webapp/js/nf/canvas/nf-canvas.js | 8 +- .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 14 ++ .../hl7/TestExtractHL7Attributes.java | 2 +- .../src/test/resources/1.hl7 | 16 --- .../src/test/resources/hypoglycemia.hl7 | 10 +- .../nifi/processors/yandex/YandexTranslate.java | 32 +++-- .../processors/yandex/TestYandexTranslate.java | 135 +++++++++++++++---- .../src/main/webapp/js/application.js | 13 +- 26 files changed, 295 insertions(+), 380 deletions(-) ----------------------------------------------------------------------
