[21/29] incubator-nifi git commit: Removing unnessecary local variable
Removing unnessecary local variable
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1a746212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1a746212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1a746212
Branch: refs/heads/NIFI-360
Commit: 1a746212bf2e13680d71dd12dfb60df3a20784ab
Parents: 7a74dd9
Author: Aldrin Piri aldrinp...@gmail.com
Authored: Tue Feb 17 16:04:21 2015 -0500
Committer: Aldrin Piri aldrinp...@gmail.com
Committed: Tue Feb 17 16:04:21 2015 -0500
--
.../org/apache/nifi/processors/standard/util/JsonUtils.java| 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1a746212/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonUtils.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonUtils.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonUtils.java
index 5fe2a56..efe89ab 100644
---
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonUtils.java
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonUtils.java
@@ -104,13 +104,9 @@ public class JsonUtils {
* @throws IOException
*/
public static boolean isValidJson(InputStream inputStream) throws
IOException {
-boolean isValid = false;
-
try (InputStreamReader inputStreamReader = new
InputStreamReader(inputStream)) {
-isValid = JSONValue.isValidJsonStrict(inputStreamReader);
+return JSONValue.isValidJsonStrict(inputStreamReader);
}
-
-return isValid;
}
/**
[04/29] incubator-nifi git commit: Adding EvaluateJsonPath to the Processor services file
Adding EvaluateJsonPath to the Processor services file Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e75213ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e75213ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e75213ee Branch: refs/heads/NIFI-360 Commit: e75213eead936baa7046d9c9ba5b86a4508f532a Parents: ec669e5 Author: Aldrin Piri aldrinp...@gmail.com Authored: Sat Feb 14 13:35:53 2015 -0500 Committer: Aldrin Piri aldrinp...@gmail.com Committed: Sat Feb 14 13:35:53 2015 -0500 -- .../resources/META-INF/services/org.apache.nifi.processor.Processor | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e75213ee/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor -- diff --git 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 index 66c9697..8a1fd74 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 @@ -19,6 +19,7 @@ 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
[23/29] incubator-nifi git commit: Adding license terms for asm dependency introduced via JsonPath - Json-Smart
Adding license terms for asm dependency introduced via JsonPath - Json-Smart Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a058fd04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a058fd04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a058fd04 Branch: refs/heads/NIFI-360 Commit: a058fd0460dd5ca91560b1239dd733da37cfa782 Parents: 627bd91 Author: Aldrin Piri aldrinp...@gmail.com Authored: Tue Feb 17 16:58:04 2015 -0500 Committer: Aldrin Piri aldrinp...@gmail.com Committed: Tue Feb 17 16:58:04 2015 -0500 -- nifi/LICENSE | 28 1 file changed, 28 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a058fd04/nifi/LICENSE -- diff --git a/nifi/LICENSE b/nifi/LICENSE index 2e67c09..4d8be01 100644 --- a/nifi/LICENSE +++ b/nifi/LICENSE @@ -455,4 +455,32 @@ This product bundles 'json2.js' which is available in the 'public domain'. This product bundles 'reset.css' which is available in the 'public domain'. For details see http://meyerweb.com/eric/tools/css/reset/ +This product bundles 'asm' which is available under an MIT style license. +For details see http://asm.ow2.org/asmdex-license.html +Copyright (c) 2012 France Télécom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file
[03/29] incubator-nifi git commit: Stubbing out validator, setting up relationships and properties.
Stubbing out validator, setting up relationships and properties.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ec669e5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ec669e5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ec669e5b
Branch: refs/heads/NIFI-360
Commit: ec669e5b42e58335ab511dfa8dfd52bd0848f088
Parents: 5f03fb1
Author: Aldrin Piri aldrinp...@gmail.com
Authored: Sat Feb 14 13:26:08 2015 -0500
Committer: Aldrin Piri aldrinp...@gmail.com
Committed: Sat Feb 14 13:26:08 2015 -0500
--
.../processors/standard/EvaluateJSONPath.java | 95 +---
1 file changed, 85 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ec669e5b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJSONPath.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJSONPath.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJSONPath.java
index 9ad3e49..349e623 100644
---
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJSONPath.java
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJSONPath.java
@@ -22,38 +22,113 @@ import
org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.Validator;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.processor.*;
import org.apache.nifi.processor.exception.ProcessException;
+import java.util.*;
+
@EventDriven
@SideEffectFree
@SupportsBatching
-@Tags({JSON, evaluate, JSONPath})
+@Tags({JSON, evaluate, JsonPath})
@CapabilityDescription()
-public class EvaluateJSONPath extends AbstractProcessor {
+public class EvaluateJsonPath extends AbstractProcessor {
public static final String DESTINATION_ATTRIBUTE = flowfile-attribute;
public static final String DESTINATION_CONTENT = flowfile-content;
public static final PropertyDescriptor DESTINATION = new
PropertyDescriptor.Builder()
.name(Destination)
-.description(Indicates whether the results of the JSONPath
evaluation are written to the FlowFile content or a FlowFile attribute; if
using attribute, must specify the Attribute Name property. If set to
flowfile-content, only one JSONPath may be specified, and the property name is
ignored.)
+.description(Indicates whether the results of the JsonPath
evaluation are written to the FlowFile content or a FlowFile attribute; if
using attribute, must specify the Attribute Name property. If set to
flowfile-content, only one JsonPath may be specified, and the property name is
ignored.)
.required(true)
.allowableValues(DESTINATION_CONTENT, DESTINATION_ATTRIBUTE)
.defaultValue(DESTINATION_CONTENT)
.build();
-public static final Relationship REL_MATCH = new
Relationship.Builder().name(matched).description(FlowFiles are routed to
this relationship when the JSONPath is successfully evaluated and the FlowFile
is modified as a result).build();
-public static final Relationship REL_NO_MATCH = new
Relationship.Builder().name(unmatched).description(FlowFiles are routed to
this relationship when the JSONPath does not match the content of the FlowFile
and the Destination is set to flowfile-content).build();
-public static final Relationship REL_FAILURE = new
Relationship.Builder().name(failure).description(FlowFiles are routed to
this relationship when the JSONPath cannot be evaluated against the content of
the FlowFile; for instance, if the FlowFile is not valid JSON).build();
+public static final Relationship REL_MATCH = new
Relationship.Builder().name(matched).description(FlowFiles are routed to
this relationship when the JsonPath is successfully evaluated and the FlowFile
is modified as a result).build();
+public static final Relationship
[13/29] incubator-nifi git commit: Adding tests for indefinite results with and without the usage of operators.
Adding tests for indefinite results with and without the usage of operators.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/7e581307
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/7e581307
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/7e581307
Branch: refs/heads/NIFI-360
Commit: 7e581307b7d65da79464914b09fe8a90dd5046e9
Parents: 6897090
Author: Aldrin Piri aldrinp...@gmail.com
Authored: Mon Feb 16 18:33:48 2015 -0500
Committer: Aldrin Piri aldrinp...@gmail.com
Committed: Mon Feb 16 18:33:48 2015 -0500
--
.../standard/TestEvaluateJsonPath.java | 35
1 file changed, 35 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7e581307/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
index fc125c2..bece3da 100644
---
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
@@ -177,4 +177,39 @@ public class TestEvaluateJsonPath {
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals(54df94072d5dbf7dc6340cc5);
}
+
+
+@Test
+public void testExtractPath_destinationAttribute_indefiniteResult() throws
Exception {
+String jsonPathAttrKey = friends.indefinite.id.list;
+
+final TestRunner testRunner = TestRunners.newTestRunner(new
EvaluateJsonPath());
+testRunner.setProperty(EvaluateJsonPath.DESTINATION,
EvaluateJsonPath.DESTINATION_CONTENT);
+testRunner.setProperty(jsonPathAttrKey, $[0].friends.[*].id);
+
+testRunner.enqueue(JSON_SNIPPET);
+testRunner.run();
+
+Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
+
+testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
+
testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals([0,1,2]);
+}
+
+@Test
+public void
testExtractPath_destinationAttribute_indefiniteResult_operators() throws
Exception {
+String jsonPathAttrKey = friends.indefinite.id.list;
+
+final TestRunner testRunner = TestRunners.newTestRunner(new
EvaluateJsonPath());
+testRunner.setProperty(EvaluateJsonPath.DESTINATION,
EvaluateJsonPath.DESTINATION_CONTENT);
+testRunner.setProperty(jsonPathAttrKey, $[0].friends[?(@.id
3)].id);
+
+testRunner.enqueue(JSON_SNIPPET);
+testRunner.run();
+
+Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
+
+testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
+
testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals([0,1,2]);
+}
}
[22/29] incubator-nifi git commit: Adding an auto return type for EvaluateJsonPath to match the semantics of the EvaluateXPath processor.
Adding an auto return type for EvaluateJsonPath to match the semantics of the
EvaluateXPath processor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/627bd91f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/627bd91f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/627bd91f
Branch: refs/heads/NIFI-360
Commit: 627bd91fa719748b850b6c610a89b44be3e6f35e
Parents: 1a74621
Author: Aldrin Piri aldrinp...@gmail.com
Authored: Tue Feb 17 16:15:33 2015 -0500
Committer: Aldrin Piri aldrinp...@gmail.com
Committed: Tue Feb 17 16:15:33 2015 -0500
--
.../apache/nifi/processors/standard/EvaluateJsonPath.java | 10 +++---
.../nifi/processors/standard/TestEvaluateJsonPath.java| 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/627bd91f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
index 8cdf1a2..093454d 100644
---
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
@@ -61,6 +61,7 @@ public class EvaluateJsonPath extends AbstractProcessor {
public static final String DESTINATION_ATTRIBUTE = flowfile-attribute;
public static final String DESTINATION_CONTENT = flowfile-content;
+public static final String RETURN_TYPE_AUTO = auto-detect;
public static final String RETURN_TYPE_JSON = json;
public static final String RETURN_TYPE_SCALAR = scalar;
@@ -76,8 +77,8 @@ public class EvaluateJsonPath extends AbstractProcessor {
.name(Return Type)
.description(Indicates the desired return type of the JSON Path
expressions. Selecting 'auto-detect' will set the return type to 'json' for a
Destination of 'flowfile-content', and 'string' for a Destination of
'flowfile-attribute'.)
.required(true)
-.allowableValues(RETURN_TYPE_JSON, RETURN_TYPE_SCALAR)
-.defaultValue(RETURN_TYPE_JSON)
+.allowableValues(RETURN_TYPE_AUTO, RETURN_TYPE_JSON,
RETURN_TYPE_SCALAR)
+.defaultValue(RETURN_TYPE_AUTO)
.build();
public static final Relationship REL_MATCH = new
Relationship.Builder().name(matched).description(FlowFiles are routed to
this relationship when the JsonPath is successfully evaluated and the FlowFile
is modified as a result).build();
@@ -168,7 +169,10 @@ public class EvaluateJsonPath extends AbstractProcessor {
}
final String destination =
processContext.getProperty(DESTINATION).getValue();
-final String returnType =
processContext.getProperty(RETURN_TYPE).getValue();
+String returnType = processContext.getProperty(RETURN_TYPE).getValue();
+if (returnType.equals(RETURN_TYPE_AUTO)) {
+returnType = destination.equals(DESTINATION_CONTENT) ?
RETURN_TYPE_JSON : RETURN_TYPE_SCALAR;
+}
flowFileLoop:
for (FlowFile flowFile : flowFiles) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/627bd91f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
index b7b5103..c5ff814 100644
---
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
@@ -100,6 +100,7 @@ public class TestEvaluateJsonPath {
public void testExtractPath_destinationAttributes_twoPaths() throws
Exception {
final TestRunner testRunner = TestRunners.newTestRunner(new
EvaluateJsonPath());
[12/29] incubator-nifi git commit: Adding a test for a destination of attributes and only one JsonPath expression evaluates to a found result.
Adding a test for a destination of attributes and only one JsonPath expression
evaluates to a found result.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/68970907
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/68970907
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/68970907
Branch: refs/heads/NIFI-360
Commit: 6897090771434fc1553b722b835c3b67e8dd14a9
Parents: d4a94c3
Author: Aldrin Piri aldrinp...@gmail.com
Authored: Mon Feb 16 18:26:35 2015 -0500
Committer: Aldrin Piri aldrinp...@gmail.com
Committed: Mon Feb 16 18:26:35 2015 -0500
--
.../standard/TestEvaluateJsonPath.java | 22
1 file changed, 22 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/68970907/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
index 6a1fbad..fc125c2 100644
---
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
@@ -140,6 +140,28 @@ public class TestEvaluateJsonPath {
}
@Test
+public void testExtractPath_destinationAttributes_twoPaths_oneFound()
throws Exception {
+final TestRunner testRunner = TestRunners.newTestRunner(new
EvaluateJsonPath());
+testRunner.setProperty(EvaluateJsonPath.DESTINATION,
EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+
+String jsonPathIdAttrKey = evaluatejson.id;
+String jsonPathNameAttrKey = evaluatejson.name;
+
+testRunner.setProperty(jsonPathIdAttrKey, $[0]._id);
+testRunner.setProperty(jsonPathNameAttrKey, $[0].name.nonexistent);
+
+testRunner.enqueue(JSON_SNIPPET);
+testRunner.run();
+
+Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
+
+testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
+final MockFlowFile out =
testRunner.getFlowFilesForRelationship(expectedRel).get(0);
+Assert.assertEquals(Transferred flow file did not have the correct
result for id attribute, 54df94072d5dbf7dc6340cc5,
out.getAttribute(jsonPathIdAttrKey));
+Assert.assertEquals(Transferred flow file did not have the correct
result for name attribute, , out.getAttribute(jsonPathNameAttrKey));
+}
+
+@Test
public void testExtractPath_destinationContent() throws Exception {
String jsonPathAttrKey = JsonPath;
[02/29] incubator-nifi git commit: Creating stub for an EvaluateJSONPath processor and providing configuration akin to EvaluateXPath
Creating stub for an EvaluateJSONPath processor and providing configuration
akin to EvaluateXPath
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/5f03fb11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5f03fb11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5f03fb11
Branch: refs/heads/NIFI-360
Commit: 5f03fb11d93791ea9cdde43ffb97bceaf22c0143
Parents: 446fc2e
Author: Aldrin Piri aldrinp...@gmail.com
Authored: Sat Feb 14 12:56:19 2015 -0500
Committer: Aldrin Piri aldrinp...@gmail.com
Committed: Sat Feb 14 12:56:19 2015 -0500
--
.../processors/standard/EvaluateJSONPath.java | 59
1 file changed, 59 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f03fb11/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJSONPath.java
--
diff --git
a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJSONPath.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJSONPath.java
new file mode 100644
index 000..9ad3e49
--- /dev/null
+++
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJSONPath.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+package org.apache.nifi.processors.standard;
+
+import org.apache.nifi.annotation.behavior.EventDriven;
+import org.apache.nifi.annotation.behavior.SideEffectFree;
+import org.apache.nifi.annotation.behavior.SupportsBatching;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
+
+@EventDriven
+@SideEffectFree
+@SupportsBatching
+@Tags({JSON, evaluate, JSONPath})
+@CapabilityDescription()
+public class EvaluateJSONPath extends AbstractProcessor {
+
+public static final String DESTINATION_ATTRIBUTE = flowfile-attribute;
+public static final String DESTINATION_CONTENT = flowfile-content;
+
+public static final PropertyDescriptor DESTINATION = new
PropertyDescriptor.Builder()
+.name(Destination)
+.description(Indicates whether the results of the JSONPath
evaluation are written to the FlowFile content or a FlowFile attribute; if
using attribute, must specify the Attribute Name property. If set to
flowfile-content, only one JSONPath may be specified, and the property name is
ignored.)
+.required(true)
+.allowableValues(DESTINATION_CONTENT, DESTINATION_ATTRIBUTE)
+.defaultValue(DESTINATION_CONTENT)
+.build();
+
+public static final Relationship REL_MATCH = new
Relationship.Builder().name(matched).description(FlowFiles are routed to
this relationship when the JSONPath is successfully evaluated and the FlowFile
is modified as a result).build();
+public static final Relationship REL_NO_MATCH = new
Relationship.Builder().name(unmatched).description(FlowFiles are routed to
this relationship when the JSONPath does not match the content of the FlowFile
and the Destination is set to flowfile-content).build();
+public static final Relationship REL_FAILURE = new
Relationship.Builder().name(failure).description(FlowFiles are routed to
this relationship when the JSONPath cannot be evaluated against the content of
the FlowFile; for instance, if the FlowFile is not valid JSON).build();
+
+
+@Override
+public void onTrigger(ProcessContext
[1/3] incubator-nifi git commit: NIFI-355 removed all extraneous version references
Repository: incubator-nifi Updated Branches: refs/heads/develop b8ade5b12 - dde5fd51a NIFI-355 removed all extraneous version references Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fa5a4f26 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fa5a4f26 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fa5a4f26 Branch: refs/heads/develop Commit: fa5a4f26cef8da876a9555becade0a5a20d1506e Parents: b8ade5b Author: joewitt joew...@apache.org Authored: Mon Feb 16 23:55:36 2015 -0500 Committer: joewitt joew...@apache.org Committed: Mon Feb 16 23:55:36 2015 -0500 -- nifi/nifi-api/pom.xml | 1 - nifi/nifi-assembly/pom.xml| 1 - nifi/nifi-commons/nifi-data-provenance-utils/pom.xml | 1 - nifi/nifi-commons/nifi-expression-language/pom.xml| 1 - nifi/nifi-commons/nifi-flowfile-packager/pom.xml | 1 - nifi/nifi-commons/nifi-logging-utils/pom.xml | 1 - nifi/nifi-commons/nifi-processor-utilities/pom.xml| 1 - nifi/nifi-commons/nifi-properties/pom.xml | 1 - nifi/nifi-commons/nifi-security-utils/pom.xml | 1 - nifi/nifi-commons/nifi-socket-utils/pom.xml | 1 - nifi/nifi-commons/nifi-web-utils/pom.xml | 1 - nifi/nifi-commons/nifi-write-ahead-log/pom.xml| 1 - nifi/nifi-mock/pom.xml| 1 - .../nifi-framework-bundle/nifi-framework-nar/pom.xml | 1 - .../nifi-framework/nifi-administration/pom.xml| 1 - .../nifi-framework/nifi-cluster-protocol/pom.xml | 1 - .../nifi-framework/nifi-file-authorization-provider/pom.xml | 1 - .../nifi-framework/nifi-framework-core-api/pom.xml| 1 - .../nifi-framework-bundle/nifi-framework/nifi-security/pom.xml| 1 - .../nifi-framework/nifi-site-to-site/pom.xml | 1 - .../nifi-framework/nifi-user-actions/pom.xml | 1 - .../nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml | 1 - nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml | 1 - nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 1 - nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 1 - .../nifi-hadoop-libraries-nar/pom.xml | 1 - nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml| 1 - nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 -- nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml| 1 - nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml| 1 - nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml | 1 - .../nifi-standard-bundle/nifi-standard-nar/pom.xml| 1 - nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml| 1 - .../nifi-distributed-cache-services-nar/pom.xml | 1 - .../nifi-distributed-cache-services-bundle/pom.xml| 1 - .../nifi-load-distribution-service-api/pom.xml| 1 - .../nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml | 1 - .../nifi-standard-services/nifi-ssl-context-bundle/pom.xml| 1 - .../nifi-standard-services/nifi-standard-services-api-nar/pom.xml | 1 - nifi/nifi-nar-bundles/nifi-standard-services/pom.xml | 1 - .../nifi-update-attribute-nar/pom.xml | 2 -- nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml| 3 --- nifi/nifi-nar-bundles/pom.xml | 3 --- 44 files changed, 1 insertion(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-api/pom.xml -- diff --git a/nifi/nifi-api/pom.xml b/nifi/nifi-api/pom.xml index 7789ac4..ec746a5 100644 --- a/nifi/nifi-api/pom.xml +++ b/nifi/nifi-api/pom.xml @@ -21,6 +21,5 @@ version0.0.2-incubating-SNAPSHOT/version /parent artifactIdnifi-api/artifactId -version0.0.2-incubating-SNAPSHOT/version packagingjar/packaging /project http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-assembly/pom.xml -- diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml index 617ca75..8d16d5e 100644 --- a/nifi/nifi-assembly/pom.xml +++ b/nifi/nifi-assembly/pom.xml @@ -21,7 +21,6 @@ version0.0.2-incubating
[3/3] incubator-nifi git commit: Merge branch 'NIFI-356' of https://github.com/apiri/incubator-nifi into develop
Merge branch 'NIFI-356' of https://github.com/apiri/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/dde5fd51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/dde5fd51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/dde5fd51 Branch: refs/heads/develop Commit: dde5fd51a406862331c0fecc13fb1dde8d712fbe Parents: fa5a4f2 24be4a1 Author: joewitt joew...@apache.org Authored: Tue Feb 17 00:24:58 2015 -0500 Committer: joewitt joew...@apache.org Committed: Tue Feb 17 00:24:58 2015 -0500 -- .../java/org/apache/nifi/processors/standard/EvaluateXPath.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
incubator-nifi git commit: NIFI-162
Repository: incubator-nifi Updated Branches: refs/heads/develop 851fe298b - b37d8fb73 NIFI-162 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b37d8fb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b37d8fb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b37d8fb7 Branch: refs/heads/develop Commit: b37d8fb73302933e33db106637498579aa775b47 Parents: 851fe29 Author: joewitt joew...@apache.org Authored: Thu Feb 12 21:46:55 2015 -0500 Committer: joewitt joew...@apache.org Committed: Thu Feb 12 21:46:55 2015 -0500 -- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b37d8fb7/README.md -- diff --git a/README.md b/README.md index 3851761..b2b054a 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ -- # Apache NiFi -Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently part of the Apache Incubator. +Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data. It is currently apart of the Apache Incubator. ## Table of Contents
svn commit: r1658745 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Tue Feb 10 16:07:48 2015 New Revision: 1658745 URL: http://svn.apache.org/r1658745 Log: fixed 'written by lawyers' Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1658745r1=1658744r2=1658745view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Tue Feb 10 16:07:48 2015 @@ -22,7 +22,7 @@ This document provides guidance to contr Disclaimer: -This document is not written lawyers. The guidance in this document is meant to compliment Apache Incubator and Apache Software Foundation guides and policies. If anything in this document is inconsistent with those then it is a defect in this document. +This document is not written by lawyers. The guidance in this document is meant to compliment Apache Incubator and Apache Software Foundation guides and policies. If anything in this document is inconsistent with those then it is a defect in this document. ## Background Material
incubator-nifi git commit: closes #8 as it is no longer needed - adjusted the description
Repository: incubator-nifi Updated Branches: refs/heads/develop dfaac5b57 - e7a0d0032 closes #8 as it is no longer needed - adjusted the description Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e7a0d003 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e7a0d003 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e7a0d003 Branch: refs/heads/develop Commit: e7a0d00322c03feb59ab8c819f1b57ea31d6e4f8 Parents: dfaac5b Author: joewitt joew...@apache.org Authored: Sun Feb 8 13:37:52 2015 -0500 Committer: joewitt joew...@apache.org Committed: Sun Feb 8 13:37:52 2015 -0500 -- nifi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e7a0d003/nifi/pom.xml -- diff --git a/nifi/pom.xml b/nifi/pom.xml index e8c5cf6..32291b1 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -25,7 +25,7 @@ artifactIdnifi/artifactId version0.0.2-incubating-SNAPSHOT/version packagingpom/packaging -descriptionApache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator./description +descriptionApache NiFi(incubating) is an easy to use, powerful, and reliable system to process and distribute data./description urlhttp://nifi.incubator.apache.org/url organization nameApache NiFi Project/name
incubator-nifi git commit: closes #9 as this was taken care of already in 0.0.1
Repository: incubator-nifi Updated Branches: refs/heads/develop e7a0d0032 - f66545145 closes #9 as this was taken care of already in 0.0.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f6654514 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f6654514 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f6654514 Branch: refs/heads/develop Commit: f6654514523cc303dee511534f872bb64e74fd09 Parents: e7a0d00 Author: joewitt joew...@apache.org Authored: Sun Feb 8 13:39:52 2015 -0500 Committer: joewitt joew...@apache.org Committed: Sun Feb 8 13:39:52 2015 -0500 -- nifi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6654514/nifi/pom.xml -- diff --git a/nifi/pom.xml b/nifi/pom.xml index 32291b1..8539ae9 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -28,7 +28,7 @@ descriptionApache NiFi(incubating) is an easy to use, powerful, and reliable system to process and distribute data./description urlhttp://nifi.incubator.apache.org/url organization -nameApache NiFi Project/name +nameApache NiFi(incubating) Project/name urlhttp://nifi.incubator.apache.org//url /organization licenses
svn commit: r1658218 - /incubator/nifi/site/trunk/templates/nav.html
Author: joewitt Date: Sun Feb 8 17:07:01 2015 New Revision: 1658218 URL: http://svn.apache.org/r1658218 Log: removed roadmap - no substance Modified: incubator/nifi/site/trunk/templates/nav.html Modified: incubator/nifi/site/trunk/templates/nav.html URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/templates/nav.html?rev=1658218r1=1658217r2=1658218view=diff == --- incubator/nifi/site/trunk/templates/nav.html (original) +++ incubator/nifi/site/trunk/templates/nav.html Sun Feb 8 17:07:01 2015 @@ -16,7 +16,6 @@ ul class=dropdown-menu role=menu lia href=/index.htmlHome/a/li lia href=https://blogs.apache.org/nifi/;Apache NiFi Blog/a/li -lia href=/docs/roadmap.htmlRoadmap/a/li lia href=http://www.apache.org/licenses/LICENSE-2.0;span class=glyphicon glyphicon-link aria-hidden=true/span License/a/li /ul /li
svn commit: r939454 - /websites/production/nifi/content/
Author: joewitt Date: Sun Feb 8 17:07:23 2015 New Revision: 939454 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r939453, websites/staging/nifi/trunk/content/
svn commit: r1658091 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Sat Feb 7 18:24:15 2015 New Revision: 1658091 URL: http://svn.apache.org/r1658091 Log: formatting/wording fixes Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1658091r1=1658090r2=1658091view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Sat Feb 7 18:24:15 2015 @@ -53,25 +53,25 @@ Answer: Taken directly from http://incub ### Apply the proper NOTICE / LICENSE Information -Every source file or dependency pulled into or removed from a release bundle (source or binary) for 3rd party works must -be accounted for as necessary in the LICENSE/NOTICE. This guidance should kick in anytime you wish to commit new source -materials or you wish to modify the dependencies of a given artifact. The only official release product of Apache NiFi -is the source-release. And its LICENSE and NOTICE must be full and complete for all items included in the actual source -release (ie it should not include license/notice information for binary dependencies). We do, however, want to provide -convenience binary packages as well (tar.gz, zip). In so doing those packages must also have a LICENSE/NOTICE file that -is complete and correct and in that case it must include all necessary additional items for bundled binary dependencies. +For every addition or removal of a 3rd party work as a dependency or as pulled into our source directly we must ensure full +accounting of the correct LICENSE and NOTICE information. + +Our source release must only account for the LICENSE/NOTICE of items that are actually in the source release itself. +Binary dependencies which are pulled in during the generation of a binary convenience package should not have their +LICENSE/NOTICE data in the source release. But, they must be accounted for in the binary package. The LICENSE and NOTICE files found at the root of the Apache NiFi (nifi) component is considered 'The' LICENSE/NOTICE covering the source release of 'nifi' and all subcomponents. The LICENSE and NOTICE files found within the 'nifi-assembly' is considered 'The' LICENSE/NOTICE pair covering the binary -convenience package of 'nifi'. +convenience package of 'nifi' (tar.gz, ZIP, etc..) The Release Manager (RM) of a given release is responsible for checking all subcomponents for the presence of specific -LICENSE/NOTICE to gather all source dependency clauses as needed and place them into the over LICENSE/NOTICE for a source - release. In addition, the RM will gather up a listing of all binary dependencies as called out on subcomponents -(including the assembly itself), which can contain binary dependencies, and promoting their specific NOTICE/LICENSE text - to the binary package LICENSE/NOTICE associated with the assembly. +LICENSE/NOTICE to gather all source dependency clauses as needed and place them into the overall LICENSE/NOTICE for the +source release. If generating a binary convenience package the RM will gather up a listing of all binary dependencies +as called out on subcomponents (including the assembly itself), which can contain binary dependencies, and promote +their specific NOTICE/LICENSE text to the binary package LICENSE/NOTICE associated with the assembly. The binary package +LICENSE/NOTICE then should be a combination of source license data and binary license data. A binary artifact is any artifact which is created as the result of compiling or processing a source artifact. @@ -79,73 +79,52 @@ For every subcomponent of nifi some bina In the case of subcomponents which produce binary artifacts which stand on their own (as would be typical in most Jar files) then you must only account for any 3rd party works source dependencies. If you have any 3rd party works source -dependencies then you should create or edit the LICENSE and/or NOTICE local to that subcomponent. When you modify the -NOTICE and/or LICENSE remember to carry that up to the nifi source and assembly LICENSE/NOTICE files. +dependencies then you should create or edit the LICENSE and/or NOTICE local to that subcomponent AND modify the +NOTICE and/or LICENSE of the top level nifi source. In the case of subcomponents which produce binary artifacts which themselves can bunde 3rd party works (as would be -typical in a NAR, WAR, tar.gz, zip bundle) then you must ensure that the subcomponent artifact itself includes a full - and complete LICENSE and/or NOTICE as needed to cover those 3rd party works. For every modification to the subcomponents - LICENSE/NOTICE for a given 3rd party work
svn commit: r1658092 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Sat Feb 7 18:24:45 2015 New Revision: 1658092 URL: http://svn.apache.org/r1658092 Log: formatting/wording fixes Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1658092r1=1658091r2=1658092view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Sat Feb 7 18:24:45 2015 @@ -123,7 +123,7 @@ Specific guidance for handling other ASF It is not necessary to duplicate the line This product includes software developed at the Apache Software Foundation..., though the ASF copyright line and any other portions of NOTICE must be considered for propagation. -Specific guidance for handling LICENSE/NOTICE information for category-B licensed works is [her](http://apache.org/legal/resolved.html#category-b). +Specific guidance for handling LICENSE/NOTICE information for category-B licensed works is [here](http://apache.org/legal/resolved.html#category-b). Place an entry in the notice indicating the work is included in binary distribution. Provide a link to the homepage of the work. Indicate it's license. Group like licensed items together. By attaching a prominent label to the distribution and requiring an explicit action by the user to get the reciprocally-licensed source, users are less
svn commit: r1658094 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Sat Feb 7 18:26:46 2015 New Revision: 1658094 URL: http://svn.apache.org/r1658094 Log: CMS commit to nifi by joewitt Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1658094r1=1658093r2=1658094view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Sat Feb 7 18:26:46 2015 @@ -33,10 +33,9 @@ This document is not written lawyers. T - [ASF Release Policy](http://www.apache.org/dev/release.html) - [ASF Incubator License and Notice Guidance](http://incubator.apache.org/guides/releasemanagement.html#note-license-and-notice) - Mailing-Lists - - - d...@nifi.iao - - general@iao - - legal-discuss@ao + - d...@nifi.iao + - general@iao + - legal-discuss@ao ## How to consistently apply licensing/legal notice information for Apache NiFi
svn commit: r1658093 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Sat Feb 7 18:26:11 2015 New Revision: 1658093 URL: http://svn.apache.org/r1658093 Log: CMS commit to nifi by joewitt Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1658093r1=1658092r2=1658093view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Sat Feb 7 18:26:11 2015 @@ -33,6 +33,7 @@ This document is not written lawyers. T - [ASF Release Policy](http://www.apache.org/dev/release.html) - [ASF Incubator License and Notice Guidance](http://incubator.apache.org/guides/releasemanagement.html#note-license-and-notice) - Mailing-Lists + - d...@nifi.iao - general@iao - legal-discuss@ao
svn commit: r939373 - /websites/production/nifi/content/
Author: joewitt Date: Sat Feb 7 18:28:27 2015 New Revision: 939373 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r939372, websites/staging/nifi/trunk/content/
svn commit: r1658095 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Sat Feb 7 18:27:50 2015 New Revision: 1658095 URL: http://svn.apache.org/r1658095 Log: CMS commit to nifi by joewitt Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1658095r1=1658094r2=1658095view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Sat Feb 7 18:27:50 2015 @@ -32,10 +32,6 @@ This document is not written lawyers. T - [ASF Legal Resolved](http://www.apache.org/legal/resolved.html) - [ASF Release Policy](http://www.apache.org/dev/release.html) - [ASF Incubator License and Notice Guidance](http://incubator.apache.org/guides/releasemanagement.html#note-license-and-notice) -- Mailing-Lists - - d...@nifi.iao - - general@iao - - legal-discuss@ao ## How to consistently apply licensing/legal notice information for Apache NiFi
svn commit: r1658084 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Sat Feb 7 17:35:10 2015 New Revision: 1658084 URL: http://svn.apache.org/r1658084 Log: formatting fixes Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1658084r1=1658083r2=1658084view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Sat Feb 7 17:35:10 2015 @@ -19,8 +19,10 @@ Notice:Licensed to the Apache Softwa # img alt=NiFi logo style=float: right src=/images/niFi-logo-horizontal.png / Apache NiFi Licensing Guide This document provides guidance to contributors of Apache NiFi (incubating) to help properly account for licensing, notice, and legal requirements. - -The guidance in this document is meant to compliment Apache Incubator and Apache Software Foundation guides and policies. If anything in this document is inconsistent with those then it is a defect in this document. + + Disclaimer: + +This document is not written lawyers. The guidance in this document is meant to compliment Apache Incubator and Apache Software Foundation guides and policies. If anything in this document is inconsistent with those then it is a defect in this document. ## Background Material @@ -38,57 +40,65 @@ The guidance in this document is meant t ## How to consistently apply licensing/legal notice information for Apache NiFi ### Apply the source header to each source file -Every source file for works submitted directly to the ASF must follow: http://apache.org/legal/src-headers.html#headers -Question: Every source file? What about test files and so on? -Answer: There are a few exceptions. Test files can be argued to have no degree of creativity. We also need our test materials at times to be exactly as they will be found in the wild. We should ensure test files have the license when possible but not to the point that it requires altering the test itself. - http://apache.org/legal/src-headers.html#faq-exceptions - -Question: Do items which are generated from source during the build process require the header? -Answer: Taken directly from http://incubator.apache.org/guides/releasemanagement.html#notes-license-headers it reads: -Copyright may not subsist in a document which is generated by an transformation from an original. In which case, the license header may be unnecessary. License headers should always be present in the original. Where it is reasonable to do so, the templates should also add the license header to the generated documents. +Every source file for works submitted directly to the ASF must follow: http://apache.org/legal/src-headers.html#headers + +Question: Every source file? What about test files and so on? +Answer: There are a few exceptions. Test files can be argued to have no degree of creativity. We also need our test materials at times to be exactly as they will be found in the wild. We should ensure test files have the license when possible but not to the point that it requires altering the test itself. +http://apache.org/legal/src-headers.html#faq-exceptions + +Question: Do items which are generated from source during the build process require the header? +Answer: Taken directly from http://incubator.apache.org/guides/releasemanagement.html#notes-license-headers it reads: +Copyright may not subsist in a document which is generated by an transformation from an original. In which case, the license header may be unnecessary. License headers should always be present in the original. Where it is reasonable to do so, the templates should also add the license header to the generated documents. ### Apply the proper NOTICE / LICENSE Information -Every source file or dependency pulled into or removed from a release bundle (source or binary) for 3rd party works must be accounted for as necessary in the LICENSE/NOTICE. This guidance should kick in anytime you wish to commit new source materials or you wish to modify the dependencies of a given artifact. The only official release product of Apache NiFi is the source-release. And its LICENSE and NOTICE must be full and complete for all items included in the actual source release (ie it should not include license/notice information for binary dependencies). We do, however, want to provide convenience binary packages as well (tar.gz, zip). In so doing those packages must also have a LICENSE/NOTICE file that is complete and correct and in that case it must include all necessary additional items for bundled binary dependencies. +Every source file or dependency pulled into or removed from a release bundle
svn commit: r1658087 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Sat Feb 7 17:39:17 2015 New Revision: 1658087 URL: http://svn.apache.org/r1658087 Log: formatting fixes Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1658087r1=1658086r2=1658087view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Sat Feb 7 17:39:17 2015 @@ -53,52 +53,108 @@ Answer: Taken directly from http://incub ### Apply the proper NOTICE / LICENSE Information -Every source file or dependency pulled into or removed from a release bundle (source or binary) for 3rd party works must be accounted for as necessary in the LICENSE/NOTICE. This guidance should kick in anytime you wish to commit new source materials or you wish to modify the dependencies of a given artifact. The only official release product of Apache NiFi is the source-release. And its LICENSE and NOTICE must be full and complete for all items included in the actual source release (ie it should not include license/notice information for binary dependencies). We do, however, want to provide convenience binary packages as well (tar.gz, zip). In so doing those packages must also have a LICENSE/NOTICE file that is complete and correct and in that case it must include all necessary additional items for bundled binary dependencies. +Every source file or dependency pulled into or removed from a release bundle (source or binary) for 3rd party works must +be accounted for as necessary in the LICENSE/NOTICE. This guidance should kick in anytime you wish to commit new source +materials or you wish to modify the dependencies of a given artifact. The only official release product of Apache NiFi +is the source-release. And its LICENSE and NOTICE must be full and complete for all items included in the actual source +release (ie it should not include license/notice information for binary dependencies). We do, however, want to provide +convenience binary packages as well (tar.gz, zip). In so doing those packages must also have a LICENSE/NOTICE file that +is complete and correct and in that case it must include all necessary additional items for bundled binary dependencies. -The LICENSE and NOTICE files found at the root of the Apache NiFi (nifi) component is considered 'The' LICENSE/NOTICE covering the source release of 'nifi' and all subcomponents. +The LICENSE and NOTICE files found at the root of the Apache NiFi (nifi) component is considered 'The' LICENSE/NOTICE +covering the source release of 'nifi' and all subcomponents. -The LICENSE and NOTICE files found within the 'nifi-assembly' is considered 'The' LICENSE/NOTICE pair covering the binary convenience package of 'nifi'. +The LICENSE and NOTICE files found within the 'nifi-assembly' is considered 'The' LICENSE/NOTICE pair covering the binary +convenience package of 'nifi'. -The Release Manager (RM) of a given release is responsible for checking all subcomponents for the presence of specific LICENSE/NOTICE to gather all source dependency clauses as needed and place them into the over LICENSE/NOTICE for a source release. In addition, the RM will gather up a listing of all binary dependencies as called out on subcomponents (including the assembly itself), which can contain binary dependencies, and promoting their specific NOTICE/LICENSE text to the binary package LICENSE/NOTICE associated with the assembly. +The Release Manager (RM) of a given release is responsible for checking all subcomponents for the presence of specific +LICENSE/NOTICE to gather all source dependency clauses as needed and place them into the over LICENSE/NOTICE for a source + release. In addition, the RM will gather up a listing of all binary dependencies as called out on subcomponents +(including the assembly itself), which can contain binary dependencies, and promoting their specific NOTICE/LICENSE text + to the binary package LICENSE/NOTICE associated with the assembly. A binary artifact is any artifact which is created as the result of compiling or processing a source artifact. For every subcomponent of nifi some binary artifact is produced because we make these things available as Maven artifacts. You must consider whether that artifact stands on its own as built from source or whether that artifact is comprised of materials built from source combined with other binary artifacts pulled in as dependencies. -In the case of subcomponents which produce binary artifacts which stand on their own (as would be typical in most Jar files) then you must only account for any 3rd party works source dependencies
svn commit: r1658081 - /incubator/nifi/site/trunk/content/people.md
Author: joewitt Date: Sat Feb 7 17:27:25 2015 New Revision: 1658081 URL: http://svn.apache.org/r1658081 Log: removed empty table Modified: incubator/nifi/site/trunk/content/people.md Modified: incubator/nifi/site/trunk/content/people.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/people.md?rev=1658081r1=1658080r2=1658081view=diff == --- incubator/nifi/site/trunk/content/people.md (original) +++ incubator/nifi/site/trunk/content/people.md Sat Feb 7 17:27:25 2015 @@ -90,16 +90,3 @@ The team is comprised of Project Managem /tr /table -## Committers -The following is a list of developers with commit privileges that have directly contributed to the project in one way or another. - -table class=table table-striped table-condensed width=60% -tr -thId/th -thName/th -/tr -tr -td/td -td/td -/tr -/table
svn commit: r939363 - /websites/production/nifi/content/
Author: joewitt Date: Sat Feb 7 17:27:39 2015 New Revision: 939363 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r939362, websites/staging/nifi/trunk/content/
svn commit: r1658135 - /incubator/nifi/site/trunk/templates/nav.html
Author: joewitt Date: Sun Feb 8 04:35:41 2015 New Revision: 1658135 URL: http://svn.apache.org/r1658135 Log: added admin link Modified: incubator/nifi/site/trunk/templates/nav.html Modified: incubator/nifi/site/trunk/templates/nav.html URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/templates/nav.html?rev=1658135r1=1658134r2=1658135view=diff == --- incubator/nifi/site/trunk/templates/nav.html (original) +++ incubator/nifi/site/trunk/templates/nav.html Sun Feb 8 04:35:41 2015 @@ -27,6 +27,7 @@ lia href=/docs/nifi-docs/overview.htmlNiFi Overview/a/li lia href=/docs/nifi-docs/user-guide.htmlUser Guide/a/li lia href=/docs/nifi-docs/developer-guide.htmlDeveloper Guide/a/li + lia href=/docs/nifi-docs/administration-guide.htmlAdmin Guide/a/li /ul /li li class=dropdown
[2/4] incubator-nifi git commit: Adding information on the usage of AsciiDoc for documentation and providing a link to the AsciiDoc guide for tooling
Adding information on the usage of AsciiDoc for documentation and providing a link to the AsciiDoc guide for tooling Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2197049a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2197049a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2197049a Branch: refs/heads/develop Commit: 2197049a6debe55697cbe5fe8cdd6a9d05d62f5f Parents: c14aef4 Author: Aldrin Piri aldrinp...@gmail.com Authored: Fri Feb 6 15:05:14 2015 -0500 Committer: Aldrin Piri aldrinp...@gmail.com Committed: Fri Feb 6 15:05:14 2015 -0500 -- nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2197049a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc -- diff --git a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc index 1677312..537cd88 100644 --- a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc +++ b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc @@ -2098,6 +2098,8 @@ The back end of Apache NiFi is written in Java. The web tier makes use of JAX-RS used to provide a user interface. We depend on several third-party JavaScript libraries, including D3 and JQuery, among others. We make use of Apache Maven for our builds and Git for our version control system. +Documentation is created in link:http://asciidoctor.org[AsciiDoc]. + === Where to Start? @@ -2106,6 +2108,8 @@ or you can dig into any of the tickets for creating Processors. Processors shoul outside components (except for Controller Services), so they make for excellent starting points for new NiFi developers to get started. This exposes the developer to the NiFi API and is the most extensible part of the dataflow system. +Tools available to facilitate documentation generation are available at link:http://asciidoctor.org/docs/editing-asciidoc-with-live-preview/[Editing AsciiDoc with Live Preview]. + === Supplying a contribution
[3/4] incubator-nifi git commit: Correcting NoClassDefFoundError typo
Correcting NoClassDefFoundError typo Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c36734eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c36734eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c36734eb Branch: refs/heads/develop Commit: c36734eb8833c59329fa6d2c2cdbd5a302b2f27b Parents: 2197049 Author: Aldrin Piri aldrinp...@gmail.com Authored: Fri Feb 6 15:13:46 2015 -0500 Committer: Aldrin Piri aldrinp...@gmail.com Committed: Fri Feb 6 15:13:46 2015 -0500 -- nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c36734eb/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc -- diff --git a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc index 537cd88..ac5a16a 100644 --- a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc +++ b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc @@ -1943,7 +1943,7 @@ the same environment, Java ClassLoaders quickly become a concern. If multiple components have a dependency on the same library but each depends on a different version, many problems arise, typically resulting in unexpected -behavior or `NoClassDefFoudnError` errors occurring. +behavior or `NoClassDefFoundError` errors occurring. In order to prevent these issues from becoming problematic, NiFi introduces the notion of a NiFi Archive, or NAR.
[1/4] incubator-nifi git commit: Correct casing of JIRA
Repository: incubator-nifi Updated Branches: refs/heads/develop d36a71c25 - 497767389 Correct casing of JIRA Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c14aef4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c14aef4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c14aef4c Branch: refs/heads/develop Commit: c14aef4c750d9224ef02a4adb36b07234db5c852 Parents: d36a71c Author: Aldrin Piri aldrinp...@gmail.com Authored: Fri Feb 6 14:51:37 2015 -0500 Committer: Aldrin Piri aldrinp...@gmail.com Committed: Fri Feb 6 14:51:37 2015 -0500 -- nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c14aef4c/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc -- diff --git a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc index 17264c8..1677312 100644 --- a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc +++ b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc @@ -2101,7 +2101,7 @@ among others. We make use of Apache Maven for our builds and Git for our version === Where to Start? -link:http://issues.apache.org/jira/browse/NIFI[NiFi's Jira page] can be used to find tickets that are tagged as beginner, +link:http://issues.apache.org/jira/browse/NIFI[NiFi's JIRA page] can be used to find tickets that are tagged as beginner, or you can dig into any of the tickets for creating Processors. Processors should be self-contained and not rely on other outside components (except for Controller Services), so they make for excellent starting points for new NiFi developers to get started. This exposes the developer to the NiFi API and is the most extensible part of the dataflow system.
svn commit: r939259 - /websites/production/nifi/content/
Author: joewitt Date: Fri Feb 6 16:16:11 2015 New Revision: 939259 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r939258, websites/staging/nifi/trunk/content/
svn commit: r939258 - /websites/production/nifi/content/
Author: joewitt Date: Fri Feb 6 16:15:34 2015 New Revision: 939258 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r939256, websites/staging/nifi/trunk/content/
svn commit: r1657879 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Fri Feb 6 16:15:29 2015 New Revision: 1657879 URL: http://svn.apache.org/r1657879 Log: added step for apparent release announcement we should have done Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1657879r1=1657878r2=1657879view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Fri Feb 6 16:15:29 2015 @@ -306,6 +306,8 @@ Here are the steps of the release once t 8. In Jira mark the release version as 'Released' and 'Archived' through 'version' management in the 'administration' console. +9. Send release announcement. Details TBD... + [quickstart-guide]: http://nifi.incubator.apache.org/development/quickstart.html [release-manager]: http://www.apache.org/dev/release-publishing.html#release_manager [apache-license]: http://apache.org/licenses/LICENSE-2.0
svn commit: r1657482 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Thu Feb 5 06:18:33 2015 New Revision: 1657482 URL: http://svn.apache.org/r1657482 Log: added guidance - still needs formatting Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1657482r1=1657481r2=1657482view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Thu Feb 5 06:18:33 2015 @@ -18,306 +18,77 @@ Notice:Licensed to the Apache Softwa # img alt=NiFi logo style=float: right src=/images/niFi-logo-horizontal.png / Apache NiFi Release Guide -The purpose of this document is to capture and describe the steps involved in producing -an official release of Apache NiFi. It is written specifically to someone acting in the -capacity of a [Release Manager][release-manager] (RM). - -## Background Material - - - These documents are necessary for all committers to be familiar with -- [Apache License V2.0][apache-license] -- [Apache Legal License/Resolved][apache-legal-resolve] -- [Apache How-to Apply License][apache-license-apply] -- [Apache Incubator Branding Guidelines][incubator-branding-guidelines] - - - These documents are necessary for someone acting as the RM -- [Apache Encryption Software / ECCN Info][apache-encryption] -- [Apache Release Policy][apache-release-policy] -- [Apache Release Guide][apache-release-guide] -- [Apache Incubator Release Guide][apache-incubator-release-guide] -- [another Apache Incubator Release Guide][another-apache-incubator-release-guide] -- [Apache Incubator Policy][apache-incubator-policy] - - - These documents are helpful for general environmental setup to perform releases -- [Apache PGP Info][apache-pgp] -- [Apache Release Signing][apache-release-signing] -- [Apache Guide to publish Maven Artifacts][apache-guide-publish-maven] - -## The objective - -Our aim is to produce and official Apache release. -The following is a list of the sorts of things that will be validated and are the basics to check -when evaluating a release for a vote. - -## What to validate and how to Validate a release - -There are two lists here: one of specific incubator requirements, and another of general Apache requirements. - -### Incubator: - - - Do the resulting artifacts have 'incubating' in the name? - - Is there a DISCLAIMER file in the source root that meets the requirements of the Incubator branding guidelines? - -### General Apache Release Requirements: - - - Are LICENSE and NOTICE file present in the source root and complete? -- Specifically look in the *-sources.zip artifact and ensure these items are present at the root of the archive. - - Evaluate the sources and dependencies. Does the overall LICENSE and NOTICE appear correct? Do all licenses fit within the ASF approved licenses? -- Here is an example path to a sources artifact: - - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip` - - Is there a README available that explains how to build the application and to execute it? -- Look in the *-sources.zip artifact root for the readme. - - Are the signatures and hashes correct for the source release? -- Validate the hashes of the sources artifact do in fact match: - - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5` - - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1` -- Validate the signatures of the sources artifact and of each of the hashes. Here are example paths: - - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc` - - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc.md5` - - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc.sha1` - - Need a quick reminder on how to [verify a signature](http://www.apache.org/dev/release-signing.html#verifying-signature)? - - Do all sources have necessary headers? -- Unzip the sources file into a directory and execute `mvn install -Pcheck-licenses` - - Are there no unexpected binary files
svn commit: r939053 - /websites/production/nifi/content/
Author: joewitt Date: Thu Feb 5 06:20:20 2015 New Revision: 939053 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r939052, websites/staging/nifi/trunk/content/
svn commit: r1657483 - /incubator/nifi/site/trunk/content/development/licensing-guide.md
Author: joewitt Date: Thu Feb 5 06:19:53 2015 New Revision: 1657483 URL: http://svn.apache.org/r1657483 Log: added guidance - still needs formatting Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md Modified: incubator/nifi/site/trunk/content/development/licensing-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/licensing-guide.md?rev=1657483r1=1657482r2=1657483view=diff == --- incubator/nifi/site/trunk/content/development/licensing-guide.md (original) +++ incubator/nifi/site/trunk/content/development/licensing-guide.md Thu Feb 5 06:19:53 2015 @@ -16,7 +16,7 @@ Notice:Licensed to the Apache Softwa specific language governing permissions and limitations under the License. -# img alt=NiFi logo style=float: right src=/images/niFi-logo-horizontal.png / Apache NiFi Release Guide +# img alt=NiFi logo style=float: right src=/images/niFi-logo-horizontal.png / Apache NiFi Licensing Guide This document provides guidance to contributors of Apache NiFi (incubating) to help properly account for licensing, notice, and legal requirements.
svn commit: r939056 - /websites/production/nifi/content/
Author: joewitt Date: Thu Feb 5 06:21:53 2015 New Revision: 939056 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r939055, websites/staging/nifi/trunk/content/
[2/4] incubator-nifi git commit: NIFI-291 made all the licensing/notice changes for source v binary and so on as suggested in last release
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4a49ba7f/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE -- diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE new file mode 100644 index 000..3600719 --- /dev/null +++ b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE @@ -0,0 +1,359 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + Contribution shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, submitted + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as Not a Contribution. + + Contributor shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and
[3/4] incubator-nifi git commit: NIFI-291 made all the licensing/notice changes for source v binary and so on as suggested in last release
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4a49ba7f/nifi/nifi-assembly/NOTICE -- diff --git a/nifi/nifi-assembly/NOTICE b/nifi/nifi-assembly/NOTICE new file mode 100644 index 000..7d42538 --- /dev/null +++ b/nifi/nifi-assembly/NOTICE @@ -0,0 +1,529 @@ +nifi-assembly +Copyright 2014-2015 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +=== +Apache Software License v2 +=== + +The following binary components are provided under the Apache Software License v2 + + (ASLv2) Apache Commons IO +The following NOTICE information applies: + Apache Commons IO + Copyright 2002-2012 The Apache Software Foundation + + (ASLv2) Apache Commons Net +The following NOTICE information applies: + Apache Commons Net + Copyright 2001-2013 The Apache Software Foundation + + (ASLv2) Apache Commons Collections +The following NOTICE information applies: + Apache Commons Collections + Copyright 2001-2013 The Apache Software Foundation + + (ASLv2) Apache Commons Compress +The following NOTICE information applies: + Apache Commons Compress + Copyright 2002-2014 The Apache Software Foundation + + The files in the package org.apache.commons.compress.archivers.sevenz + were derived from the LZMA SDK, version 9.20 (C/ and CPP/7zip/), + which has been placed in the public domain: + + LZMA SDK is placed in the public domain. (http://www.7-zip.org/sdk.html) + + (ASLv2) Jettison +The following NOTICE information applies: + Copyright 2006 Envoi Solutions LLC + + (ASLv2) Jasypt +The following NOTICE information applies: + Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org) + + (ASLv2) Apache Commons Codec +The following NOTICE information applies: + Apache Commons Codec + Copyright 2002-2014 The Apache Software Foundation + + src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java + contains test data from http://aspell.net/test/orig/batch0.tab. + Copyright (C) 2002 Kevin Atkinson (kev...@gnu.org) + + === + + The content of package org.apache.commons.codec.language.bm has been translated + from the original php source code available at http://stevemorse.org/phoneticinfo.htm + with permission from the original authors. + Original source copyright: + Copyright (c) 2008 Alexander Beider Stephen P. Morse. + + (ASLv2) Apache HttpComponents +The following NOTICE information applies: + Apache HttpClient + Copyright 1999-2014 The Apache Software Foundation + + Apache HttpCore + Copyright 2005-2014 The Apache Software Foundation + + This project contains annotations derived from JCIP-ANNOTATIONS + Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net + + (ASLv2) Apache Jakarta HttpClient +The following NOTICE information applies: + Apache Jakarta HttpClient + Copyright 1999-2007 The Apache Software Foundation + + (ASLv2) Apache Commons Logging +The following NOTICE information applies: + Apache Commons Logging + Copyright 2003-2013 The Apache Software Foundation + + (ASLv2) Apache Commons Lang +The following NOTICE information applies: + Apache Commons Lang + Copyright 2001-2014 The Apache Software Foundation + + This product includes software from the Spring Framework, + under the Apache License 2.0 (see: StringUtils.containsWhitespace()) + + (ASLv2) Spring Framework +The following NOTICE information applies: + Spring Framework 4.1.4.RELEASE + Copyright (c) 2002-2014 Pivotal, Inc. + + (ASLv2) Apache Commons CLI +The following NOTICE information applies: + Apache Commons CLI + Copyright 2001-2009 The Apache Software Foundation + + (ASLv2) Apache Commons Math +The following NOTICE information applies: + Apache Commons Math + Copyright 2001-2012 The Apache Software Foundation + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + === + + The BracketFinder (package org.apache.commons.math3.optimization.univariate) + and PowellOptimizer (package org.apache.commons.math3.optimization.general) + classes are based on the Python code in module optimize.py (version 0.5) + developed by Travis E. Oliphant for the SciPy library (http://www.scipy.org/) + Copyright © 2003-2009 SciPy Developers. + === + + The
[4/4] incubator-nifi git commit: NIFI-291 made all the licensing/notice changes for source v binary and so on as suggested in last release
NIFI-291 made all the licensing/notice changes for source v binary and so on as suggested in last release Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4a49ba7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4a49ba7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4a49ba7f Branch: refs/heads/develop Commit: 4a49ba7f706f2fe7c9ef77524e9dc1353c238ec8 Parents: ed53b46 Author: joewitt joew...@apache.org Authored: Thu Feb 5 00:42:12 2015 -0500 Committer: joewitt joew...@apache.org Committed: Thu Feb 5 00:42:12 2015 -0500 -- nifi/LICENSE| 328 +++- nifi/NOTICE | 8 - nifi/README.md | 26 +- nifi/nifi-assembly/LICENSE | 780 +++ nifi/nifi-assembly/NOTICE | 529 + nifi/nifi-assembly/README.md| 124 +++ nifi/nifi-assembly/pom.xml | 6 +- .../src/main/assembly/dependencies.xml | 6 +- .../src/main/resources/META-INF/LICENSE | 264 +++ .../src/main/resources/META-INF/NOTICE | 131 .../nifi-web/nifi-web-api/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 27 + .../src/main/resources/META-INF/NOTICE | 19 + .../src/main/resources/META-INF/LICENSE | 434 +++ .../src/main/resources/META-INF/NOTICE | 35 + .../src/main/resources/META-INF/LICENSE | 359 + .../src/main/resources/META-INF/NOTICE | 237 ++ .../src/main/resources/META-INF/NOTICE | 37 + .../src/main/resources/META-INF/LICENSE | 299 +++ .../src/main/resources/META-INF/NOTICE | 72 ++ .../src/main/resources/META-INF/NOTICE | 202 + .../src/main/resources/META-INF/LICENSE | 292 +++ .../src/main/resources/META-INF/NOTICE | 119 +++ .../src/main/resources/META-INF/NOTICE | 19 + .../src/main/resources/META-INF/NOTICE | 19 + .../src/main/resources/META-INF/NOTICE | 19 + .../src/main/resources/META-INF/LICENSE | 238 ++ .../src/main/resources/META-INF/NOTICE | 49 ++ nifi/pom.xml| 3 +- 29 files changed, 4419 insertions(+), 264 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4a49ba7f/nifi/LICENSE -- diff --git a/nifi/LICENSE b/nifi/LICENSE index d10784d..6832114 100644 --- a/nifi/LICENSE +++ b/nifi/LICENSE @@ -208,139 +208,8 @@ notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. -The binary distribution of this product bundles 'Antlr 3' which is available -under a 3-clause BSD license. For details see http://www.antlr3.org/license.html - -Copyright (c) 2010 Terence Parr -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. -Neither the name of the author nor the names of its contributors may be used -to endorse or promote products derived from this software without specific -prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - -The binary distribution of this product bundles 'Paranamer Core' which is -available under a 3-clause BSD license. -For details see http://paranamer.codehaus.org/paranamer - -Copyright (c
svn commit: r1657479 - /incubator/nifi/site/trunk/templates/nav.html
Author: joewitt Date: Thu Feb 5 06:04:54 2015 New Revision: 1657479 URL: http://svn.apache.org/r1657479 Log: added entry for upcoming licensing guide Modified: incubator/nifi/site/trunk/templates/nav.html Modified: incubator/nifi/site/trunk/templates/nav.html URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/templates/nav.html?rev=1657479r1=1657478r2=1657479view=diff == --- incubator/nifi/site/trunk/templates/nav.html (original) +++ incubator/nifi/site/trunk/templates/nav.html Thu Feb 5 06:04:54 2015 @@ -47,6 +47,7 @@ ul class=dropdown-menu role=menu lia href=/development/quickstart.htmlQuickstart/a/li lia href=/development/release-guide.htmlRelease Guide/a/li + lia href=/development/licensing-guide.htmlLicensing Guide/a/li lia href=/docs/nifi-docs/developer-guide.htmlDeveloper Guide/a/li lia href=https://git-wip-us.apache.org/repos/asf/incubator-nifi.git;span class=glyphicon glyphicon-link aria-hidden=true/span Source/a/li
[2/3] incubator-nifi git commit: NIFI-269 This closes #16. Merge branch 'develop' of https://github.com/davidmoravek/incubator-nifi into develop
NIFI-269 This closes #16. Merge branch 'develop' of https://github.com/davidmoravek/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/fbfebf62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fbfebf62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fbfebf62 Branch: refs/heads/develop Commit: fbfebf622d45d0ae972b9e1c47c617afdb8dc978 Parents: 9c61bdb 51b34a0 Author: joewitt joew...@apache.org Authored: Tue Feb 3 07:59:50 2015 -0500 Committer: joewitt joew...@apache.org Committed: Tue Feb 3 07:59:50 2015 -0500 -- nifi/nifi-assembly/pom.xml | 1 + 1 file changed, 1 insertion(+) --
[1/3] incubator-nifi git commit: NIFI-269: fix OSX build
Repository: incubator-nifi Updated Branches: refs/heads/develop 9c61bdb10 - 2c2d39c7a NIFI-269: fix OSX build Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/51b34a06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/51b34a06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/51b34a06 Branch: refs/heads/develop Commit: 51b34a060ca9b59509360d5eb57a8ac325023142 Parents: 037f36d Author: David Moravek david.mora...@gmail.com Authored: Mon Feb 2 09:48:18 2015 +0100 Committer: David Moravek david.mora...@gmail.com Committed: Mon Feb 2 09:51:11 2015 +0100 -- nifi/nifi-assembly/pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/51b34a06/nifi/nifi-assembly/pom.xml -- diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml index bc39b79..a3bcadc 100644 --- a/nifi/nifi-assembly/pom.xml +++ b/nifi/nifi-assembly/pom.xml @@ -43,6 +43,7 @@ descriptors descriptorsrc/main/assembly/dependencies.xml/descriptor /descriptors +tarLongFileModeposix/tarLongFileMode /configuration /execution /executions
incubator-nifi git commit: NIFI-291 completed incorporation of Elser feedback
Repository: incubator-nifi Updated Branches: refs/heads/develop 2c2d39c7a - d926aca95 NIFI-291 completed incorporation of Elser feedback Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d926aca9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d926aca9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d926aca9 Branch: refs/heads/develop Commit: d926aca951b8169b0c32a583a178dedb6e1dc605 Parents: 2c2d39c Author: joewitt joew...@apache.org Authored: Tue Feb 3 09:41:27 2015 -0500 Committer: joewitt joew...@apache.org Committed: Tue Feb 3 09:41:27 2015 -0500 -- README.md | 14 ++ nifi-nar-maven-plugin/README.md | 14 ++ nifi-nar-maven-plugin/pom.xml | 6 +++--- nifi-site/README.md | 14 ++ nifi/README.md | 14 ++ nifi/pom.xml| 16 6 files changed, 67 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/README.md -- diff --git a/README.md b/README.md index c901e36..7bbc4dd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,17 @@ +!-- + 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. +-- # Apache NiFi Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently apart of the Apache Incubator. http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/nifi-nar-maven-plugin/README.md -- diff --git a/nifi-nar-maven-plugin/README.md b/nifi-nar-maven-plugin/README.md index 941de2b..1b554d9 100644 --- a/nifi-nar-maven-plugin/README.md +++ b/nifi-nar-maven-plugin/README.md @@ -1,3 +1,17 @@ +!-- + 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. +-- # Apache NiFi NAR Maven Plugin Apache NiFi NAR Maven Plugin helps to build NiFi Archive bundles to support the classloader isolation model of NiFi. http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index 79e437e..6f46397 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -206,9 +206,9 @@ artifactIdapache-rat-plugin/artifactId configuration excludes -excludenb-configuration.xml/exclude -excludenbactions.xml/exclude -excludeDEPENDENCIES/exclude +excludenb-configuration.xml/exclude !-- convenience exclude for netbeans users -- +excludenbactions.xml/exclude !-- convenience excludes for netbeans users -- +excludeDEPENDENCIES/exclude !-- auto generated by maven while building sources zip and more -- /excludes /configuration /plugin http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/nifi-site/README.md -- diff --git a/nifi-site/README.md b/nifi-site
incubator-nifi git commit: NIFI-291 completed incorporation of Purtell feedback
Repository: incubator-nifi Updated Branches: refs/heads/develop d926aca95 - a738be8f2 NIFI-291 completed incorporation of Purtell feedback Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a738be8f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a738be8f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a738be8f Branch: refs/heads/develop Commit: a738be8f27e86fab7cf8c7bd23285fb9cb016cad Parents: d926aca Author: joewitt joew...@apache.org Authored: Tue Feb 3 09:43:19 2015 -0500 Committer: joewitt joew...@apache.org Committed: Tue Feb 3 09:43:19 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 2 +- nifi/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a738be8f/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index 6f46397..7ba2d7c 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -27,7 +27,7 @@ version1.0.1-incubating-SNAPSHOT/version packagingmaven-plugin/packaging descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description -urlhttp://nifi.incubator.apache.org/maven-site//url +urlhttp://nifi.incubator.apache.org/url organization nameApache NiFi (incubating)/name urlhttp://nifi.incubator.apache.org//url http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a738be8f/nifi/pom.xml -- diff --git a/nifi/pom.xml b/nifi/pom.xml index fb73f9c..8eda682 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -26,7 +26,7 @@ version0.0.2-incubating-SNAPSHOT/version packagingpom/packaging descriptionApache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator./description -urlhttp://nifi.incubator.apache.org/maven-site//url +urlhttp://nifi.incubator.apache.org/url organization nameApache NiFi (incubating)/name urlhttp://nifi.incubator.apache.org//url
svn commit: r1656741 - /incubator/nifi/site/trunk/content/development/quickstart.md
Author: joewitt Date: Tue Feb 3 14:22:07 2015 New Revision: 1656741 URL: http://svn.apache.org/r1656741 Log: added maven-opts info Modified: incubator/nifi/site/trunk/content/development/quickstart.md Modified: incubator/nifi/site/trunk/content/development/quickstart.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/quickstart.md?rev=1656741r1=1656740r2=1656741view=diff == --- incubator/nifi/site/trunk/content/development/quickstart.md (original) +++ incubator/nifi/site/trunk/content/development/quickstart.md Tue Feb 3 14:22:07 2015 @@ -29,11 +29,13 @@ Then checkout the 'develop' branch 1. You need a recent Java 7 (or newer) JDK. 2. You need Apache [Maven 3.X][maven]. -- We've successfully used 3.2.3 and as far back as 3.0.5 -3. [OPTIONAL] Build the nifi nar maven plugin. +- We've successfully used 3.2.5 and as far back as 3.0.5 +3. Ensure your MAVEN_OPTS provides sufficient memory. Some build steps are fairly memory intensive +- These settings have worked well `MAVEN_OPTS=-Xms1024m -Xmx3076m -XX:MaxPermSize=256m` +4. [OPTIONAL] Build the nifi nar maven plugin. - In the root dir of the source tree cd to `nifi-nar-maven-plugin`. - Run `mvn clean install` -4. Build the main nifi code base. +5. Build the main nifi code base. - In the root dir of the source tree cd to `nifi` - run `mvn -T C2.0 clean install` - You can tweak the maven build settings as you like but the previous command will execute with 2 threads per core.
svn commit: r938807 - /websites/production/nifi/content/
Author: joewitt Date: Tue Feb 3 14:23:00 2015 New Revision: 938807 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r938806, websites/staging/nifi/trunk/content/
[3/3] incubator-nifi git commit: NIFI-269 removed declaration of gnu tar form from parent pom
NIFI-269 removed declaration of gnu tar form from parent pom Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2c2d39c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2c2d39c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2c2d39c7 Branch: refs/heads/develop Commit: 2c2d39c7a24dc77a84e1e095280239e0d56c8357 Parents: fbfebf6 Author: joewitt joew...@apache.org Authored: Tue Feb 3 08:18:58 2015 -0500 Committer: joewitt joew...@apache.org Committed: Tue Feb 3 08:18:58 2015 -0500 -- nifi/pom.xml | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2c2d39c7/nifi/pom.xml -- diff --git a/nifi/pom.xml b/nifi/pom.xml index 765ef1b..499ffd6 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -842,9 +842,6 @@ groupIdorg.apache.maven.plugins/groupId artifactIdmaven-assembly-plugin/artifactId version2.5.2/version -configuration -tarLongFileModegnu/tarLongFileMode -/configuration /plugin plugin groupIdorg.codehaus.mojo/groupId
svn commit: r1656385 - /incubator/nifi/site/trunk/content/development/quickstart.md
Author: joewitt Date: Mon Feb 2 03:40:33 2015 New Revision: 1656385 URL: http://svn.apache.org/r1656385 Log: cleaned up a bit Modified: incubator/nifi/site/trunk/content/development/quickstart.md Modified: incubator/nifi/site/trunk/content/development/quickstart.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/quickstart.md?rev=1656385r1=1656384r2=1656385view=diff == --- incubator/nifi/site/trunk/content/development/quickstart.md (original) +++ incubator/nifi/site/trunk/content/development/quickstart.md Mon Feb 2 03:40:33 2015 @@ -10,12 +10,6 @@ Apache NiFi source code is version contr The code is also mirrored to [Github][githubrepo] -The code as it was initially contributed and entered the incubator is on the 'master' branch. - -To view the lastest codebase as we work toward an initial release checkout the 'develop' branch. - -All guidance that follows assumes you are working on the 'develop' branch. - ## Issue Tracking Track issues on the NIFI Project on the Apache Jira ([browse][jira]). @@ -35,11 +29,15 @@ Then checkout the 'develop' branch ### Build steps 1. You need a recent Java 7 (or newer) JDK. -2. You need Apache [Maven 3.X][maven]. We've successfully used 3.2.3 and as far back as 3.0.5 -3. Build the maven plugins. In the root dir of the source tree cd to `nifi-nar-maven-plugin`. - Run `mvn clean install` -4. Build the entire code base. In the root dir of the source tree cd to `nifi` and run `mvn -T C2.0 clean install` - You can tweak the maven build settings as you like but the previous command will execute with 2 threads per core. +2. You need Apache [Maven 3.X][maven]. +- We've successfully used 3.2.3 and as far back as 3.0.5 +3. [OPTIONAL] Build the nifi nar maven plugin. +- In the root dir of the source tree cd to `nifi-nar-maven-plugin`. +- Run `mvn clean install` +4. Build the main nifi code base. +- In the root dir of the source tree cd to `nifi` +- run `mvn -T C2.0 clean install` +- You can tweak the maven build settings as you like but the previous command will execute with 2 threads per core. Now you should have a fully functioning build off the latest code in the develop branch.
svn commit: r1656386 - /incubator/nifi/site/trunk/content/development/quickstart.md
Author: joewitt Date: Mon Feb 2 03:47:01 2015 New Revision: 1656386 URL: http://svn.apache.org/r1656386 Log: cleaned up a bit Modified: incubator/nifi/site/trunk/content/development/quickstart.md Modified: incubator/nifi/site/trunk/content/development/quickstart.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/quickstart.md?rev=1656386r1=1656385r2=1656386view=diff == --- incubator/nifi/site/trunk/content/development/quickstart.md (original) +++ incubator/nifi/site/trunk/content/development/quickstart.md Mon Feb 2 03:47:01 2015 @@ -2,7 +2,6 @@ Title: Apache NiFi Development Quick # img alt=NiFi logo style=float: right src=/images/niFi-logo-horizontal.png / Apache NiFi Development Quickstart -This documentation is in progress, but should get many started at building Apache NiFi. ## Source Code
svn commit: r938613 - /websites/production/nifi/content/
Author: joewitt Date: Mon Feb 2 03:47:39 2015 New Revision: 938613 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r938612, websites/staging/nifi/trunk/content/
svn commit: r1656381 - /incubator/nifi/site/trunk/templates/skeleton.html
Author: joewitt
Date: Mon Feb 2 02:36:38 2015
New Revision: 1656381
URL: http://svn.apache.org/r1656381
Log:
trying to address funky text formatting
Modified:
incubator/nifi/site/trunk/templates/skeleton.html
Modified: incubator/nifi/site/trunk/templates/skeleton.html
URL:
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/templates/skeleton.html?rev=1656381r1=1656380r2=1656381view=diff
==
--- incubator/nifi/site/trunk/templates/skeleton.html (original)
+++ incubator/nifi/site/trunk/templates/skeleton.html Mon Feb 2 02:36:38 2015
@@ -32,11 +32,11 @@
{% include nav.html %}
- div class=jumbotron
-!--div id=content--
+ !--div class=jumbotron--
+div id=content
{% block content %}{{ content|markdown }}{% endblock %}
-!--/div--
- /div
+/div
+ !--/div--
div id=footer
a alt=Apache Software Foundation href=http://www.apache.org;
img id=asf-logo alt=Apache Software Foundation
src=/images/feather-small.gif
svn commit: r1656380 - /incubator/nifi/site/trunk/templates/skeleton.html
Author: joewitt
Date: Mon Feb 2 02:33:33 2015
New Revision: 1656380
URL: http://svn.apache.org/r1656380
Log:
trying to address funky text formatting
Modified:
incubator/nifi/site/trunk/templates/skeleton.html
Modified: incubator/nifi/site/trunk/templates/skeleton.html
URL:
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/templates/skeleton.html?rev=1656380r1=1656379r2=1656380view=diff
==
--- incubator/nifi/site/trunk/templates/skeleton.html (original)
+++ incubator/nifi/site/trunk/templates/skeleton.html Mon Feb 2 02:33:33 2015
@@ -33,9 +33,9 @@
{% include nav.html %}
div class=jumbotron
-div id=content
+!--div id=content--
{% block content %}{{ content|markdown }}{% endblock %}
-/div
+!--/div--
/div
div id=footer
a alt=Apache Software Foundation href=http://www.apache.org;
svn commit: r938605 - /websites/production/nifi/content/
Author: joewitt Date: Mon Feb 2 02:54:04 2015 New Revision: 938605 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r938604, websites/staging/nifi/trunk/content/
svn commit: r1656379 - /incubator/nifi/site/trunk/content/index.mdtext
Author: joewitt Date: Mon Feb 2 02:24:52 2015 New Revision: 1656379 URL: http://svn.apache.org/r1656379 Log: simplified description/messaging Modified: incubator/nifi/site/trunk/content/index.mdtext Modified: incubator/nifi/site/trunk/content/index.mdtext URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/index.mdtext?rev=1656379r1=1656378r2=1656379view=diff == --- incubator/nifi/site/trunk/content/index.mdtext (original) +++ incubator/nifi/site/trunk/content/index.mdtext Mon Feb 2 02:24:52 2015 @@ -18,17 +18,28 @@ Notice:Licensed to the Apache Softwa # img alt=NiFi logo style=float: right src=/images/niFi-logo-horizontal.png / Apache NiFi -Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator. +Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data. ## Features -Apache NiFi supports powerful and scalable directed graphs of data routing, transformation, and system mediation logic. Some of the high-level capabilities and objectives of Apache NiFi include: +Apache NiFi was born for dataflow. It supports highly configurable directed graphs of data routing, transformation, and system mediation logic. Some of its key features include: -- Web-based user interface for seamless experience between design, control, feedback, and monitoring of data flows -- Highly configurable along several dimensions of quality of service such as loss tolerant versus guaranteed delivery, low latency versus high throughput, and priority based queuing -- Fine-grained data provenance for all data received, forked, joined, cloned, modified, sent, and ultimately dropped as data reaches its configured end-state -- Component-based extension model along well defined interfaces enabling rapid development and effective testing -- Security: Supports various forms of SSL, SSH, HTTPS for system to system flows and content encryption/decryption. And SSL, PKI, pluggable authorization for users. +- Web-based user interface +- Seamless and intuitive experience between design, control, and monitoring +- Highly configurable +- Loss tolerant vs guaranteed delivery +- Low latency vs high throughput +- Dynamic prioritization +- Flows can be modified at runtime +- Back pressure +- Data Provenance +- Track data from beginning to end even across multiple generations +- Designed for extension +- Build your own processors and more +- Enables rapid development and effective testing +- Secure +- SSL, SSH, HTTPS, encrypted content, etc... +- Pluggable role-based authentication/authorization ## Disclaimer
svn commit: r1656265 - /incubator/nifi/site/trunk/content/downloads/index.md
Author: joewitt Date: Sun Feb 1 04:09:49 2015 New Revision: 1656265 URL: http://svn.apache.org/r1656265 Log: fixed path to sigs and hashes Modified: incubator/nifi/site/trunk/content/downloads/index.md Modified: incubator/nifi/site/trunk/content/downloads/index.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/downloads/index.md?rev=1656265r1=1656264r2=1656265view=diff == --- incubator/nifi/site/trunk/content/downloads/index.md (original) +++ incubator/nifi/site/trunk/content/downloads/index.md Sun Feb 1 04:09:49 2015 @@ -14,7 +14,7 @@ Releases * 0.0.1-incubating * [Release Notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329078) * Sources: -* [nifi-0.0.1-incubating-source-release.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip) ( [asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc), [md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5), [sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1) ) +* [nifi-0.0.1-incubating-source-release.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip) ( [asc](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc), [md5](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5), [sha1](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1) ) * Binaries: -* [nifi-0.0.1-incubating-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz) ( [asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.asc), [md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.md5), [sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.sha1) ) -* [nifi-0.0.1-incubating-bin.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip) ( [asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.asc), [md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.md5), [sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.sha1) ) \ No newline at end of file +* [nifi-0.0.1-incubating-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz) ( [asc](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.asc), [md5](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.md5), [sha1](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.sha1) ) +* [nifi-0.0.1-incubating-bin.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip) ( [asc](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.asc), [md5](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.md5), [sha1](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.sha1) ) \ No newline at end of file
[29/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
deleted file mode 100644
index 3d2081b..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.admin.service.action;
-
-import java.util.EnumSet;
-import java.util.Set;
-import org.apache.nifi.admin.dao.AuthorityDAO;
-import org.apache.nifi.admin.dao.DAOFactory;
-import org.apache.nifi.admin.dao.DataAccessException;
-import org.apache.nifi.admin.dao.UserDAO;
-import org.apache.nifi.authorization.Authority;
-import org.apache.nifi.user.NiFiUser;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-/**
- * Test cases for creating a user.
- */
-public class CreateUserActionTest {
-
-private String USER_ID_2 = 2;
-private String USER_ID_3 = 3;
-
-private String USER_DN_1 = data access exception when creating user;
-private String USER_DN_3 = general create user case;
-
-private DAOFactory daoFactory;
-private UserDAO userDao;
-private AuthorityDAO authorityDao;
-
-@Before
-public void setup() throws Exception {
-// mock the user dao
-userDao = Mockito.mock(UserDAO.class);
-Mockito.doAnswer(new AnswerVoid() {
-@Override
-public Void answer(InvocationOnMock invocation) throws Throwable {
-Object[] args = invocation.getArguments();
-NiFiUser user = (NiFiUser) args[0];
-
-if (USER_DN_1.equals(user.getDn())) {
-throw new DataAccessException();
-} else if (USER_DN_3.equals(user.getDn())) {
-user.setId(USER_ID_3);
-}
-
-// do nothing
-return null;
-}
-}).when(userDao).createUser(Mockito.any(NiFiUser.class));
-
-// mock the authority dao
-authorityDao = Mockito.mock(AuthorityDAO.class);
-Mockito.doAnswer(new AnswerVoid() {
-@Override
-public Void answer(InvocationOnMock invocation) throws Throwable {
-Object[] args = invocation.getArguments();
-SetAuthority authorities = (SetAuthority) args[0];
-String id = (String) args[1];
-
-if (USER_ID_2.equals(id)) {
-throw new DataAccessException(StringUtils.EMPTY);
-}
-
-// do nothing
-return null;
-}
-
}).when(authorityDao).createAuthorities(Mockito.anySetOf(Authority.class),
Mockito.anyString());
-
-// mock the dao factory
-daoFactory = Mockito.mock(DAOFactory.class);
-Mockito.when(daoFactory.getUserDAO()).thenReturn(userDao);
-Mockito.when(daoFactory.getAuthorityDAO()).thenReturn(authorityDao);
-}
-
-/**
- * Tests DataAccessExceptions that occur while creating user accounts.
- *
- * @throws Exception
- */
-@Test(expected = DataAccessException.class)
-public void testExceptionCreatingUser() throws Exception {
-NiFiUser user = new NiFiUser();
-user.setDn(USER_DN_1);
-
-CreateUserAction createUser = new CreateUserAction(user);
-createUser.execute(daoFactory, null);
-}
-
-/**
- * Tests DataAccessExceptions that occur while create user authorities.
- *
- * @throws Exception
- */
-@Test(expected = DataAccessException.class)
[37/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
--
diff --git
a/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
deleted file mode 100644
index ae075b5..000
---
a/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.stream.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class LeakyBucketStreamThrottler implements StreamThrottler {
-
-private final int maxBytesPerSecond;
-private final BlockingQueueRequest requestQueue = new
LinkedBlockingQueueRequest();
-private final ScheduledExecutorService executorService;
-private final AtomicBoolean shutdown = new AtomicBoolean(false);
-
-public LeakyBucketStreamThrottler(final int maxBytesPerSecond) {
-this.maxBytesPerSecond = maxBytesPerSecond;
-
-executorService = Executors.newSingleThreadScheduledExecutor();
-final Runnable task = new Drain();
-executorService.scheduleAtFixedRate(task, 0, 1000,
TimeUnit.MILLISECONDS);
-}
-
-@Override
-public void close() {
-this.shutdown.set(true);
-
-executorService.shutdown();
-try {
-// Should not take more than 2 seconds because we run every
second. If it takes more than
-// 2 seconds, it is because the Runnable thread is blocking on a
write; in this case,
-// we will just ignore it and return
-executorService.awaitTermination(2, TimeUnit.SECONDS);
-} catch (InterruptedException e) {
-}
-}
-
-@Override
-public OutputStream newThrottledOutputStream(final OutputStream toWrap) {
-return new OutputStream() {
-@Override
-public void write(final int b) throws IOException {
-write(new byte[]{(byte) b}, 0, 1);
-}
-
-@Override
-public void write(byte[] b) throws IOException {
-write(b, 0, b.length);
-}
-
-@Override
-public void write(byte[] b, int off, int len) throws IOException {
-final InputStream in = new ByteArrayInputStream(b, off, len);
-LeakyBucketStreamThrottler.this.copy(in, toWrap);
-}
-
-@Override
-public void close() throws IOException {
-toWrap.close();
-}
-
-@Override
-public void flush() throws IOException {
-toWrap.flush();
-}
-};
-}
-
-@Override
-public InputStream newThrottledInputStream(final InputStream toWrap) {
-return new InputStream() {
-final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-@Override
-public int read() throws IOException {
-final ByteArrayOutputStream baos = new
ByteArrayOutputStream(1);
-LeakyBucketStreamThrottler.this.copy(toWrap, baos, 1L);
-if (baos.getBufferLength() 1) {
-return -1;
-}
-
-return baos.getUnderlyingBuffer()[0] 0xFF;
-}
-
-@Override
-public int read(final byte[] b) throws IOException {
-if(b.length == 0){
-return 0;
-}
-return read(b, 0, b.length);
-}
-
-@Override
-public int read(byte[] b, int off, int len) throws IOException {
-if ( len 0 ) {
-
[32/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java
deleted file mode 100644
index ea7c1a1..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.admin.dao.impl;
-
-import java.nio.charset.StandardCharsets;
-import java.sql.Connection;
-import org.apache.nifi.admin.dao.UserDAO;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-import org.apache.nifi.admin.RepositoryUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.nifi.admin.dao.DataAccessException;
-import org.apache.nifi.authorization.Authority;
-import org.apache.nifi.user.AccountStatus;
-import org.apache.nifi.user.NiFiUser;
-
-/**
- * Responsible for loading and persisting NiFiUsers.
- */
-public class StandardUserDAO implements UserDAO {
-
-private static final String SELECT_PENDING_ACCOUNTS_COUNT = SELECT
-+ COUNT(*) as PENDING_ACCOUNTS
-+ FROM USER U
-+ WHERE U.STATUS = 'PENDING';
-
-private static final String SELECT_USER_BY_DN = SELECT
-+ U.ID,
-+ U.DN,
-+ U.USER_NAME,
-+ U.USER_GROUP,
-+ U.CREATION,
-+ U.LAST_ACCESSED,
-+ U.LAST_VERIFIED,
-+ U.JUSTIFICATION,
-+ U.STATUS,
-+ A.ROLE
-+ FROM USER U
-+ LEFT JOIN AUTHORITY A // ensures that users without
authorities are still matched
-+ ON U.ID = A.USER_ID
-+ WHERE U.DN = ?;
-
-private static final String SELECT_USER_BY_ID = SELECT
-+ U.ID,
-+ U.DN,
-+ U.USER_NAME,
-+ U.USER_GROUP,
-+ U.CREATION,
-+ U.LAST_ACCESSED,
-+ U.LAST_VERIFIED,
-+ U.JUSTIFICATION,
-+ U.STATUS,
-+ A.ROLE
-+ FROM USER U
-+ LEFT JOIN AUTHORITY A // ensures that users without
authorities are still matched
-+ ON U.ID = A.USER_ID
-+ WHERE U.ID = ?;
-
-private static final String SELECT_USERS = SELECT
-+ U.ID,
-+ U.DN,
-+ U.USER_NAME,
-+ U.USER_GROUP,
-+ U.CREATION,
-+ U.LAST_ACCESSED,
-+ U.LAST_VERIFIED,
-+ U.JUSTIFICATION,
-+ U.STATUS,
-+ A.ROLE
-+ FROM USER U
-+ LEFT JOIN AUTHORITY A // ensures that users without
authorities are still matched
-+ ON U.ID = A.USER_ID
-+ WHERE U.DN ?;
-
-private static final String SELECT_USER_GROUPS = SELECT DISTINCT
-+ U.USER_GROUP
-+ FROM USER U;
-
-private static final String SELECT_USER_GROUP = SELECT
-+ U.ID,
-+ U.DN,
-+ U.USER_NAME,
-+ U.USER_GROUP,
-+ U.CREATION,
-+ U.LAST_ACCESSED,
-+ U.LAST_VERIFIED,
-+ U.JUSTIFICATION,
-+ U.STATUS,
-+ A.ROLE
-+ FROM USER U
-+ LEFT JOIN AUTHORITY A // ensures that users without
authorities are still matched
-+ ON U.ID = A.USER_ID
-+ WHERE U.DN ? AND U.USER_GROUP = ?;
-
-private static final String INSERT_USER = INSERT INTO USER (
-+ ID, DN, USER_NAME, USER_GROUP, CREATION, LAST_VERIFIED,
JUSTIFICATION, STATUS
[41/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
--
diff --git
a/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
b/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
deleted file mode 100644
index 10e348d..000
---
a/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
+++ /dev/null
@@ -1,876 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.InetSocketAddress;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-public class NiFiProperties extends Properties {
-
-private static final long serialVersionUID = 2119177359005492702L;
-
-private static final Logger LOG =
LoggerFactory.getLogger(NiFiProperties.class);
-private static NiFiProperties instance = null;
-
-// core properties
-public static final String PROPERTIES_FILE_PATH =
nifi.properties.file.path;
-public static final String FLOW_CONFIGURATION_FILE =
nifi.flow.configuration.file;
-public static final String FLOW_CONFIGURATION_ARCHIVE_FILE =
nifi.flow.configuration.archive.file;
-public static final String TASK_CONFIGURATION_FILE =
nifi.reporting.task.configuration.file;
-public static final String SERVICE_CONFIGURATION_FILE =
nifi.controller.service.configuration.file;
-public static final String AUTHORITY_PROVIDER_CONFIGURATION_FILE =
nifi.authority.provider.configuration.file;
-public static final String REPOSITORY_DATABASE_DIRECTORY =
nifi.database.directory;
-public static final String RESTORE_DIRECTORY = nifi.restore.directory;
-public static final String VERSION = nifi.version;
-public static final String WRITE_DELAY_INTERVAL =
nifi.flowservice.writedelay.interval;
-public static final String AUTO_RESUME_STATE =
nifi.flowcontroller.autoResumeState;
-public static final String FLOW_CONTROLLER_GRACEFUL_SHUTDOWN_PERIOD =
nifi.flowcontroller.graceful.shutdown.period;
-public static final String NAR_LIBRARY_DIRECTORY =
nifi.nar.library.directory;
-public static final String NAR_WORKING_DIRECTORY =
nifi.nar.working.directory;
-public static final String COMPONENT_DOCS_DIRECTORY =
nifi.documentation.working.directory;
-public static final String SENSITIVE_PROPS_KEY =
nifi.sensitive.props.key;
-public static final String SENSITIVE_PROPS_ALGORITHM =
nifi.sensitive.props.algorithm;
-public static final String SENSITIVE_PROPS_PROVIDER =
nifi.sensitive.props.provider;
-public static final String H2_URL_APPEND = nifi.h2.url.append;
-public static final String REMOTE_INPUT_PORT =
nifi.remote.input.socket.port;
-public static final String SITE_TO_SITE_SECURE =
nifi.remote.input.secure;
-public static final String TEMPLATE_DIRECTORY = nifi.templates.directory;
-public static final String ADMINISTRATIVE_YIELD_DURATION =
nifi.administrative.yield.duration;
-public static final String PERSISTENT_STATE_DIRECTORY =
nifi.persistent.state.directory;
-
-// content repository properties
-public static final String REPOSITORY_CONTENT_PREFIX =
nifi.content.repository.directory.;
-public static final String CONTENT_REPOSITORY_IMPLEMENTATION =
nifi.content.repository.implementation;
-public static final String MAX_APPENDABLE_CLAIM_SIZE =
nifi.content.claim.max.appendable.size;
-public static final String MAX_FLOWFILES_PER_CLAIM =
nifi.content.claim.max.flow.files;
-public static final String CONTENT_ARCHIVE_MAX_RETENTION_PERIOD =
nifi.content.repository.archive.max.retention.period;
-public static final String CONTENT_ARCHIVE_MAX_USAGE_PERCENTAGE =
nifi.content.repository.archive.max.usage.percentage;
-public static
[36/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
--
diff --git
a/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
deleted file mode 100644
index 41a0557..000
---
a/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.util.file;
-
-import java.io.BufferedInputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Random;
-
-import org.slf4j.Logger;
-
-/**
- * A utility class containing a few useful static methods to do typical IO
- * operations.
- *
- * @author unattributed
- */
-public class FileUtils {
-
-public static final long TRANSFER_CHUNK_SIZE_BYTES = 1024 * 1024 * 8; //8
MB chunks
-public static final long MILLIS_BETWEEN_ATTEMPTS = 50L;
-
-/**
- * Closes the given closeable quietly - no logging, no exceptions...
- *
- * @param closeable
- */
-public static void closeQuietly(final Closeable closeable) {
-if (null != closeable) {
-try {
-closeable.close();
-} catch (final IOException io) {/*IGNORE*/
-
-}
-}
-}
-
-/**
- * Releases the given lock quietly - no logging, no exception
- *
- * @param lock
- */
-public static void releaseQuietly(final FileLock lock) {
-if (null != lock) {
-try {
-lock.release();
-} catch (final IOException io) {
-/*IGNORE*/
-}
-}
-}
-
-public static void ensureDirectoryExistAndCanAccess(final File dir) throws
IOException {
-if (dir.exists() !dir.isDirectory()) {
-throw new IOException(dir.getAbsolutePath() + is not a
directory);
-} else if (!dir.exists()) {
-final boolean made = dir.mkdirs();
-if (!made) {
-throw new IOException(dir.getAbsolutePath() + could not be
created);
-}
-}
-if (!(dir.canRead() dir.canWrite())) {
-throw new IOException(dir.getAbsolutePath() + directory does not
have read/write privilege);
-}
-}
-
-/**
- * Deletes the given file. If the given file exists but could not be
deleted
- * this will be printed as a warning to the given logger
- *
- * @param file
- * @param logger
- * @return
- */
-public static boolean deleteFile(final File file, final Logger logger) {
-return FileUtils.deleteFile(file, logger, 1);
-}
-
-/**
- * Deletes the given file. If the given file exists but could not be
deleted
- * this will be printed as a warning to the given logger
- *
- * @param file
- * @param logger
- * @param attempts indicates how many times an attempt to delete should be
- * made
- * @return true if given file no longer exists
- */
-public static boolean deleteFile(final File file, final Logger logger,
final int attempts) {
-if (file == null) {
-return false;
-}
-boolean isGone = false;
-try {
-if (file.exists()) {
-final int effectiveAttempts = Math.max(1, attempts);
-for (int i = 0; i effectiveAttempts !isGone; i++) {
-isGone = file.delete() || !file.exists();
-if (!isGone (effectiveAttempts - i) 1)
[09/10] incubator-nifi git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Merge branch 'develop' of https://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/02b402b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/02b402b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/02b402b8 Branch: refs/heads/develop Commit: 02b402b8c508cf0b7800ae78fef560ba645daad6 Parents: 2253ee6 bafa945 Author: joewitt joew...@apache.org Authored: Fri Jan 30 22:49:29 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 30 22:49:29 2015 -0500 -- .../src/main/asciidoc/developer-guide.adoc | 2116 +- 1 file changed, 2098 insertions(+), 18 deletions(-) --
[10/10] incubator-nifi git commit: NIFI-272 fixing pom version references
NIFI-272 fixing pom version references Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/21619da1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/21619da1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/21619da1 Branch: refs/heads/develop Commit: 21619da1b310d07b4a004463f37e2e91ac1cbc30 Parents: 02b402b Author: joewitt joew...@apache.org Authored: Fri Jan 30 23:06:31 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 30 23:06:31 2015 -0500 -- nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml | 2 +- nifi/nifi-maven-archetypes/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21619da1/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml -- diff --git a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml index 8eb2862..540764c 100644 --- a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml +++ b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml @@ -20,7 +20,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-maven-archetypes/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.2-incubating-SNAPSHOT/version /parent artifactIdnifi-processor-bundle-archetype/artifactId http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21619da1/nifi/nifi-maven-archetypes/pom.xml -- diff --git a/nifi/nifi-maven-archetypes/pom.xml b/nifi/nifi-maven-archetypes/pom.xml index b4ee95b..cb6fd00 100644 --- a/nifi/nifi-maven-archetypes/pom.xml +++ b/nifi/nifi-maven-archetypes/pom.xml @@ -19,7 +19,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.2-incubating-SNAPSHOT/version /parent groupIdorg.apache.nifi/groupId artifactIdnifi-maven-archetypes/artifactId
[06/10] incubator-nifi git commit: NIFI-270 prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml index 64215c6..deb787f 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml index 70aefc6..04b9ad6 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent artifactIdnifi-update-attribute-ui/artifactId packagingwar/packaging http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml index e20e77b..dcb63e4 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml @@ -18,11 +18,11 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-bundles/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version packagingpom/packaging modules @@ -37,18 +37,18 @@ dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-model/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-ui/artifactId typewar/type -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency /dependencies /dependencyManagement http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/pom.xml -- diff --git a/nifi/nifi-nar-bundles/pom.xml b/nifi/nifi-nar-bundles/pom.xml index fa65abe..4ee6875 100644 --- a/nifi/nifi-nar-bundles/pom.xml +++ b/nifi/nifi-nar-bundles/pom.xml @@ -19,12 +19,12 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-bundles/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version packagingpom/packaging modules @@ -43,70 +43,70 @@ dependency groupIdorg.apache.nifi/groupId artifactIdnifi-distributed-cache-client-service/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-distributed-cache-client-service-api/artifactId -version0.0.1-incubating/version +
Git Push Summary
Repository: incubator-nifi Updated Branches: refs/heads/nifi-270-release-setup [deleted] c91d875f3
[3/3] incubator-nifi git commit: Merge branch 'NIFI-270-RC3'
Merge branch 'NIFI-270-RC3' Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e713258b Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e713258b Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e713258b Branch: refs/heads/master Commit: e713258be3c2aa2dc75d860bb14d238268e8dc96 Parents: d2c1144 418e932 Author: joewitt joew...@apache.org Authored: Fri Jan 30 22:48:18 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 30 22:48:18 2015 -0500 -- nifi/nifi-api/pom.xml | 4 +- nifi/nifi-assembly/pom.xml | 4 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../nifi-data-provenance-utils/pom.xml | 4 +- .../nifi-expression-language/pom.xml| 4 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 4 +- nifi/nifi-commons/nifi-logging-utils/pom.xml| 4 +- .../nifi-processor-utilities/pom.xml| 4 +- nifi/nifi-commons/nifi-properties/pom.xml | 4 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-web-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 4 +- nifi/nifi-commons/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- nifi/nifi-mock/pom.xml | 4 +- .../nifi-framework-nar/pom.xml | 4 +- .../nifi-framework/nifi-administration/pom.xml | 4 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-cluster-protocol/pom.xml | 2 +- .../nifi-framework/nifi-cluster-web/pom.xml | 2 +- .../nifi-framework/nifi-cluster/pom.xml | 2 +- .../nifi-file-authorization-provider/pom.xml| 4 +- .../nifi-framework-core-api/pom.xml | 4 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/pom.xml | 2 +- .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml| 4 +- .../nifi-framework/nifi-site-to-site/pom.xml| 4 +- .../nifi-framework/nifi-user-actions/pom.xml| 4 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-framework/nifi-web/pom.xml | 10 +-- .../nifi-framework/pom.xml | 4 +- .../nifi-framework-bundle/pom.xml | 36 +-- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 4 +- .../nifi-hdfs-processors/pom.xml| 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 +- .../nifi-hadoop-libraries-nar/pom.xml | 4 +- .../nifi-hadoop-libraries-bundle/pom.xml| 4 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 4 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml| 4 +- .../nifi-kafka-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml | 4 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 8 +-- .../nifi-standard-nar/pom.xml | 4 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml| 2 +- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml| 10 +-- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 4 +- .../pom.xml | 4 +- .../nifi-load-distribution-service-api/pom.xml | 4 +- .../nifi-ssl-context-nar/pom.xml| 4 +- .../nifi-ssl-context-service/pom.xml| 2 +- .../nifi-ssl-context-bundle/pom.xml | 4 +- .../nifi-ssl-context-service-api/pom.xml| 2 +- .../nifi-standard-services-api-nar/pom.xml | 4 +- .../nifi-standard-services/pom.xml | 4 +- .../nifi-update-attribute-model/pom.xml | 2
[2/3] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/418e932c Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/418e932c Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/418e932c Branch: refs/heads/master Commit: 418e932ce68b7f21a4ac900e3223972b20edd487 Parents: 3a76259 Author: joewitt joew...@apache.org Authored: Fri Jan 23 01:36:35 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 23 01:36:35 2015 -0500 -- nifi/nifi-api/pom.xml | 4 +- nifi/nifi-assembly/pom.xml | 4 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../nifi-data-provenance-utils/pom.xml | 4 +- .../nifi-expression-language/pom.xml| 4 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 4 +- nifi/nifi-commons/nifi-logging-utils/pom.xml| 4 +- .../nifi-processor-utilities/pom.xml| 4 +- nifi/nifi-commons/nifi-properties/pom.xml | 4 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-web-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 4 +- nifi/nifi-commons/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- nifi/nifi-mock/pom.xml | 4 +- .../nifi-framework-nar/pom.xml | 4 +- .../nifi-framework/nifi-administration/pom.xml | 4 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-cluster-protocol/pom.xml | 2 +- .../nifi-framework/nifi-cluster-web/pom.xml | 2 +- .../nifi-framework/nifi-cluster/pom.xml | 2 +- .../nifi-file-authorization-provider/pom.xml| 4 +- .../nifi-framework-core-api/pom.xml | 4 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/pom.xml | 2 +- .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml| 4 +- .../nifi-framework/nifi-site-to-site/pom.xml| 4 +- .../nifi-framework/nifi-user-actions/pom.xml| 4 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-framework/nifi-web/pom.xml | 10 +-- .../nifi-framework/pom.xml | 4 +- .../nifi-framework-bundle/pom.xml | 36 +-- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 4 +- .../nifi-hdfs-processors/pom.xml| 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 +- .../nifi-hadoop-libraries-nar/pom.xml | 4 +- .../nifi-hadoop-libraries-bundle/pom.xml| 4 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 4 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml| 4 +- .../nifi-kafka-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml | 4 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 8 +-- .../nifi-standard-nar/pom.xml | 4 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml| 2 +- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml| 10 +-- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 4 +- .../pom.xml | 4 +- .../nifi-load-distribution-service-api/pom.xml | 4 +- .../nifi-ssl-context-nar/pom.xml| 4 +- .../nifi-ssl-context-service/pom.xml| 2 +- .../nifi-ssl-context-bundle/pom.xml | 4 +- .../nifi-ssl-context-service-api/pom.xml| 2 +- .../nifi-standard-services-api-nar/pom.xml | 4 +- .../nifi-standard-services/pom.xml | 4 +- .../nifi-update-attribute-model/pom.xml
[16/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
deleted file mode 100644
index 81bb7a7..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.cluster.manager.impl;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
-import org.apache.nifi.cluster.manager.HttpRequestReplicator;
-import org.apache.nifi.cluster.manager.NodeResponse;
-import org.apache.nifi.cluster.manager.exception.UriConstructionException;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.logging.NiFiLog;
-import org.apache.nifi.util.FormatUtils;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * An implementation of the codeHttpRequestReplicator/code interface. This
- * implementation parallelizes the node HTTP requests using the given
- * codeExecutorService/code instance. Individual requests may have
- * connection and read timeouts set, which may be set during instance
- * construction. Otherwise, the default is not to timeout.
- *
- * If a node protocol scheme is provided during construction, then all requests
- * will be replicated using the given scheme. If null is provided as the scheme
- * (the default), then the requests will be replicated using the scheme of the
- * original URI.
- *
- * Clients must call start() and stop() to initialize and shutdown the
instance.
- * The instance must be started before issuing any replication requests.
- *
- * @author unattributed
- */
-public class HttpRequestReplicatorImpl implements HttpRequestReplicator {
-
-// defaults
-private static final int DEFAULT_SHUTDOWN_REPLICATOR_SECONDS = 30;
-
-// logger
-private static final Logger logger = new
NiFiLog(LoggerFactory.getLogger(HttpRequestReplicatorImpl.class));
-
-// final members
-private final Client client;// the client to use for issuing
requests
-private final int numThreads; // number of threads to use for
request replication
-private final int connectionTimeoutMs; // connection timeout per node
request
-private final int readTimeoutMs;// read timeout per node request
-
-// members
-private ExecutorService executorService;
-private int shutdownReplicatorSeconds =
DEFAULT_SHUTDOWN_REPLICATOR_SECONDS;
-
-// guarded by synchronized method access in support of multithreaded
replication
-private String nodeProtocolScheme = null;
-
-/**
- * Creates an instance.
[19/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
deleted file mode 100644
index ec1f26d..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.cluster.protocol.impl;
-
-import org.apache.nifi.cluster.protocol.impl.ClusterServicesBroadcaster;
-import org.apache.nifi.cluster.protocol.impl.MulticastProtocolListener;
-import java.net.InetSocketAddress;
-import org.apache.nifi.cluster.protocol.ProtocolContext;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
-import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.message.ServiceBroadcastMessage;
-import org.apache.nifi.io.socket.multicast.DiscoverableService;
-import org.apache.nifi.io.socket.multicast.DiscoverableServiceImpl;
-import org.apache.nifi.io.socket.multicast.MulticastConfiguration;
-import org.junit.After;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author unattributed
- */
-public class ClusterServicesBroadcasterTest {
-
-private ClusterServicesBroadcaster broadcaster;
-
-private MulticastProtocolListener listener;
-
-private DummyProtocolHandler handler;
-
-private InetSocketAddress multicastAddress;
-
-private DiscoverableService broadcastedService;
-
-private ProtocolContext protocolContext;
-
-private MulticastConfiguration configuration;
-
-@Before
-public void setup() throws Exception {
-
-broadcastedService = new DiscoverableServiceImpl(some-service, new
InetSocketAddress(localhost, 1));
-
-multicastAddress = new InetSocketAddress(225.1.1.1, 2);
-
-configuration = new MulticastConfiguration();
-
-protocolContext = new
JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
-
-broadcaster = new ClusterServicesBroadcaster(multicastAddress,
configuration, protocolContext, 500 ms);
-broadcaster.addService(broadcastedService);
-
-handler = new DummyProtocolHandler();
-listener = new MulticastProtocolListener(5, multicastAddress,
configuration, protocolContext);
-listener.addHandler(handler);
-}
-
-@After
-public void teardown() {
-
-if(broadcaster.isRunning()) {
-broadcaster.stop();
-}
-
-try {
-if(listener.isRunning()) {
-listener.stop();
-}
-} catch(Exception ex) {
-ex.printStackTrace(System.out);
-}
-
-}
-
-@Ignore(fails needs to be fixed)
-@Test
-public void testBroadcastReceived() throws Exception {
-
-broadcaster.start();
-listener.start();
-
-Thread.sleep(1000);
-
-listener.stop();
-
-assertNotNull(handler.getProtocolMessage());
-assertEquals(ProtocolMessage.MessageType.SERVICE_BROADCAST,
handler.getProtocolMessage().getType());
-final ServiceBroadcastMessage msg = (ServiceBroadcastMessage)
handler.getProtocolMessage();
-assertEquals(broadcastedService.getServiceName(),
msg.getServiceName());
-
[09/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
deleted file mode 100644
index 4afdfb7..000
---
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.remote;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.nifi.connectable.Port;
-import org.apache.nifi.remote.exception.BadRequestException;
-import org.apache.nifi.remote.exception.NotAuthorizedException;
-import org.apache.nifi.remote.exception.RequestExpiredException;
-import org.apache.nifi.remote.protocol.ServerProtocol;
-
-public interface RootGroupPort extends Port {
-
-boolean isTransmitting();
-
-void setGroupAccessControl(SetString groups);
-
-SetString getGroupAccessControl();
-
-void setUserAccessControl(SetString users);
-
-SetString getUserAccessControl();
-
-/**
- * Verifies that the specified user is authorized to interact with this
port
- * and returns a {@link PortAuthorizationResult} indicating why the user is
- * unauthorized if this assumption fails
- *
- * @param dn
- * @return
- */
-PortAuthorizationResult checkUserAuthorization(String dn);
-
-/**
- * Receives data from the given stream
- *
- * @param peer
- * @param serverProtocol
- * @param requestHeaders
- *
- * @return the number of FlowFiles received
- * @throws org.apache.nifi.remote.exception.NotAuthorizedException
- * @throws org.apache.nifi.remote.exception.BadRequestException
- * @throws org.apache.nifi.remote.exception.RequestExpiredException
- */
-int receiveFlowFiles(Peer peer, ServerProtocol serverProtocol, MapString,
String requestHeaders) throws NotAuthorizedException, BadRequestException,
RequestExpiredException;
-
-/**
- * Transfers data to the given stream
- *
- * @param peer
- * @param requestHeaders
- * @param serverProtocol
- *
- * @return the number of FlowFiles transferred
- * @throws org.apache.nifi.remote.exception.NotAuthorizedException
- * @throws org.apache.nifi.remote.exception.BadRequestException
- * @throws org.apache.nifi.remote.exception.RequestExpiredException
- */
-int transferFlowFiles(Peer peer, ServerProtocol serverProtocol,
MapString, String requestHeaders) throws NotAuthorizedException,
BadRequestException, RequestExpiredException;
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
deleted file mode 100644
index 56432d5..000
---
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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
[26/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
deleted file mode 100644
index b1ead42..000
---
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.web.api.dto.provenance;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.nifi.web.api.dto.util.TimestampAdapter;
-
-/**
- * A provenance event.
- */
-@XmlType(name = provenanceEvent)
-public class ProvenanceEventDTO {
-
-private String id;
-
-// in search results table
-private Long eventId;
-private Date eventTime;
-private Long eventDuration;
-private Long lineageDuration;
-private String eventType;
-private String flowFileUuid;
-private String fileSize;
-private Long fileSizeBytes;
-private String clusterNodeId;// include when clustered
-private String clusterNodeAddress; // include when clustered
-
-private String groupId;
-private String componentId;
-private String componentType;
-private String componentName;
-private String sourceSystemFlowFileId;
-private String alternateIdentifierUri;
-private CollectionAttributeDTO attributes;
-private ListString parentUuids;
-private ListString childUuids;
-
-private String transitUri;
-
-private String relationship;
-private String details;
-
-// content
-private Boolean contentEqual;
-private Boolean inputContentAvailable;
-private String inputContentClaimSection;
-private String inputContentClaimContainer;
-private String inputContentClaimIdentifier;
-private Long inputContentClaimOffset;
-private String inputContentClaimFileSize;
-private Long inputContentClaimFileSizeBytes;
-private Boolean outputContentAvailable;
-private String outputContentClaimSection;
-private String outputContentClaimContainer;
-private String outputContentClaimIdentifier;
-private Long outputContentClaimOffset;
-private String outputContentClaimFileSize;
-private Long outputContentClaimFileSizeBytes;
-
-// replay
-private Boolean replayAvailable;
-private String replayExplanation;
-private String sourceConnectionIdentifier;
-
-/**
- * The event uuid.
- *
- * @return
- */
-public String getId() {
-return id;
-}
-
-public void setId(String id) {
-this.id = id;
-}
-
-/**
- * The event id.
- *
- * @return
- */
-public Long getEventId() {
-return eventId;
-}
-
-public void setEventId(Long eventId) {
-this.eventId = eventId;
-}
-
-/**
- * The time the event occurred.
- *
- * @return
- */
-@XmlJavaTypeAdapter(TimestampAdapter.class)
-public Date getEventTime() {
-return eventTime;
-}
-
-public void setEventTime(Date eventTime) {
-this.eventTime = eventTime;
-}
-
-/**
- * The UUID of the FlowFile for this event.
- *
- * @return
- */
-public String getFlowFileUuid() {
-return flowFileUuid;
-}
-
-public void setFlowFileUuid(String flowFileUuid) {
-this.flowFileUuid = flowFileUuid;
-}
-
-/**
- * The size of the FlowFile for this event.
- *
- * @return
- */
-public String getFileSize() {
-return fileSize;
-}
-
-public void setFileSize(String fileSize) {
-this.fileSize = fileSize;
-}
-
-/**
- * The size of the
[27/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
deleted file mode 100644
index df59b13..000
---
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.web.api.dto;
-
-import java.util.Date;
-import java.util.List;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * Details of a remote process group in this NiFi.
- */
-@XmlType(name = remoteProcessGroup)
-public class RemoteProcessGroupDTO extends NiFiComponentDTO {
-
-private String targetUri;
-private Boolean targetSecure;
-
-private String name;
-private String comments;
-private String communicationsTimeout;
-private String yieldDuration;
-
-private ListString authorizationIssues;
-private Boolean transmitting;
-
-private Integer inputPortCount;
-private Integer outputPortCount;
-
-private Integer activeRemoteInputPortCount;
-private Integer inactiveRemoteInputPortCount;
-private Integer activeRemoteOutputPortCount;
-private Integer inactiveRemoteOutputPortCount;
-
-private Date flowRefreshed;
-
-private RemoteProcessGroupContentsDTO contents;
-
-public RemoteProcessGroupDTO() {
-super();
-}
-
-public RemoteProcessGroupDTO(final RemoteProcessGroupDTO toCopy) {
-setId(toCopy.getId());
-setPosition(toCopy.getPosition());
-targetUri = toCopy.getTargetUri();
-name = toCopy.getName();
-}
-
-public void setTargetUri(final String targetUri) {
-this.targetUri = targetUri;
-}
-
-/**
- * The target uri of this remote process group.
- *
- * @return
- */
-public String getTargetUri() {
-return this.targetUri;
-}
-
-/**
- * The name of this remote process group.
- *
- * @param name
- */
-public void setName(final String name) {
-this.name = name;
-}
-
-public String getName() {
-return this.name;
-}
-
-/**
- * Comments for this remote process group.
- *
- * @return
- */
-public String getComments() {
-return comments;
-}
-
-public void setComments(String comments) {
-this.comments = comments;
-}
-
-/**
- * Returns any remote authorization issues for this remote process group.
- *
- * @return
- */
-public ListString getAuthorizationIssues() {
-return authorizationIssues;
-}
-
-public void setAuthorizationIssues(ListString authorizationIssues) {
-this.authorizationIssues = authorizationIssues;
-}
-
-/**
- * Whether or not this remote process group is actively transmitting.
- *
- * @return
- */
-public Boolean isTransmitting() {
-return transmitting;
-}
-
-public void setTransmitting(Boolean transmitting) {
-this.transmitting = transmitting;
-}
-
-/**
- * Whether or not the target is running securely.
- *
- * @return
- */
-public Boolean isTargetSecure() {
-return targetSecure;
-}
-
-public void setTargetSecure(Boolean targetSecure) {
-this.targetSecure = targetSecure;
-}
-
-/**
- * Returns the time period used for the timeout when communicating with
this
- * RemoteProcessGroup.
- *
- * @return
- */
-public String getCommunicationsTimeout() {
-return communicationsTimeout;
-}
-
-public void setCommunicationsTimeout(String communicationsTimeout) {
-
[14/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
deleted file mode 100644
index 84565da..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.cluster.node;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.nifi.cluster.HeartbeatPayload;
-import org.apache.nifi.cluster.protocol.Heartbeat;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Represents a connected flow controller. Nodes always have an immutable
- * identifier and a status. The status may be changed, but never null.
- *
- * A Node may be cloned, but the cloning is a shallow copy of the instance.
- *
- * This class overrides hashCode and equals and considers two instances to be
- * equal if they have the equal NodeIdentifiers.
- *
- * @author unattributed
- */
-public class Node implements Cloneable, ComparableNode {
-
-private static final Logger lockLogger =
LoggerFactory.getLogger(cluster.lock);
-
-/**
- * The semantics of a Node status are as follows:
- * ul
- * liCONNECTED -- a flow controller that is connected to the cluster. A
- * connecting node transitions to connected after the cluster receives the
- * flow controller's first heartbeat. A connected node can transition to
- * disconnecting./li
- * liCONNECTING -- a flow controller has issued a connection request to
- * the cluster, but has not yet sent a heartbeat. A connecting node can
- * transition to disconnecting or connected. The cluster will not accept
any
- * external requests to change the flow while any node is connecting./li
- * liDISCONNECTED -- a flow controller that is not connected to the
- * cluster. A disconnected node can transition to connecting./li
- * liDISCONNECTING -- a flow controller that is in the process of
- * disconnecting from the cluster. A disconnecting node will always
- * transition to disconnected./li
- * /ul
- */
-public static enum Status {
-
-CONNECTED,
-CONNECTING,
-DISCONNECTED,
-DISCONNECTING
-}
-
-/**
- * the node's unique identifier
- */
-private final NodeIdentifier nodeId;
-
-/**
- * the node statue
- */
-private Status status;
-
-/**
- * the last heartbeat received by from the node
- */
-private Heartbeat lastHeartbeat;
-
-/**
- * the payload of the last heartbeat received from the node
- */
-private HeartbeatPayload lastHeartbeatPayload;
-
-/**
- * the last time the connection for this node was requested
- */
-private AtomicLong connectionRequestedTimestamp = new AtomicLong(0L);
-
-/**
- * a flag to indicate this node was disconnected because of a lack of
- * heartbeat
- */
-private boolean heartbeatDisconnection;
-
-public Node(final NodeIdentifier id, final Status status) {
-if (id == null) {
-throw new IllegalArgumentException(ID may not be null.);
-} else if (status == null) {
-throw new IllegalArgumentException(Status may not be null.);
-}
-this.nodeId = id;
-this.status = status;
-}
-
-public NodeIdentifier getNodeId() {
-return nodeId;
-}
-
-/**
- * Returns the last received heartbeat or null if no heartbeat has been
set.
- *
- * @return a heartbeat or null
- */
-public Heartbeat getHeartbeat() {
-return lastHeartbeat;
-}
-
-public HeartbeatPayload getHeartbeatPayload() {
-return
[44/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
--
diff --git
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
deleted file mode 100644
index 0665979..000
---
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.attribute.expression.language.evaluation.functions;
-
-import java.util.Map;
-
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-
-public class MinusEvaluator extends NumberEvaluator {
-
-private final NumberEvaluator subject;
-private final NumberEvaluator minusValue;
-
-public MinusEvaluator(final NumberEvaluator subject, final NumberEvaluator
minusValue) {
-this.subject = subject;
-this.minusValue = minusValue;
-}
-
-@Override
-public QueryResultLong evaluate(final MapString, String attributes) {
-final Long subjectValue = subject.evaluate(attributes).getValue();
-if (subjectValue == null) {
-return new NumberQueryResult(null);
-}
-
-final Long minus = minusValue.evaluate(attributes).getValue();
-if (minus == null) {
-return new NumberQueryResult(null);
-}
-
-final long result = subjectValue - minus;
-return new NumberQueryResult(result);
-}
-
-@Override
-public Evaluator? getSubjectEvaluator() {
-return subject;
-}
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
--
diff --git
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
deleted file mode 100644
index 6b7b838..000
---
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.attribute.expression.language.evaluation.functions;
-
-import java.util.Map;
-
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
-import
[28/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
deleted file mode 100644
index 9e15fc1..000
---
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.web.api.dto;
-
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Configuration details for a NiFi controller. Primary use of this DTO is for
- * consumption by a remote NiFi instance to initiate site to site
- * communications.
- */
-@XmlType(name = controller)
-public class ControllerDTO {
-
-private String id;
-private String name;
-private String comments;
-
-private Integer runningCount;
-private Integer stoppedCount;
-private Integer invalidCount;
-private Integer disabledCount;
-private Integer activeRemotePortCount;
-private Integer inactiveRemotePortCount;
-
-private Integer inputPortCount;
-private Integer outputPortCount;
-
-private Integer remoteSiteListeningPort;
-private Boolean siteToSiteSecure;
-private String instanceId;
-private SetPortDTO inputPorts;
-private SetPortDTO outputPorts;
-
-/**
- * The id of this NiFi controller.
- *
- * @return
- */
-public String getId() {
-return id;
-}
-
-public void setId(String id) {
-this.id = id;
-}
-
-/**
- * The name of this NiFi controller.
- *
- * @return The name of this controller
- */
-public String getName() {
-return name;
-}
-
-public void setName(String name) {
-this.name = name;
-}
-
-/**
- * The comments of this NiFi controller.
- *
- * @return
- */
-public String getComments() {
-return comments;
-}
-
-public void setComments(String comments) {
-this.comments = comments;
-}
-
-/**
- * The input ports available to send data to this NiFi controller.
- *
- * @return
- */
-public SetPortDTO getInputPorts() {
-return inputPorts;
-}
-
-public void setInputPorts(SetPortDTO inputPorts) {
-this.inputPorts = inputPorts;
-}
-
-/**
- * The output ports available to received data from this NiFi controller.
- *
- * @return
- */
-public SetPortDTO getOutputPorts() {
-return outputPorts;
-}
-
-public void setOutputPorts(SetPortDTO outputPorts) {
-this.outputPorts = outputPorts;
-}
-
-/**
- * The Instance ID of the cluster, if this node is connected to a Cluster
- * Manager, or of this individual instance of in standalone mode
- *
- * @return
- */
-public String getInstanceId() {
-return instanceId;
-}
-
-public void setInstanceId(String instanceId) {
-this.instanceId = instanceId;
-}
-
-/**
- * The Socket Port on which this instance is listening for Remote Transfers
- * of Flow Files. If this instance is not configured to receive Flow Files
- * from remote instances, this will be null.
- *
- * @return a integer between 1 and 65535, or null, if not configured for
- * remote transfer
- */
-public Integer getRemoteSiteListeningPort() {
-return remoteSiteListeningPort;
-}
-
-public void setRemoteSiteListeningPort(final Integer port) {
-this.remoteSiteListeningPort = port;
-}
-
-/**
- * Indicates whether or not Site-to-Site communications with this instance
- * is secure (2-way authentication)
- *
- * @return
- */
-public Boolean isSiteToSiteSecure() {
-return siteToSiteSecure;
-}
-
-public void setSiteToSiteSecure(Boolean
[58/62] [abbrv] incubator-nifi git commit: NIFI 270 updating nar version
NIFI 270 updating nar version Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/0b692b1d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0b692b1d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0b692b1d Branch: refs/heads/master Commit: 0b692b1d8205007a796b41b5df692e00d68addc4 Parents: 4431d9c Author: joewitt joew...@apache.org Authored: Fri Jan 23 01:30:27 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 23 01:30:27 2015 -0500 -- nifi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/0b692b1d/nifi/pom.xml -- diff --git a/nifi/pom.xml b/nifi/pom.xml index 9dac476..fb94135 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -973,7 +973,7 @@ plugin groupIdorg.apache.nifi/groupId artifactIdnifi-nar-maven-plugin/artifactId -version1.0.0-incubating-SNAPSHOT/version +version1.0.0-incubating/version extensionstrue/extensions /plugin /plugins
[57/62] [abbrv] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4431d9c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4431d9c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4431d9c2 Branch: refs/heads/master Commit: 4431d9c2cf8b3e77c566718d941ef6f0ef581414 Parents: 6e69d99 Author: joewitt joew...@apache.org Authored: Fri Jan 23 01:28:41 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 23 01:28:41 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4431d9c2/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index d032da7..79e437e 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-maven-plugin/artifactId -version1.0.0-incubating/version +version1.0.1-incubating-SNAPSHOT/version packagingmaven-plugin/packaging descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description urlhttp://nifi.incubator.apache.org/maven-site//url @@ -58,7 +58,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag +tagHEAD/tag /scm issueManagement systemJIRA/system
[08/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
deleted file mode 100644
index f36a459..000
---
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.nifi.connectable.Connectable;
-import org.apache.nifi.connectable.Connection;
-import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.util.Connectables;
-
-public class EventDrivenWorkerQueue implements WorkerQueue {
-
-private final Object workMonitor = new Object();
-
-private final MapConnectable, Worker workerMap = new HashMap(); //
protected by synchronizing on workMonitor
-private final WorkerReadyQueue workerQueue;
-
-public EventDrivenWorkerQueue(final boolean clustered, final boolean
primary, final ProcessScheduler scheduler) {
-workerQueue = new WorkerReadyQueue(scheduler);
-workerQueue.setClustered(clustered);
-workerQueue.setPrimary(primary);
-}
-
-@Override
-public void setClustered(final boolean clustered) {
-workerQueue.setClustered(clustered);
-}
-
-@Override
-public void setPrimary(final boolean primary) {
-workerQueue.setPrimary(primary);
-}
-
-@Override
-public Worker poll(final long timeout, final TimeUnit timeUnit) {
-final long maxTime = System.currentTimeMillis() +
TimeUnit.MILLISECONDS.convert(timeout, timeUnit);
-while (System.currentTimeMillis() maxTime) {
-synchronized (workMonitor) {
-final Worker worker = workerQueue.poll();
-if (worker == null) {
-// nothing to do. wait until we have something to do.
-final long timeLeft = maxTime - System.currentTimeMillis();
-if (timeLeft = 0) {
-return null;
-}
-
-try {
-workMonitor.wait(timeLeft);
-} catch (final InterruptedException ignored) {
-}
-} else {
-// Decrement the amount of work there is to do for this
worker.
-final int workLeft = worker.decrementEventCount();
-if (workLeft 0) {
-workerQueue.offer(worker);
-}
-
-return worker;
-}
-}
-}
-
-return null;
-}
-
-@Override
-public void offer(final Connectable connectable) {
-synchronized (workMonitor) {
-Worker worker = workerMap.get(connectable);
-if (worker == null) {
-// if worker is null, then it has not been scheduled to run;
ignore the event.
-return;
-}
-
-final int countBefore = worker.incrementEventCount();
-if (countBefore 0) {
-worker.setWorkCount(1);
-}
-if (countBefore = 0) {
-// If countBefore 0 then it's already on the queue, so just
incrementing its counter is sufficient.
-workerQueue.offer(worker);
-}
-
-workMonitor.notify();
-}
-}
-
-private int getWorkCount(final Connectable connectable) {
-int sum = 0;
-for (final Connection connection :
connectable.getIncomingConnections()) {
-
svn commit: r1656147 - /incubator/nifi/site/trunk/content/downloads/index.md
Author: joewitt Date: Sat Jan 31 03:27:57 2015 New Revision: 1656147 URL: http://svn.apache.org/r1656147 Log: fixing indent Modified: incubator/nifi/site/trunk/content/downloads/index.md Modified: incubator/nifi/site/trunk/content/downloads/index.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/downloads/index.md?rev=1656147r1=1656146r2=1656147view=diff == --- incubator/nifi/site/trunk/content/downloads/index.md (original) +++ incubator/nifi/site/trunk/content/downloads/index.md Sat Jan 31 03:27:57 2015 @@ -12,9 +12,9 @@ If a download is not found please allow Releases * 0.0.1-incubating - * [Release Notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329078) - * Sources: - * [nifi-0.0.1-incubating-source-release.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip) ( [asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc), [md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5), [sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1) ) - * Binaries: - * [nifi-0.0.1-incubating-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz) ( [asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.asc), [md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.md5), [sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.sha1) ) - * [nifi-0.0.1-incubating-bin.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip) ( [asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.asc), [md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.md5), [sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.sha1) ) \ No newline at end of file +* [Release Notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329078) +* Sources: +* [nifi-0.0.1-incubating-source-release.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip) ( [asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc), [md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5), [sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1) ) +* Binaries: +* [nifi-0.0.1-incubating-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz) ( [asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.asc), [md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.md5), [sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.sha1) ) +* [nifi-0.0.1-incubating-bin.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip) ( [asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.asc), [md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.md5), [sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.sha1) ) \ No newline at end of file
svn commit: r938448 - /websites/production/nifi/content/
Author: joewitt Date: Sat Jan 31 03:26:19 2015 New Revision: 938448 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r938447, websites/staging/nifi/trunk/content/
[56/62] [abbrv] incubator-nifi git commit: NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3
NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6e69d994 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6e69d994 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6e69d994 Branch: refs/heads/master Commit: 6e69d99444e22772df300cd777096dc21a7c8e35 Parents: 43e646e Author: joewitt joew...@apache.org Authored: Fri Jan 23 01:28:31 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 23 01:28:31 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6e69d994/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index c0f3583..d032da7 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-maven-plugin/artifactId -version1.0.0-incubating-SNAPSHOT/version +version1.0.0-incubating/version packagingmaven-plugin/packaging descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description urlhttp://nifi.incubator.apache.org/maven-site//url @@ -58,7 +58,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagHEAD/tag +tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag /scm issueManagement systemJIRA/system
[06/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
deleted file mode 100644
index c67181a..000
---
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.controller;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.nifi.connectable.Size;
-import org.apache.nifi.encrypt.StringEncryptor;
-import org.apache.nifi.groups.RemoteProcessGroupPortDescriptor;
-import org.apache.nifi.remote.StandardRemoteProcessGroupPortDescriptor;
-import org.apache.nifi.scheduling.SchedulingStrategy;
-import org.apache.nifi.util.DomUtils;
-import org.apache.nifi.web.api.dto.ConnectableDTO;
-import org.apache.nifi.web.api.dto.ConnectionDTO;
-import org.apache.nifi.web.api.dto.FlowSnippetDTO;
-import org.apache.nifi.web.api.dto.FunnelDTO;
-import org.apache.nifi.web.api.dto.LabelDTO;
-import org.apache.nifi.web.api.dto.PortDTO;
-import org.apache.nifi.web.api.dto.PositionDTO;
-import org.apache.nifi.web.api.dto.ProcessGroupDTO;
-import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
-import org.apache.nifi.web.api.dto.ProcessorDTO;
-import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class FlowFromDOMFactory {
-
-public static PositionDTO getPosition(final Element positionElement) {
-if (positionElement == null) {
-throw new IllegalArgumentException(Invalid Flow: Found no
'position' element);
-}
-return new
PositionDTO(Double.parseDouble(positionElement.getAttribute(x)),
Double.parseDouble(positionElement.getAttribute(y)));
-}
-
-public static Size getSize(final Element sizeElement) {
-if (sizeElement == null) {
-throw new IllegalArgumentException(Invalid Flow: Found no 'size'
element);
-}
-
-return new Size(Double.parseDouble(sizeElement.getAttribute(width)),
Double.parseDouble(sizeElement.getAttribute(height)));
-}
-
-public static MapString, String getStyle(final Element stylesElement) {
-final MapString, String styles = new HashMap();
-if (stylesElement == null) {
-return styles;
-}
-
-for (final Element styleElement : getChildrenByTagName(stylesElement,
style)) {
-final String styleName = styleElement.getAttribute(name);
-final String styleValue = styleElement.getTextContent();
-styles.put(styleName, styleValue);
-}
-
-return styles;
-}
-
-public static ProcessGroupDTO getProcessGroup(final String parentId, final
Element element, final StringEncryptor encryptor) {
-final ProcessGroupDTO dto = new ProcessGroupDTO();
-final String groupId = getString(element, id);
-dto.setId(groupId);
-dto.setParentGroupId(parentId);
-dto.setName(getString(element, name));
-dto.setPosition(getPosition(DomUtils.getChild(element, position)));
-dto.setComments(getString(element, comment));
-
-final SetProcessorDTO processors = new HashSet();
-final SetConnectionDTO connections = new HashSet();
-final SetFunnelDTO funnels = new HashSet();
-final SetPortDTO inputPorts = new HashSet();
-final SetPortDTO outputPorts = new HashSet();
-final SetLabelDTO labels = new HashSet();
-final SetProcessGroupDTO processGroups = new HashSet();
-final SetRemoteProcessGroupDTO remoteProcessGroups = new HashSet();
-
-
[05/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
deleted file mode 100644
index d459b00..000
---
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
+++ /dev/null
@@ -1,875 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.controller;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.nifi.cluster.ConnectionException;
-import org.apache.nifi.cluster.protocol.ConnectionRequest;
-import org.apache.nifi.cluster.protocol.ConnectionResponse;
-import org.apache.nifi.cluster.protocol.DataFlow;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.StandardDataFlow;
-import org.apache.nifi.cluster.protocol.UnknownServiceAddressException;
-import org.apache.nifi.cluster.protocol.impl.NodeProtocolSenderListener;
-import org.apache.nifi.cluster.protocol.message.ConnectionRequestMessage;
-import
org.apache.nifi.cluster.protocol.message.ControllerStartupFailureMessage;
-import org.apache.nifi.cluster.protocol.message.DisconnectMessage;
-import org.apache.nifi.cluster.protocol.message.FlowRequestMessage;
-import org.apache.nifi.cluster.protocol.message.FlowResponseMessage;
-import org.apache.nifi.cluster.protocol.message.PrimaryRoleAssignmentMessage;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionFailureMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionRequestMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionResponseMessage;
-import org.apache.nifi.engine.FlowEngine;
-import org.apache.nifi.events.BulletinFactory;
-import org.apache.nifi.util.file.FileUtils;
-import org.apache.nifi.groups.ProcessGroup;
-import org.apache.nifi.lifecycle.LifeCycleStartException;
-import org.apache.nifi.logging.LogLevel;
-import org.apache.nifi.persistence.FlowConfigurationDAO;
-import org.apache.nifi.persistence.StandardXMLFlowConfigurationDAO;
-import org.apache.nifi.reporting.Bulletin;
-import org.apache.nifi.services.FlowService;
-import org.apache.nifi.util.FormatUtils;
-import org.apache.nifi.util.NiFiProperties;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.nifi.encrypt.StringEncryptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class StandardFlowService implements FlowService, ProtocolHandler {
-
-private static final String EVENT_CATEGORY = Controller;
-
-private final FlowController controller;
-private final Path flowXml;
-private final Path taskConfigXml;
-private final Path serviceConfigXml;
-private final FlowConfigurationDAO dao;
-private final int gracefulShutdownSeconds;
-private final boolean autoResumeState;
-private final int connectionRetryMillis;
-private final StringEncryptor encryptor;
-
-// Lock is used to protect the flow.xml file.
-private final
[54/62] [abbrv] incubator-nifi git commit: NIFI 270 fixed organization and excluded DEPENDENCIES from rat check
NIFI 270 fixed organization and excluded DEPENDENCIES from rat check Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f85b8714 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f85b8714 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f85b8714 Branch: refs/heads/master Commit: f85b8714a10dd314c07de8f2150945c0b6191e88 Parents: 2f4727d Author: joewitt joew...@apache.org Authored: Fri Jan 23 01:25:59 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 23 01:25:59 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f85b8714/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index cb59c13..c0f3583 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -29,8 +29,8 @@ descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description urlhttp://nifi.incubator.apache.org/maven-site//url organization -nameApache NiFi (incubating) Project/name -urlhttp://nifi.incubating.apache.org//url +nameApache NiFi (incubating)/name +urlhttp://nifi.incubator.apache.org//url /organization licenses license @@ -208,6 +208,7 @@ excludes excludenb-configuration.xml/exclude excludenbactions.xml/exclude +excludeDEPENDENCIES/exclude /excludes /configuration /plugin
[59/62] [abbrv] incubator-nifi git commit: NIFI-270 prepare release nifi-0.0.1-incubating-RC3
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml index 0941cd9..a3e3fc9 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml @@ -17,10 +17,10 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /parent artifactIdnifi-update-attribute-nar/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version packagingnar/packaging dependencies http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml index a39ab34..64215c6 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml index e1962d2..70aefc6 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /parent artifactIdnifi-update-attribute-ui/artifactId packagingwar/packaging http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml index ef74687..e20e77b 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml @@ -18,11 +18,11 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-bundles/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /parent artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version packagingpom/packaging modules @@ -37,18 +37,18 @@ dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-model/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-ui/artifactId typewar/type -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /dependency /dependencies /dependencyManagement http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/pom.xml -- diff --git a/nifi/nifi-nar-bundles/pom.xml
[1/5] Git Push Summary
Repository: incubator-nifi Updated Branches: refs/heads/develop 21619da1b - 037f36dd9
[07/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java -- diff --git a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java deleted file mode 100644 index 346e801..000 --- a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java +++ /dev/null @@ -1,3579 +0,0 @@ -/* - * 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. - */ -package org.apache.nifi.controller; - -import static java.util.Objects.requireNonNull; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import javax.net.ssl.SSLContext; - -import org.apache.nifi.admin.service.UserService; -import org.apache.nifi.cluster.BulletinsPayload; -import org.apache.nifi.cluster.HeartbeatPayload; -import org.apache.nifi.cluster.protocol.DataFlow; -import org.apache.nifi.cluster.protocol.Heartbeat; -import org.apache.nifi.cluster.protocol.NodeBulletins; -import org.apache.nifi.cluster.protocol.NodeIdentifier; -import org.apache.nifi.cluster.protocol.NodeProtocolSender; -import org.apache.nifi.cluster.protocol.UnknownServiceAddressException; -import org.apache.nifi.cluster.protocol.message.HeartbeatMessage; -import org.apache.nifi.cluster.protocol.message.NodeBulletinsMessage; -import org.apache.nifi.connectable.Connectable; -import org.apache.nifi.connectable.ConnectableType; -import org.apache.nifi.connectable.Connection; -import org.apache.nifi.connectable.Funnel; -import org.apache.nifi.connectable.LocalPort; -import org.apache.nifi.connectable.Port; -import org.apache.nifi.connectable.Position; -import org.apache.nifi.connectable.Size; -import org.apache.nifi.connectable.StandardConnection; -import org.apache.nifi.controller.exception.CommunicationsException; -import org.apache.nifi.controller.exception.ProcessorInstantiationException; -import org.apache.nifi.controller.exception.ProcessorLifeCycleException; -import org.apache.nifi.controller.label.Label; -import org.apache.nifi.controller.label.StandardLabel; -import org.apache.nifi.controller.reporting.ReportingTaskInstantiationException; -import org.apache.nifi.controller.reporting.StandardReportingTaskNode; -import org.apache.nifi.controller.repository.ContentRepository; -import org.apache.nifi.controller.repository.CounterRepository; -import org.apache.nifi.controller.repository.FlowFileEvent; -import org.apache.nifi.controller.repository.FlowFileEventRepository; -import org.apache.nifi.controller.repository.FlowFileRecord; -import org.apache.nifi.controller.repository.FlowFileRepository; -import org.apache.nifi.controller.repository.FlowFileSwapManager; -import org.apache.nifi.controller.repository.QueueProvider; -import org.apache.nifi.controller.repository.RepositoryRecord; -import org.apache.nifi.controller.repository.RepositoryStatusReport; -import org.apache.nifi.controller.repository.StandardCounterRepository; -import org.apache.nifi.controller.repository.StandardFlowFileRecord; -import
[42/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
--
diff --git
a/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
b/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
deleted file mode 100644
index 8dfbaf1..000
---
a/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
+++ /dev/null
@@ -1,1143 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.attribute.expression.language;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.nifi.attribute.expression.language.Query.Range;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-import
org.apache.nifi.attribute.expression.language.exception.AttributeExpressionLanguageException;
-import
org.apache.nifi.attribute.expression.language.exception.AttributeExpressionLanguageParsingException;
-import org.apache.nifi.expression.AttributeExpression.ResultType;
-import org.apache.nifi.flowfile.FlowFile;
-import org.antlr.runtime.tree.Tree;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-public class TestQuery {
-
-@Test
-public void testCompilation() {
-assertInvalid(${attr:uuid()});
-assertInvalid(${attr:indexOf(length())});
-assertValid(${UUID()});
-assertInvalid(${UUID():nextInt()});
-assertValid(${nextInt()});
-assertValid(${now():format('/MM/dd')});
-assertInvalid(${attr:times(3)});
-assertValid(${attr:toNumber():multiply(3)});
-// left here because it's convenient for looking at the output
-//System.out.println(Query.compile().evaluate(null));
-}
-
-private void assertValid(final String query) {
-try {
-Query.compile(query);
-} catch (final Exception e) {
-e.printStackTrace();
-Assert.fail(Expected query to be valid, but it failed to compile
due to + e);
-}
-}
-
-private void assertInvalid(final String query) {
-try {
-Query.compile(query);
-Assert.fail(Expected query to be invalid, but it did compile);
-} catch (final Exception e) {
-}
-}
-
-@Test
-public void testIsValidExpression() {
-Query.validateExpression(${abc:substring(${xyz:length()})}, false);
-Query.isValidExpression(${now():format('-MM-dd')});
-
-
-try {
-Query.validateExpression($${attr}, false);
-Assert.fail(invalid query validated);
-} catch (final AttributeExpressionLanguageParsingException e) {
-}
-
-Query.validateExpression($${attr}, true);
-
-Query.validateExpression(${filename:startsWith('T8MTXBC')\n
-+ :or( ${filename:startsWith('C4QXABC')} )\n
-+ :or( ${filename:startsWith('U6CXEBC')} )
-+ :or( ${filename:startsWith('KYM3ABC')} )}, false);
-}
-
-
-@Test
-public void testCompileEmbedded() {
-final String expression = ${x:equals( ${y} )};
-final Query query = Query.compile(expression);
-final Tree tree = query.getTree();
-System.out.println( printTree(tree) );
-
-final MapString, String attributes = new HashMap();
-attributes.put(x, x);
-attributes.put(y, x);
-final String result = Query.evaluateExpressions(expression,
attributes, null);
-assertEquals(true, result);
-
-Query.validateExpression(expression, false);
-}
-
-private String printTree(final Tree
[30/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
deleted file mode 100644
index edd214b..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.admin.service.transaction;
-
-import java.io.Closeable;
-import org.apache.nifi.admin.service.action.AdministrationAction;
-
-/**
- * Defines a transaction.
- */
-public interface Transaction extends Closeable {
-
-/**
- * Executes the specified action within the current transaction.
- *
- * @param T
- * @param action
- * @return
- * @throws IllegalStateException - if there is no current transaction
- */
-T T execute(AdministrationActionT action);
-
-/**
- * Commits the current transaction.
- *
- * @throws TransactionException - if the transaction is unable to be
- * committed
- */
-void commit() throws TransactionException;
-
-/**
- * Rolls back the current transaction.
- */
-void rollback();
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
deleted file mode 100644
index 2d2ef82..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.admin.service.transaction;
-
-/**
- *
- */
-public interface TransactionBuilder {
-
-Transaction start() throws TransactionException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
deleted file mode 100644
index 924e01f..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
[34/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/wali/pom.xml -- diff --git a/nifi/commons/wali/pom.xml b/nifi/commons/wali/pom.xml deleted file mode 100644 index 0d653f8..000 --- a/nifi/commons/wali/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ -?xml version=1.0? -!-- - 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. --- -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; -modelVersion4.0.0/modelVersion - -parent -groupIdorg.apache.nifi/groupId -artifactIdnifi-commons-parent/artifactId -version0.0.1-incubating-SNAPSHOT/version -/parent - -artifactIdwali/artifactId -version0.0.1-incubating-SNAPSHOT/version -packagingjar/packaging - -nameWALI : Write-Ahead Log Implementation/name - -dependencies -dependency -groupIdorg.slf4j/groupId -artifactIdslf4j-api/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-utils/artifactId -/dependency -/dependencies -/project http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java -- diff --git a/nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java b/nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java deleted file mode 100644 index 19208d3..000 --- a/nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java +++ /dev/null @@ -1,1008 +0,0 @@ -/* - * 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. - */ -package org.wali; - -import static java.util.Objects.requireNonNull; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.EOFException; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.channels.FileChannel; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Queue; -import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.CopyOnWriteArraySet; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.regex.Pattern; - -import org.apache.nifi.stream.io.BufferedInputStream; -import org.apache.nifi.stream.io.BufferedOutputStream; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - *
[49/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
--
diff --git a/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
b/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
new file mode 100644
index 000..da03182
--- /dev/null
+++ b/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
@@ -0,0 +1,613 @@
+/*
+ * 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.
+ */
+package org.apache.nifi;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.installer.ArtifactInstaller;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
+import org.apache.maven.plugin.dependency.utils.DependencyUtil;
+import org.apache.maven.plugin.dependency.utils.filters.DestFileFilter;
+import org.apache.maven.plugin.dependency.utils.resolvers.ArtifactsResolver;
+import
org.apache.maven.plugin.dependency.utils.resolvers.DefaultArtifactsResolver;
+import org.apache.maven.plugin.dependency.utils.translators.ArtifactTranslator;
+import
org.apache.maven.plugin.dependency.utils.translators.ClassifierTypeTranslator;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.project.MavenProjectHelper;
+import
org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
+import org.apache.maven.shared.artifact.filter.collection.ClassifierFilter;
+import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
+import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
+import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
+import
org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter;
+import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
+import org.codehaus.plexus.archiver.jar.ManifestException;
+import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * Packages the current project as an Apache NiFi Archive (NAR).
+ *
+ * The following code is derived from maven-dependencies-plugin and
+ * maven-jar-plugin. The functionality of CopyDependenciesMojo and JarMojo was
+ * simplified to the use case of NarMojo.
+ *
+ */
+@Mojo(name = nar, defaultPhase = LifecyclePhase.PACKAGE, threadSafe = false,
requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class NarMojo extends AbstractMojo {
+
+private static final String[] DEFAULT_EXCLUDES = new
String[]{**/package.html};
+private static
[18/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
deleted file mode 100644
index 339d904..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.cluster.flow;
-
-import java.util.Set;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-
-/**
- * A service for managing the cluster's flow. The service will attempt to keep
- * the cluster's dataflow current while respecting the value of the configured
- * retrieval delay.
- *
- * The eligible retrieval time is reset with the configured delay every time
the
- * flow state is set to STALE. If the state is set to UNKNOWN or CURRENT, then
- * the flow will not be retrieved.
- *
- * Clients must call start() and stop() to initialize and stop the instance.
- *
- * @author unattributed
- */
-public interface DataFlowManagementService {
-
-/**
- * Starts the instance. Start may only be called if the instance is not
- * running.
- */
-void start();
-
-/**
- * Stops the instance. Stop may only be called if the instance is running.
- */
-void stop();
-
-/**
- * @return true if the instance is started; false otherwise.
- */
-boolean isRunning();
-
-/**
- * Loads the dataflow.
- *
- * @return the dataflow or null if no dataflow exists
- */
-ClusterDataFlow loadDataFlow();
-
-/**
- * Updates the dataflow with the given primary node identifier.
- *
- * @param nodeId the node identifier
- *
- * @throws DaoException if the update failed
- */
-void updatePrimaryNode(NodeIdentifier nodeId) throws DaoException;
-
-/**
- * Sets the state of the flow.
- *
- * @param flowState the state
- *
- * @see PersistedFlowState
- */
-void setPersistedFlowState(PersistedFlowState flowState);
-
-/**
- * @return the state of the flow
- */
-PersistedFlowState getPersistedFlowState();
-
-/**
- * @return true if the flow is current; false otherwise.
- */
-boolean isFlowCurrent();
-
-/**
- * Sets the node identifiers to use when attempting to retrieve the flow.
- *
- * @param nodeIds the node identifiers
- */
-void setNodeIds(SetNodeIdentifier nodeIds);
-
-/**
- * Returns the set of node identifiers the service is using to retrieve the
- * flow.
- *
- * @return the set of node identifiers the service is using to retrieve the
- * flow.
- */
-SetNodeIdentifier getNodeIds();
-
-/**
- * @return the retrieval delay in seconds
- */
-int getRetrievalDelaySeconds();
-
-/**
- * Sets the retrieval delay.
- *
- * @param delay the retrieval delay in seconds
- */
-void setRetrievalDelay(String delay);
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
deleted file mode 100644
index b3afc6e..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See
[43/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
--
diff --git
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
deleted file mode 100644
index faa8f0a..000
---
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.attribute.expression.language.evaluation.functions;
-
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-import
org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.StringQueryResult;
-
-public class UuidEvaluator extends StringEvaluator {
-
-@Override
-public QueryResultString evaluate(final MapString, String attributes) {
-return new StringQueryResult(UUID.randomUUID().toString());
-}
-
-@Override
-public Evaluator? getSubjectEvaluator() {
-return null;
-}
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
--
diff --git
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
deleted file mode 100644
index a085423..000
---
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.attribute.expression.language.evaluation.literals;
-
-import java.util.Map;
-
-import
org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-
-public class BooleanLiteralEvaluator extends BooleanEvaluator {
-
-private final boolean value;
-
-public BooleanLiteralEvaluator(final boolean value) {
-this.value = value;
-}
-
-@Override
-public QueryResultBoolean evaluate(final MapString, String attributes)
{
-return new BooleanQueryResult(value);
-}
-
-@Override
-public Evaluator? getSubjectEvaluator() {
-return null;
-}
-
-}
[02/10] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4431d9c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4431d9c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4431d9c2 Branch: refs/heads/develop Commit: 4431d9c2cf8b3e77c566718d941ef6f0ef581414 Parents: 6e69d99 Author: joewitt joew...@apache.org Authored: Fri Jan 23 01:28:41 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 23 01:28:41 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4431d9c2/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index d032da7..79e437e 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-maven-plugin/artifactId -version1.0.0-incubating/version +version1.0.1-incubating-SNAPSHOT/version packagingmaven-plugin/packaging descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description urlhttp://nifi.incubator.apache.org/maven-site//url @@ -58,7 +58,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag +tagHEAD/tag /scm issueManagement systemJIRA/system
[07/10] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/418e932c Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/418e932c Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/418e932c Branch: refs/heads/develop Commit: 418e932ce68b7f21a4ac900e3223972b20edd487 Parents: 3a76259 Author: joewitt joew...@apache.org Authored: Fri Jan 23 01:36:35 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 23 01:36:35 2015 -0500 -- nifi/nifi-api/pom.xml | 4 +- nifi/nifi-assembly/pom.xml | 4 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../nifi-data-provenance-utils/pom.xml | 4 +- .../nifi-expression-language/pom.xml| 4 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 4 +- nifi/nifi-commons/nifi-logging-utils/pom.xml| 4 +- .../nifi-processor-utilities/pom.xml| 4 +- nifi/nifi-commons/nifi-properties/pom.xml | 4 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-web-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 4 +- nifi/nifi-commons/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- nifi/nifi-mock/pom.xml | 4 +- .../nifi-framework-nar/pom.xml | 4 +- .../nifi-framework/nifi-administration/pom.xml | 4 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-cluster-protocol/pom.xml | 2 +- .../nifi-framework/nifi-cluster-web/pom.xml | 2 +- .../nifi-framework/nifi-cluster/pom.xml | 2 +- .../nifi-file-authorization-provider/pom.xml| 4 +- .../nifi-framework-core-api/pom.xml | 4 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/pom.xml | 2 +- .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml| 4 +- .../nifi-framework/nifi-site-to-site/pom.xml| 4 +- .../nifi-framework/nifi-user-actions/pom.xml| 4 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-framework/nifi-web/pom.xml | 10 +-- .../nifi-framework/pom.xml | 4 +- .../nifi-framework-bundle/pom.xml | 36 +-- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 4 +- .../nifi-hdfs-processors/pom.xml| 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 +- .../nifi-hadoop-libraries-nar/pom.xml | 4 +- .../nifi-hadoop-libraries-bundle/pom.xml| 4 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 4 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml| 4 +- .../nifi-kafka-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml | 4 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 8 +-- .../nifi-standard-nar/pom.xml | 4 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml| 2 +- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml| 10 +-- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 4 +- .../pom.xml | 4 +- .../nifi-load-distribution-service-api/pom.xml | 4 +- .../nifi-ssl-context-nar/pom.xml| 4 +- .../nifi-ssl-context-service/pom.xml| 2 +- .../nifi-ssl-context-bundle/pom.xml | 4 +- .../nifi-ssl-context-service-api/pom.xml| 2 +- .../nifi-standard-services-api-nar/pom.xml | 4 +- .../nifi-standard-services/pom.xml | 4 +- .../nifi-update-attribute-model/pom.xml
[01/10] incubator-nifi git commit: NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3
Repository: incubator-nifi Updated Branches: refs/heads/develop bafa945a7 - 21619da1b NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6e69d994 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6e69d994 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6e69d994 Branch: refs/heads/develop Commit: 6e69d99444e22772df300cd777096dc21a7c8e35 Parents: 43e646e Author: joewitt joew...@apache.org Authored: Fri Jan 23 01:28:31 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 23 01:28:31 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6e69d994/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index c0f3583..d032da7 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-maven-plugin/artifactId -version1.0.0-incubating-SNAPSHOT/version +version1.0.0-incubating/version packagingmaven-plugin/packaging descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description urlhttp://nifi.incubator.apache.org/maven-site//url @@ -58,7 +58,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagHEAD/tag +tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag /scm issueManagement systemJIRA/system
[5/5] incubator-nifi git commit: Merge branch 'master' into develop
Merge branch 'master' 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/037f36dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/037f36dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/037f36dd Branch: refs/heads/develop Commit: 037f36dd98833d6524e6e8c6c6b1942d7fafbcbb Parents: 21619da e713258 Author: joewitt joew...@apache.org Authored: Fri Jan 30 23:22:23 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 30 23:22:23 2015 -0500 -- --
svn commit: r1656162 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt
Date: Sat Jan 31 04:49:46 2015
New Revision: 1656162
URL: http://svn.apache.org/r1656162
Log:
added steps learned from 0.0.1 release
Modified:
incubator/nifi/site/trunk/content/development/release-guide.md
Modified: incubator/nifi/site/trunk/content/development/release-guide.md
URL:
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1656162r1=1656161r2=1656162view=diff
==
--- incubator/nifi/site/trunk/content/development/release-guide.md (original)
+++ incubator/nifi/site/trunk/content/development/release-guide.md Sat Jan 31
04:49:46 2015
@@ -148,13 +148,13 @@ This command `mvn install -Pcheck-licens
Now its time to have maven prepare the release so execute `mvn release:prepare
-Psigned_release -DscmCommentPrefix=NIFI-270-RC1 -Darguments=-DskipTests`.
Maven will ask:
-`What is the release version for Apache NiFi NAR Plugin?
(org.apache.nifi:nifi) 0.0.1-incubating: :`
+`What is the release version for Apache NiFi? (org.apache.nifi:nifi)
0.0.1-incubating: :`
Just hit enter to accept the default.
Maven will then ask:
-`What is SCM release tag or label for Apache NiFi NAR Plugin?
(org.apache.nifi:nifi) nifi-0.0.1-incubating: : `
+`What is SCM release tag or label for Apache NiFi? (org.apache.nifi:nifi)
nifi-0.0.1-incubating: : `
Enter `nifi-0.0.1-incubating-RC1` or whatever the appropriate release
candidate (RC) number is.
Maven will then ask:
@@ -263,7 +263,7 @@ If so forward the vote to the IPMC. Sen
The vote will be open for 72 hours.
Please download the release candidate and evaluate the necessary items
including checking hashes, signatures, build from source, and test. The
please vote:
- [ ] +1 Release this package as nar-maven-plugin-0.0.1-incubating
+ [ ] +1 Release this package as nifi-0.0.1-incubating
[ ] +0 no opinion
[ ] -1 Do not release this package because because...
@@ -291,7 +291,7 @@ Here are the steps of the release once t
2. To produce binary convenience release build the application from the raw
source in staging. For each binary convenience artifact:
- Generate ascii armored detached signature by running `gpg -a -b
nifi-0.0.1-incubating-bin.tar.gz`
- Generate md5 hash summary by running `md5sum
nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,32)}'
nifi-0.0.1-incubating-bin.tar.gz.md5`
-- Generate sha1 hash summary by running 'sha1sum
nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,40)}'
nifi-0.0.1-incubating-bin.tar.gz.sha1'
+- Generate sha1 hash summary by running `sha1sum
nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,40)}'
nifi-0.0.1-incubating-bin.tar.gz.sha1`
- Upload the bin, asc, sha1, md5 for each binary convenience build to the
same location as the source release
3. In repository.apache.org go to the staging repository and select `release`
and follow instructions on the site.
[22/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml -- diff --git a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml deleted file mode 100644 index bad5a29..000 --- a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -!-- - 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. --- -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; -modelVersion4.0.0/modelVersion -parent -groupIdorg.apache.nifi/groupId -artifactIdnifi-framework-parent/artifactId -version0.0.1-incubating-SNAPSHOT/version -/parent -artifactIdframework-cluster-protocol/artifactId -packagingjar/packaging -nameNiFi Framework Cluster Protocol/name -descriptionThe messaging protocol for clustered NiFi/description -dependencies - -!-- application dependencies -- -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-api/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-properties/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-logging-utils/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-socket-utils/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-security/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdcore-api/artifactId -/dependency - -!-- spring dependencies -- -dependency -groupIdorg.springframework/groupId -artifactIdspring-core/artifactId -/dependency -dependency -groupIdorg.springframework/groupId -artifactIdspring-beans/artifactId -/dependency -dependency -groupIdorg.springframework/groupId -artifactIdspring-context/artifactId -/dependency -/dependencies -/project http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java -- diff --git a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java deleted file mode 100644 index fa1547f..000 --- a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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. - */ -package org.apache.nifi.cluster.protocol; - -import
[15/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java -- diff --git a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java deleted file mode 100644 index 511bb7d..000 --- a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java +++ /dev/null @@ -1,3620 +0,0 @@ -/* - * 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. - */ -package org.apache.nifi.cluster.manager.impl; - -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Serializable; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Queue; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; -import java.util.TreeMap; -import java.util.UUID; -import java.util.concurrent.CompletionService; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ExecutorCompletionService; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.regex.Pattern; - -import javax.net.ssl.SSLContext; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.StreamingOutput; -import javax.xml.XMLConstants; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.dom.DOMSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; -import javax.xml.validation.Validator; - -import org.apache.nifi.admin.service.AuditService; -import org.apache.nifi.cluster.BulletinsPayload; -import org.apache.nifi.cluster.ClusterNodeInformation; -import org.apache.nifi.cluster.HeartbeatPayload; -import org.apache.nifi.cluster.NodeInformation; -import org.apache.nifi.cluster.context.ClusterContext; -import org.apache.nifi.cluster.context.ClusterContextImpl; -import org.apache.nifi.cluster.event.Event; -import org.apache.nifi.cluster.event.EventManager; -import org.apache.nifi.cluster.firewall.ClusterNodeFirewall; -import org.apache.nifi.cluster.flow.ClusterDataFlow; -import org.apache.nifi.cluster.flow.DaoException; -import org.apache.nifi.cluster.flow.DataFlowManagementService; -import org.apache.nifi.cluster.flow.PersistedFlowState; -import org.apache.nifi.cluster.manager.HttpClusterManager; -import org.apache.nifi.cluster.manager.HttpRequestReplicator; -import org.apache.nifi.cluster.manager.HttpResponseMapper; -import org.apache.nifi.cluster.manager.NodeResponse; -import org.apache.nifi.cluster.manager.exception.ConnectingNodeMutableRequestException; -import org.apache.nifi.cluster.manager.exception.DisconnectedNodeMutableRequestException; -import org.apache.nifi.cluster.manager.exception.IllegalClusterStateException; -import org.apache.nifi.cluster.manager.exception.IllegalNodeDeletionException; -import org.apache.nifi.cluster.manager.exception.IllegalNodeDisconnectionException; -import org.apache.nifi.cluster.manager.exception.IllegalNodeReconnectionException; -import org.apache.nifi.cluster.manager.exception.IneligiblePrimaryNodeException; -import org.apache.nifi.cluster.manager.exception.NoConnectedNodesException; -import org.apache.nifi.cluster.manager.exception.NoResponseFromNodesException; -import
