Merge branch 'develop' of http://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/93b361e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/93b361e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/93b361e6 Branch: refs/heads/develop Commit: 93b361e69bd046d6b2e0f561d8b2231a4505b6a9 Parents: c9eb237 a6740a6 Author: Mark Payne <[email protected]> Authored: Thu Mar 19 11:49:11 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Thu Mar 19 11:49:11 2015 -0400 ---------------------------------------------------------------------- .../nifi/processor/util/StandardValidators.java | 22 ++ .../processor/util/TestStandardValidators.java | 31 ++ .../standard/EvaluateRegularExpression.java | 7 +- .../nifi/processors/standard/ExtractText.java | 313 ++++++++++++++++++ .../org.apache.nifi.processor.Processor | 1 + .../standard/TestEvaluateRegularExpression.java | 319 ------------------- .../processors/standard/TestExtractText.java | 314 ++++++++++++++++++ 7 files changed, 685 insertions(+), 322 deletions(-) ----------------------------------------------------------------------
