Merge branch 'NIFI-190' of https://github.com/gresockj/incubator-nifi into NIFI-190
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/8e1e355a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/8e1e355a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/8e1e355a Branch: refs/heads/NIFI-190 Commit: 8e1e355a76e640630bfc571bfce62a90f46f752f Parents: 761e64a 6a32ea1 Author: joewitt <[email protected]> Authored: Mon Mar 16 23:57:30 2015 -0400 Committer: joewitt <[email protected]> Committed: Mon Mar 16 23:57:30 2015 -0400 ---------------------------------------------------------------------- .../nifi/processors/standard/HoldFile.java | 285 +++++++++++++++++++ .../index.html | 158 ++++++++++ .../nifi/processors/standard/TestHoldFile.java | 155 ++++++++++ .../org.apache.nifi.processor.Processor | 1 + 4 files changed, 599 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8e1e355a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor ---------------------------------------------------------------------- diff --cc nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor index f81ccec,0000000..c6c9cf9 mode 100644,000000..100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor @@@ -1,66 -1,0 +1,67 @@@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +org.apache.nifi.processors.standard.Base64EncodeContent +org.apache.nifi.processors.standard.CompressContent +org.apache.nifi.processors.standard.ControlRate +org.apache.nifi.processors.standard.ConvertCharacterSet +org.apache.nifi.processors.standard.DetectDuplicate +org.apache.nifi.processors.standard.DistributeLoad +org.apache.nifi.processors.standard.EncryptContent +org.apache.nifi.processors.standard.EvaluateJsonPath +org.apache.nifi.processors.standard.EvaluateRegularExpression +org.apache.nifi.processors.standard.EvaluateXPath +org.apache.nifi.processors.standard.EvaluateXQuery +org.apache.nifi.processors.standard.ExecuteStreamCommand +org.apache.nifi.processors.standard.ExecuteProcess +org.apache.nifi.processors.standard.GenerateFlowFile +org.apache.nifi.processors.standard.GetFile +org.apache.nifi.processors.standard.GetFTP +org.apache.nifi.processors.standard.GetHTTP +org.apache.nifi.processors.standard.GetSFTP +org.apache.nifi.processors.standard.HandleHttpRequest +org.apache.nifi.processors.standard.HandleHttpResponse +org.apache.nifi.processors.standard.HashAttribute +org.apache.nifi.processors.standard.HashContent ++org.apache.nifi.processors.standard.HoldFile +org.apache.nifi.processors.standard.IdentifyMimeType +org.apache.nifi.processors.standard.InvokeHTTP +org.apache.nifi.processors.standard.GetJMSQueue +org.apache.nifi.processors.standard.GetJMSTopic +org.apache.nifi.processors.standard.ListenHTTP +org.apache.nifi.processors.standard.ListenUDP +org.apache.nifi.processors.standard.LogAttribute +org.apache.nifi.processors.standard.MergeContent +org.apache.nifi.processors.standard.ModifyBytes +org.apache.nifi.processors.standard.MonitorActivity +org.apache.nifi.processors.standard.PostHTTP +org.apache.nifi.processors.standard.PutEmail +org.apache.nifi.processors.standard.PutFile +org.apache.nifi.processors.standard.PutFTP +org.apache.nifi.processors.standard.PutJMS +org.apache.nifi.processors.standard.PutSFTP +org.apache.nifi.processors.standard.ReplaceText +org.apache.nifi.processors.standard.ReplaceTextWithMapping +org.apache.nifi.processors.standard.RouteOnAttribute +org.apache.nifi.processors.standard.RouteOnContent +org.apache.nifi.processors.standard.ScanAttribute +org.apache.nifi.processors.standard.ScanContent +org.apache.nifi.processors.standard.SegmentContent +org.apache.nifi.processors.standard.SplitContent +org.apache.nifi.processors.standard.SplitJson +org.apache.nifi.processors.standard.SplitText +org.apache.nifi.processors.standard.SplitXml +org.apache.nifi.processors.standard.TransformXml +org.apache.nifi.processors.standard.UnpackContent +org.apache.nifi.processors.standard.ValidateXml
