[45/50] [abbrv] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

2015-07-16 Thread mcgilman
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/3125036d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3125036d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3125036d

Branch: refs/heads/master
Commit: 3125036d3f463c97a10466d244952f10f0054b64
Parents: c0f1104 9fa03b4
Author: Mark Payne marka...@hotmail.com
Authored: Tue Jul 7 21:08:34 2015 -0400
Committer: Mark Payne marka...@hotmail.com
Committed: Tue Jul 7 21:08:34 2015 -0400

--
 nifi/nifi-external/nifi-storm-spout/pom.xml |  2 +-
 .../java/org/apache/nifi/storm/NiFiSpout.java   | 38 ++--
 .../ConfigurableComponentInitializer.java   |  9 -
 .../apache/nifi/documentation/DocGenerator.java |  2 ++
 .../init/ControllerServiceInitializer.java  | 11 --
 .../init/ProcessorInitializer.java  | 11 --
 .../init/ReportingTaskingInitializer.java   | 11 --
 .../html/HtmlDocumentationWriterTest.java   | 10 +++---
 .../html/ProcessorDocumentationWriterTest.java  |  7 ++--
 9 files changed, 82 insertions(+), 19 deletions(-)
--




[45/50] [abbrv] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

2015-04-19 Thread joewitt
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/3667a28e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3667a28e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3667a28e

Branch: refs/heads/NIFI-271
Commit: 3667a28e87224a02ae2a7a5a29e36543c242f5be
Parents: 509933f ce5a654
Author: Mark Payne marka...@hotmail.com
Authored: Fri Apr 17 12:06:52 2015 -0400
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Apr 17 12:06:52 2015 -0400

--
 .../nifi/annotation/lifecycle/OnAdded.java  |   13 +-
 .../nifi/annotation/lifecycle/OnDisabled.java   |   29 +-
 .../nifi/annotation/lifecycle/OnEnabled.java|   34 +-
 .../nifi/annotation/lifecycle/OnRemoved.java|   14 +-
 .../nifi/annotation/lifecycle/OnShutdown.java   |   13 +-
 .../nifi/annotation/lifecycle/OnStopped.java|9 +
 .../annotation/lifecycle/OnUnscheduled.java |2 -
 .../nifi/components/PropertyDescriptor.java |   14 +-
 .../nifi/components/ValidationContext.java  |9 +
 .../controller/AbstractControllerService.java   |   13 +-
 .../ControllerServiceInitializationContext.java |   10 +
 .../controller/ControllerServiceLookup.java |   19 +
 .../org/apache/nifi/logging/ComponentLog.java   |  100 +
 .../org/apache/nifi/logging/ProcessorLog.java   |   61 +-
 .../nifi/reporting/AbstractReportingTask.java   |   10 +
 .../ReportingInitializationContext.java |   10 +
 .../nifi/web/ClusterRequestException.java   |1 +
 .../org/apache/nifi/web/ComponentDetails.java   |  157 ++
 .../apache/nifi/web/ConfigurationAction.java|  137 ++
 .../nifi/web/NiFiWebConfigurationContext.java   |  102 +
 .../web/NiFiWebConfigurationRequestContext.java |   31 +
 .../org/apache/nifi/web/NiFiWebContext.java |1 +
 .../apache/nifi/web/NiFiWebContextConfig.java   |1 +
 .../apache/nifi/web/NiFiWebRequestContext.java  |   58 +
 .../nifi/web/ProcessorConfigurationAction.java  |1 +
 .../java/org/apache/nifi/web/ProcessorInfo.java |1 +
 .../main/java/org/apache/nifi/web/Revision.java |   32 +-
 .../org/apache/nifi/web/UiExtensionType.java|   31 +
 nifi/nifi-assembly/NOTICE   |   65 +
 nifi/nifi-assembly/pom.xml  |  927 +-
 .../nifi-hl7-query-language/.gitignore  |3 +
 .../nifi-hl7-query-language/pom.xml |  122 ++
 .../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 +