svn commit: r1834914 - /nifi/site/trunk/download.html
Author: alopresto Date: Tue Jul 3 02:26:54 2018 New Revision: 1834914 URL: http://svn.apache.org/viewvc?rev=1834914=rev Log: Added file sizes to download links. Modified: nifi/site/trunk/download.html Modified: nifi/site/trunk/download.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/download.html?rev=1834914=1834913=1834914=diff == --- nifi/site/trunk/download.html (original) +++ nifi/site/trunk/download.html Tue Jul 3 02:26:54 2018 @@ -131,20 +131,20 @@ Sources: -https://www.apache.org/dyn/closer.lua?path=/nifi/1.7.0/nifi-1.7.0-source-release.zip;>nifi-1.7.0-source-release.zip ( https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-source-release.zip.asc;>asc, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-source-release.zip.sha1;>sha1, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-source-release.zip.sha256;>sha256, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-source-release.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.7.0/nifi-1.7.0-source-release.zip;>nifi-1.7.0-source-release.zip [52 MB] ( https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-source-release.zip.asc;>asc, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-source-release.zip.sha1;>sha1, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-source-release.zip.sha256;>sha256, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-source-release.zip.sha512;>sha512 ) Binaries -https://www.apache.org/dyn/closer.lua?path=/nifi/1.7.0/nifi-1.7.0-bin.tar.gz;>nifi-1.7.0-bin.tar.gz ( https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.tar.gz.asc;>asc, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.tar.gz.sha1;>sha1, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.tar.gz.sha256;>sha256, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.7.0/nifi-1.7.0-bin.tar.gz;>nifi-1.7.0-bin.tar.gz [1.2 GB] ( https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.tar.gz.asc;>asc, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.tar.gz.sha1;>sha1, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.tar.gz.sha256;>sha256, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.7.0/nifi-1.7.0-bin.zip;>nifi-1.7.0-bin.zip ( https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.zip.asc;>asc, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.zip.sha1;>sha1, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.zip.sha256;>sha256, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.7.0/nifi-1.7.0-bin.zip;>nifi-1.7.0-bin.zip [1.2 GB] ( https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.zip.asc;>asc, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.zip.sha1;>sha1, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.zip.sha256;>sha256, https://www.apache.org/dist/nifi/1.7.0/nifi-1.7.0-bin.zip.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz;>nifi-toolkit-1.7.0-bin.tar.gz ( https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz.asc;>asc, https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz.sha1;>sha1, https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz.sha256;>sha256, https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz;>nifi-toolkit-1.7.0-bin.tar.gz [42 MB] ( https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz.asc;>asc, https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz.sha1;>sha1, https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz.sha256;>sha256, https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.7.0/nifi-toolkit-1.7.0-bin.zip;>nifi-toolkit-1.7.0-bin.zip ( https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.zip.asc;>asc, https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.zip.sha1;>sha1, https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.zip.sha256;>sha256, https://www.apache.org/dist/nifi/1.7.0/nifi-toolkit-1.7.0-bin.zip.sha512;>sha512 ) +
nifi git commit: NIFI-5059 Updated MongoDBLookupService to be able to detect record schemas or take one provided by the user.
Repository: nifi Updated Branches: refs/heads/master d4d4ddade -> 22ec069ac NIFI-5059 Updated MongoDBLookupService to be able to detect record schemas or take one provided by the user. NIFI-5059 Changed it to use a schema registry. NIFI-5059 Updated MongoDBLookupService to be a SchemaRegistryService. NIFI-5059 Added two changes from a code review. NIFI-5059 Fixed two bad references. NIFI-5059 Refactored schema strategy handling. NIFI-5059 Moved schema strategy handling to JsonInferenceSchemaRegistryService. NIFI-5059 Updated to use new LookupService method. NIFI-5059 fixed schema inference bug. NIFI-5059 Added test for schema text strategy NIFI-5059 incremented version number to make the build work. NIFI-5059 fixed a stray 1.7.0 reference. NIFI-5059 Added getDatabase to client service. NIFI-5059 Added changes requested in a code review. Signed-off-by: Matthew Burgess This closes #2619 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/22ec069a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/22ec069a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/22ec069a Branch: refs/heads/master Commit: 22ec069acb39d59388d4adc4965929cfdba8f36b Parents: d4d4dda Author: Mike Thomsen Authored: Mon Apr 9 07:28:40 2018 -0400 Committer: Matthew Burgess Committed: Mon Jul 2 21:57:50 2018 -0400 -- .../nifi-avro-record-utils/pom.xml | 6 + .../schema/access/InferenceSchemaStrategy.java | 87 +++ .../nifi/schema/access/SchemaAccessUtils.java | 2 +- .../JsonInferenceSchemaRegistryService.java | 108 ++ .../serialization/SchemaRegistryService.java| 16 +- .../nifi/serialization/FakeProcessor.groovy | 44 ++ ...estJsonInferenceSchemaRegistryService.groovy | 59 .../schema/access/JsonSchemaAccessStrategy.java | 36 + .../nifi/mongodb/MongoDBClientService.java | 4 + .../nifi-mongodb-services/pom.xml | 12 ++ .../nifi/mongodb/MongoDBControllerService.java | 16 ++ .../nifi/mongodb/MongoDBLookupService.java | 132 - .../nifi/mongodb/MongoDBLookupServiceIT.java| 148 --- .../apache/nifi/mongodb/StubSchemaRegistry.java | 49 ++ .../src/test/resources/simple.avsc | 7 + 15 files changed, 663 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/22ec069a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml -- diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml index 864581e..05e62f4 100755 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml @@ -43,6 +43,12 @@ org.apache.nifi nifi-record + +org.apache.nifi +nifi-mock +1.8.0-SNAPSHOT +test + http://git-wip-us.apache.org/repos/asf/nifi/blob/22ec069a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/schema/access/InferenceSchemaStrategy.java -- diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/schema/access/InferenceSchemaStrategy.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/schema/access/InferenceSchemaStrategy.java new file mode 100644 index 000..6cfd35d --- /dev/null +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/schema/access/InferenceSchemaStrategy.java @@ -0,0 +1,87 @@ +/* + * 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
[jira] [Created] (MINIFI-461) Display application startup time in human-readable seconds
Andy LoPresto created MINIFI-461: Summary: Display application startup time in human-readable seconds Key: MINIFI-461 URL: https://issues.apache.org/jira/browse/MINIFI-461 Project: Apache NiFi MiNiFi Issue Type: Improvement Components: Core Framework Affects Versions: 0.5.0 Reporter: Andy LoPresto The application log should display the startup time similar to the way the Apache NiFi boot process now displays the startup time in both nanoseconds and human-readable seconds. {code} 2018-06-29 15:23:43,041 INFO [main] org.apache.nifi.minifi.MiNiFi Controller initialization took 546376888 nanoseconds. {code} Should become: {code} 2018-06-29 15:23:43,041 INFO [main] org.apache.nifi.minifi.MiNiFi Controller initialization took 546376888 nanoseconds (0.5 seconds). {code} This is easier for humans to understand when quickly looking at the logs. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
nifi git commit: NIFI-5361: When submitting many processors to start, calculate the 'timeout timestamp' immediately before calling @OnScheduled method, after the task has been scheduled to run, instea
Repository: nifi Updated Branches: refs/heads/master 790102d8b -> d4d4ddade NIFI-5361: When submitting many processors to start, calculate the 'timeout timestamp' immediately before calling @OnScheduled method, after the task has been scheduled to run, instead of before the task has a chance to run. This closes #2831 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d4d4ddad Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d4d4ddad Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d4d4ddad Branch: refs/heads/master Commit: d4d4ddadee8b7fcba17ea25b008fa75185336efc Parents: 790102d Author: Mark Payne Authored: Fri Jun 29 09:25:57 2018 -0400 Committer: Matt Gilman Committed: Mon Jul 2 16:36:07 2018 -0400 -- .../org/apache/nifi/controller/StandardProcessorNode.java| 8 ++-- .../nifi/controller/scheduling/StandardProcessScheduler.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/d4d4ddad/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java index 6a831d0..c2b98e6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java @@ -1482,12 +1482,16 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable final Processor processor = getProcessor(); final ComponentLog procLog = new SimpleProcessLogger(StandardProcessorNode.this.getIdentifier(), processor); -final long completionTimestamp = System.currentTimeMillis() + onScheduleTimeoutMillis; +// Completion Timestamp is set to MAX_VALUE because we don't want to timeout until the task has a chance to run. +final AtomicLong completionTimestampRef = new AtomicLong(Long.MAX_VALUE); // Create a task to invoke the @OnScheduled annotation of the processor final Callable startupTask = () -> { LOG.debug("Invoking @OnScheduled methods of {}", processor); +// Now that the task has been scheduled, set the timeout +completionTimestampRef.set(System.currentTimeMillis() + onScheduleTimeoutMillis); + try (final NarCloseable nc = NarCloseable.withComponentNarLoader(processor.getClass(), processor.getIdentifier())) { try { activateThread(); @@ -1572,7 +1576,7 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable return; } -monitorAsyncTask(taskFuture, monitoringFuture, completionTimestamp); +monitorAsyncTask(taskFuture, monitoringFuture, completionTimestampRef.get()); } }; http://git-wip-us.apache.org/repos/asf/nifi/blob/d4d4ddad/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java index 8f7eb2f..b23e763 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java @@ -319,7 +319,7 @@ public final class StandardProcessScheduler implements ProcessScheduler { @Override public Future scheduleTask(final Callable task) { lifecycleState.incrementActiveThreadCount(null); -return componentMonitoringThreadPool.submit(task); +return componentLifeCycleThreadPool.submit(task); } @Override
nifi git commit: Revert "NIFI-5147 Add CalculateAttributeHash processor"
Repository: nifi Updated Branches: refs/heads/master b549fbb67 -> 790102d8b Revert "NIFI-5147 Add CalculateAttributeHash processor" This reverts commit 7fb931889f37ecec7d14665e58c3332423916b64. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/790102d8 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/790102d8 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/790102d8 Branch: refs/heads/master Commit: 790102d8b1442731201c19a8614d0aa11334434d Parents: b549fbb Author: Mike Thomsen Authored: Mon Jul 2 16:03:28 2018 -0400 Committer: Mike Thomsen Committed: Mon Jul 2 16:03:28 2018 -0400 -- .../standard/CalculateAttributeHash.java| 250 --- .../org.apache.nifi.processor.Processor | 1 - .../standard/TestCalculateAttributeHash.java| 178 - 3 files changed, 429 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/790102d8/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateAttributeHash.java -- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateAttributeHash.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateAttributeHash.java deleted file mode 100644 index aa91cda..000 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateAttributeHash.java +++ /dev/null @@ -1,250 +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.processors.standard; - -import org.apache.commons.codec.binary.Hex; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.nifi.annotation.behavior.DynamicProperty; -import org.apache.nifi.annotation.behavior.EventDriven; -import org.apache.nifi.annotation.behavior.InputRequirement; -import org.apache.nifi.annotation.behavior.SideEffectFree; -import org.apache.nifi.annotation.behavior.SupportsBatching; -import org.apache.nifi.annotation.behavior.WritesAttribute; -import org.apache.nifi.annotation.documentation.CapabilityDescription; -import org.apache.nifi.annotation.documentation.Tags; -import org.apache.nifi.components.AllowableValue; -import org.apache.nifi.components.PropertyDescriptor; -import org.apache.nifi.flowfile.FlowFile; -import org.apache.nifi.logging.ComponentLog; -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.util.StandardValidators; - -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.concurrent.atomic.AtomicReference; - -@EventDriven -@SideEffectFree -@SupportsBatching -@Tags({"attributes", "hash"}) -@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED) -@CapabilityDescription("Calculates a hash value for the value specified attributes and write it to an output attribute. Please refer to https://csrc.nist.gov/Projects/Hash-Functions/NIST-Policy-on-Hash-Functions help decide on which algorithm to use.") -@WritesAttribute(attribute = "", description = "This Processor adds an attribute whose value is the result of " -+ "Hashing of the found attribute. The name of this attribute is specified by the value of the dynamic property.") -@DynamicProperty(name = "A flowfile attribute key for attribute inspection", value = "Attribute Name", -description = "The property name defines the attribute to look for and hash in the incoming
svn commit: r27876 - /dev/nifi/nifi-minifi/0.5.0/
Author: aldrin Date: Mon Jul 2 19:42:49 2018 New Revision: 27876 Log: MINIFI-458 Moving 0.5.0 artifacts to release. Removed: dev/nifi/nifi-minifi/0.5.0/
svn commit: r27874 - /dev/nifi/nifi-minifi/0.5.0/ /release/nifi/minifi/0.5.0/
Author: aldrin Date: Mon Jul 2 19:38:47 2018 New Revision: 27874 Log: MINIFI-458 Moving 0.5.0 artifacts to release. Added: release/nifi/minifi/0.5.0/minifi-0.5.0-bin.tar.gz - copied unchanged from r27873, dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz release/nifi/minifi/0.5.0/minifi-0.5.0-bin.tar.gz.asc - copied unchanged from r27873, dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.asc release/nifi/minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha1 - copied unchanged from r27873, dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha1 release/nifi/minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha256 - copied unchanged from r27873, dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha256 release/nifi/minifi/0.5.0/minifi-0.5.0-bin.zip - copied unchanged from r27873, dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip release/nifi/minifi/0.5.0/minifi-0.5.0-bin.zip.asc - copied unchanged from r27873, dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.asc release/nifi/minifi/0.5.0/minifi-0.5.0-bin.zip.sha1 - copied unchanged from r27873, dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha1 release/nifi/minifi/0.5.0/minifi-0.5.0-bin.zip.sha256 - copied unchanged from r27873, dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha256 Removed: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.asc dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha1 dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha256 dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.asc dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha1 dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha256
svn commit: r27871 - /dev/nifi/nifi-minifi/0.5.0/
Author: jeremydyer Date: Mon Jul 2 17:26:42 2018 New Revision: 27871 Log: Apache NiFi MiNiFi 0.5.0 RC2 binary artifacts, hashes, and signatures Added: dev/nifi/nifi-minifi/0.5.0/ - copied from r27790, dev/nifi/nifi-minifi/0.5.0/ dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz (with props) dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.asc dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha1 dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha256 dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip (with props) dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.asc dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha1 dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha256 Added: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.asc == --- dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.asc (added) +++ dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.asc Mon Jul 2 17:26:42 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEUKpgrV1YMRGHsL61xuVQ2mspWtUFAls6PtoACgkQxuVQ2msp +WtVRuxAAilJolMcahvFDWRqcZ/KaQaqHj7J9MjZx1YlLfM4UMame0bve4GqtabOp +r9IwodXxjJ0dgyoEzfklCfVihpP0zfOOaCYSzcsbYh5z6+oFWvefBRQKPIEvN2UO +UJwGQsN3Ord7XCKStH6Xmuwc2MZ7uyZWue2N7kIO8fWLUxkieNnaj53WfczO9EUq +3LPb17G+WrdofWgAJ1KTPwxya5pJSbCXeTmQzbHtXNX837oCjLgxetMsyE7mJGJZ +JEQl4aLxY1eJwRa7VedZJbCSYXm9vN+f0McXhIAhdGrBQsRBtSCpiMSEvcw9YeRX +rW3qm0FGR+NafSf31N9sG9wjHOYL7odKLs8nvrrxwfTBBMrEsApfBULW9jpw9tJz +O8l60mV/LLJfBM4TCq/Wgg5DA1uAPsReRpfPMc7jM/ucSWgDvFCea0t3b7eoug+u +IuDxJFz0ZF4t5SZUUVWahfJHLNfwmFrqzfMnzz0bkdd09j8Iakr7gmyuIoTxoR+w +S2r5tfTOIPybYj6dMK5IBDeCnwkfScCrdCAMwTDhDwyW90xpRlBSHvdoNEkKKrEz +u8OY4jo5nplumiAWmwemXmp5GaQmrf9AMfmbw25wBBpCycALuHwgT6X0lF+jTbXp +ZNaDD7feyERjo1B0Wa8yGCtEQEitC3tVtHG8oQEdJ4eA7xIHg2E= +=49Ur +-END PGP SIGNATURE- Added: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha1 == --- dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha1 (added) +++ dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha1 Mon Jul 2 17:26:42 2018 @@ -0,0 +1 @@ +4cabfbce604eeffe67ae11c90f51ce44f196e271 Added: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha256 == --- dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha256 (added) +++ dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.tar.gz.sha256 Mon Jul 2 17:26:42 2018 @@ -0,0 +1 @@ +e4df2bc2388fe4ea45084ba0651a5457d0f1542b1f2984c3c7b5fb695f110641 Added: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.asc == --- dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.asc (added) +++ dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.asc Mon Jul 2 17:26:42 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEUKpgrV1YMRGHsL61xuVQ2mspWtUFAls6PvIACgkQxuVQ2msp +WtWq0w/9Eq7sSpgEESSEatrQEJ7YuC1pWvsg+c2ZSR4AcaoEE2sMjHaP9gMHFQMf +vSf8UuqPwyy2E2AkZI9Box9ZbrFafUIH8IUoioxUWvjcPXBqORgWFIEwvuIl4FDj +YC58BBfgpCeViFR9kTtqCkNhHsBjYf2G789BCB+xiAOXdiu0wrNyzJ9TmrKYjPeq +2uZPOFGHwyfds87C199+Dt24DEqr7KqYka5GgwA6kEhurdp6zV48RpXNetExn7xo +TIr2DDntIOQJ4VCySlCjzmBGOXbtFzeL+ACsbP9b7s9ufDIBKCrTb5y5n1Bey084 +paT6SYO1eNcG0MB3dPuJTM5W1vWfVbSAA0I4mMW61BJo9nI4hq8uqGnSVqIYUlw+ +J0MkwO676GQQ7gHyHO8y4P2zNotMthzkpmSbRxy1srh0fpvYt3tgCiZ4vioN9VhD +Z9GU/XZTGd8DiUKu+qZky5SqHvRRazeN8gMAjcWsOyxQkoMHOwxEOEewO4u7gUxh +aw2rAYd9IgNhmg1UFnpOWQFdl+8CcbitMuNPqI5WtaaiXFkgQu9hfQJIJlMcaVb3 +yBv6Enl94Q4CmCoZAscMtZNzTzDxLIr8rytaOAkzsSku5ZRvee4PBNEFNpKiN5oC +ta5kHfbfmxJAxjEQ9nvbADNNGteFyvhZmIm0zsnfsJsC9GNVmeA= +=uHzC +-END PGP SIGNATURE- Added: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha1 == --- dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha1 (added) +++ dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha1 Mon Jul 2 17:26:42 2018 @@ -0,0 +1 @@ +6faa8c2ee5638d2cc7d54605ed1a1e8fc8dba1ce Added: dev/nifi/nifi-minifi/0.5.0/minifi-0.5.0-bin.zip.sha256 == ---
[nifi-minifi] Git Push Summary
Repository: nifi-minifi Updated Tags: refs/tags/rel/minifi-0.5.0 [created] a1f91c7cd
[nifi-minifi] Git Push Summary
Repository: nifi-minifi Updated Tags: refs/tags/minifi-0.5.0-RC1 [created] f5c15eb6e
nifi-minifi-cpp git commit: MINIFICPP-543: Implement C2 based update policy enforcement
Repository: nifi-minifi-cpp Updated Branches: refs/heads/master e9982cc50 -> fad26e57c MINIFICPP-543: Implement C2 based update policy enforcement MINIFICPP-543: Remove state ignore from gitignore and change how bootstrap commits state to avoid issues with state src dir This closes #365. Signed-off-by: Aldrin Piri Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/fad26e57 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/fad26e57 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/fad26e57 Branch: refs/heads/master Commit: fad26e57c0a4a81ca0703032deb085b7d4df7219 Parents: e9982cc Author: Marc Parisi Authored: Mon Jun 25 16:04:00 2018 -0400 Committer: Aldrin Piri Committed: Mon Jul 2 10:10:55 2018 -0400 -- .gitignore | 2 +- C2.md | 22 +++ bootstrap.sh| 2 +- bstrp_functions.sh | 8 +- libminifi/include/c2/C2Agent.h | 10 +- .../controllers/UpdatePolicyControllerService.h | 101 + libminifi/include/core/state/UpdatePolicy.h | 144 +++ libminifi/src/c2/C2Agent.cpp| 31 +++- .../UpdatePolicyControllerService.cpp | 106 ++ libminifi/test/unit/UpdatePolicyTests.cpp | 78 ++ main/CMakeLists.txt | 2 +- 11 files changed, 493 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/fad26e57/.gitignore -- diff --git a/.gitignore b/.gitignore index 9968c0a..1bbca52 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,7 @@ cmake-build-debug # Generated files build -state +bt_state bin target thirdparty/**/*.o http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/fad26e57/C2.md -- diff --git a/C2.md b/C2.md index 307cd59..d6ebf1c 100644 --- a/C2.md +++ b/C2.md @@ -286,3 +286,25 @@ will forward responses and updates to the heartbeating agents. queue prioritizer class: org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer Remote Process Groups: [] NiFi Properties Overrides: {} + +### Update Policies + +Updates to MiNiFi C++ properties can be controlled through an UpdatePolicyControllerService named +C2UpdatePolicy. The service supports several configuration options. They are defined in the following example: + + + Controller Services: + - id: 94491a38-015a-1000--0001 + name: C2UpdatePolicy + class: UpdatePolicyControllerService + Properties: + # true enables all properties to be updated. + Allow All Properties: true + # allowed properties are those which can be updated + Allowed Properties: +Property_1:true +Property_2:true + Disallowed Properties: +Property_3:true +Property_4:true + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/fad26e57/bootstrap.sh -- diff --git a/bootstrap.sh b/bootstrap.sh index ccfc98a..97e8b5f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -57,7 +57,7 @@ while :; do EnableAllFeatures ;; -c|--clear) - rm ${script_directory}/state > /dev/null 2>&1 + rm ${script_directory}/bt_state > /dev/null 2>&1 ;; -d|--deploy) NO_PROMPT="true" http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/fad26e57/bstrp_functions.sh -- diff --git a/bstrp_functions.sh b/bstrp_functions.sh index beb4442..351aeec 100755 --- a/bstrp_functions.sh +++ b/bstrp_functions.sh @@ -72,8 +72,8 @@ pause(){ load_state(){ -if [ -f ${script_directory}/state ]; then - . ${script_directory}/state +if [ -f ${script_directory}/bt_state ]; then + . ${script_directory}/bs_state for option in "${OPTIONS[@]}" ; do option_value="${!option}" if [ "${option_value}" = "${FALSE}" ]; then @@ -85,11 +85,11 @@ fi echo_state_variable(){ VARIABLE_VALUE=${!1} -echo "$1=\"${VARIABLE_VALUE}\"" >> ${script_directory}/state +echo "$1=\"${VARIABLE_VALUE}\"" >> ${script_directory}/bt_state } save_state(){ - echo "VERSION=1" > ${script_directory}/state + echo "VERSION=1" > ${script_directory}/bt_state echo_state_variable BUILD_IDENTIFIER echo_state_variable BUILD_DIR for option in "${OPTIONS[@]}" ; do
nifi-minifi-cpp git commit: MINIFICPP-515 Use push_back( T&& value ) for copy-free behavior
Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 10eb9757b -> e9982cc50 MINIFICPP-515 Use push_back( T&& value ) for copy-free behavior This closes #359. Signed-off-by: Marc Parisi Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/e9982cc5 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/e9982cc5 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/e9982cc5 Branch: refs/heads/master Commit: e9982cc50e64e860fd0e43dc051682a3440809cf Parents: 10eb975 Author: Andrew I. Christianson Authored: Fri Jun 15 01:27:46 2018 -0400 Committer: Marc Parisi Committed: Mon Jul 2 09:33:40 2018 -0400 -- libminifi/include/core/Property.h | 10 +- libminifi/src/core/Property.cpp | 8 2 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/e9982cc5/libminifi/include/core/Property.h -- diff --git a/libminifi/include/core/Property.h b/libminifi/include/core/Property.h index 45ea09f..b90423d 100644 --- a/libminifi/include/core/Property.h +++ b/libminifi/include/core/Property.h @@ -55,7 +55,7 @@ class Property { */ Property(const std::string name, const std::string description, - const std::string value, + std::string value, bool is_required, std::vector &_properties, std::vector> &_of_properties) @@ -65,15 +65,15 @@ class Property { dependent_properties_(std::move(dependent_properties)), exclusive_of_properties_(std::move(exclusive_of_properties)), is_collection_(false) { -values_.push_back(std::string(value.c_str())); +values_.push_back(std::move(value)); } - Property(const std::string name, const std::string description, const std::string value) + Property(const std::string name, const std::string description, std::string value) : name_(name), description_(description), is_required_(false), is_collection_(false) { -values_.push_back(std::string(value.c_str())); +values_.push_back(std::move(value)); } Property(const std::string name, const std::string description) @@ -105,7 +105,7 @@ class Property { /** * Add value to the collection of values. */ - void addValue(const std::string ); + void addValue(std::string value); const Property =(const Property ); // Compare bool operator <(const Property & right) const; http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/e9982cc5/libminifi/src/core/Property.cpp -- diff --git a/libminifi/src/core/Property.cpp b/libminifi/src/core/Property.cpp index 260d042..03bbc84 100644 --- a/libminifi/src/core/Property.cpp +++ b/libminifi/src/core/Property.cpp @@ -49,14 +49,14 @@ std::vector ::getValues() { void Property::setValue(std::string value) { if (!is_collection_) { values_.clear(); -values_.push_back(std::string(value.c_str())); +values_.push_back(std::move(value)); } else { -values_.push_back(std::string(value.c_str())); +values_.push_back(std::move(value)); } } -void Property::addValue(const std::string ) { - values_.push_back(std::string(value.c_str())); +void Property::addValue(std::string value) { + values_.push_back(std::move(value)); } bool Property::operator<(const Property ) const {
nifi git commit: NIFI-5147 Add CalculateAttributeHash processor
Repository: nifi Updated Branches: refs/heads/master 4ea6e6a40 -> 7fb931889 NIFI-5147 Add CalculateAttributeHash processor This closes #2802 Signed-off-by: Mike Thomsen Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7fb93188 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7fb93188 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7fb93188 Branch: refs/heads/master Commit: 7fb931889f37ecec7d14665e58c3332423916b64 Parents: 4ea6e6a Author: Otto Fowler Authored: Mon Jun 18 11:00:38 2018 -0400 Committer: Mike Thomsen Committed: Mon Jul 2 06:20:21 2018 -0400 -- .../standard/CalculateAttributeHash.java| 250 +++ .../org.apache.nifi.processor.Processor | 1 + .../standard/TestCalculateAttributeHash.java| 178 + 3 files changed, 429 insertions(+) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/7fb93188/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateAttributeHash.java -- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateAttributeHash.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateAttributeHash.java new file mode 100644 index 000..aa91cda --- /dev/null +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateAttributeHash.java @@ -0,0 +1,250 @@ +/* + * 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.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.nifi.annotation.behavior.DynamicProperty; +import org.apache.nifi.annotation.behavior.EventDriven; +import org.apache.nifi.annotation.behavior.InputRequirement; +import org.apache.nifi.annotation.behavior.SideEffectFree; +import org.apache.nifi.annotation.behavior.SupportsBatching; +import org.apache.nifi.annotation.behavior.WritesAttribute; +import org.apache.nifi.annotation.documentation.CapabilityDescription; +import org.apache.nifi.annotation.documentation.Tags; +import org.apache.nifi.components.AllowableValue; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.flowfile.FlowFile; +import org.apache.nifi.logging.ComponentLog; +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.util.StandardValidators; + +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.concurrent.atomic.AtomicReference; + +@EventDriven +@SideEffectFree +@SupportsBatching +@Tags({"attributes", "hash"}) +@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED) +@CapabilityDescription("Calculates a hash value for the value specified attributes and write it to an output attribute. Please refer to https://csrc.nist.gov/Projects/Hash-Functions/NIST-Policy-on-Hash-Functions help decide on which algorithm to use.") +@WritesAttribute(attribute = "", description = "This Processor adds an attribute whose value is the result of " ++ "Hashing of the found attribute. The name of this attribute is specified by the value of the dynamic property.") +@DynamicProperty(name = "A flowfile attribute key for attribute inspection", value = "Attribute Name", +description = "The property name defines the attribute to look for and hash in the incoming flowfile." ++