You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/12/04 22:39:30 UTC
[3/3] nifi git commit: Merge branch 'NIFI-1249'
Merge branch 'NIFI-1249'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ee14d8f9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ee14d8f9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ee14d8f9
Branch: refs/heads/master
Commit: ee14d8f9dd0c3f18920d910fcddd6d79b8b9f9cf
Parents: 903f498 f378ee9
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Dec 4 16:38:49 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Dec 4 16:38:49 2015 -0500
----------------------------------------------------------------------
.../apache/nifi/components/PropertyValue.java | 99 ++++-
.../apache/nifi/processor/ProcessContext.java | 7 +
.../bootstrap/NotificationServiceManager.java | 5 +-
.../NotificationServicePropertyValue.java | 120 ------
.../NotificationValidationContext.java | 4 +-
nifi-commons/nifi-expression-language/pom.xml | 4 +
.../expression/language/EmptyPreparedQuery.java | 5 +
.../language/InvalidPreparedQuery.java | 4 +
.../expression/language/PreparedQuery.java | 1 +
.../attribute/expression/language/Query.java | 14 +-
.../language/StandardPreparedQuery.java | 6 +
.../language/StandardPropertyValue.java | 177 +++++++++
.../apache/nifi/util/MockProcessContext.java | 11 +
.../org/apache/nifi/util/MockPropertyValue.java | 71 ++--
.../nifi/util/StandardProcessorTestRunner.java | 12 +
.../java/org/apache/nifi/util/TestRunner.java | 19 +-
.../documentation/mock/MockProcessContext.java | 5 +-
.../manager/impl/ClusteredReportingContext.java | 2 +-
.../reporting/StandardReportingContext.java | 2 +-
.../scheduling/ConnectableProcessContext.java | 28 +-
.../service/StandardConfigurationContext.java | 2 +-
.../nifi/processor/StandardProcessContext.java | 12 +
.../nifi/processor/StandardPropertyValue.java | 157 --------
.../processor/StandardSchedulingContext.java | 13 +
.../processor/StandardValidationContext.java | 1 +
.../processor/TestStandardPropertyValue.java | 3 +-
.../web/controller/StandardSearchContext.java | 2 +-
.../nifi/processors/standard/ReplaceText.java | 380 ++++++++++++-------
.../processors/standard/TestReplaceText.java | 103 ++++-
.../TestReplaceTextLineByLine/Good.txt | 1 -
30 files changed, 801 insertions(+), 469 deletions(-)
----------------------------------------------------------------------