nifi git commit: NIFI-4632: Add the local hostname to the list of validated host headers

2017-11-27 Thread alopresto
Repository: nifi
Updated Branches:
  refs/heads/master 616906145 -> cec276414


NIFI-4632: Add the local hostname to the list of validated host headers

This closes #2288.

Signed-off-by: Andy LoPresto 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/cec27641
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/cec27641
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/cec27641

Branch: refs/heads/master
Commit: cec276414051e99d704064799675f0504bd35cc1
Parents: 6169061
Author: Mark Payne 
Authored: Wed Nov 22 09:56:09 2017 -0500
Committer: Andy LoPresto 
Committed: Mon Nov 27 19:08:29 2017 -0800

--
 .../java/org/apache/nifi/web/server/HostHeaderHandler.java| 7 +++
 .../nifi/web/server/HostHeaderSanitizationCustomizer.java | 7 +++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/cec27641/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
index 989d8d7..0b3a8be 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
@@ -18,6 +18,7 @@ package org.apache.nifi.web.server;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -60,6 +61,12 @@ public class HostHeaderHandler extends ScopedHandler {
 validHosts.add("localhost:" + serverPort);
 // Different from customizer -- empty is ok here
 validHosts.add("");
+try {
+validHosts.add(InetAddress.getLocalHost().getHostName());
+validHosts.add(InetAddress.getLocalHost().getHostName() + ":" + 
serverPort);
+} catch (final Exception e) {
+logger.warn("Failed to determine local hostname.", e);
+}
 
 logger.info("Created " + this.toString());
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/cec27641/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java
index 9d55d71..5a10610 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderSanitizationCustomizer.java
@@ -16,6 +16,7 @@
  */
 package org.apache.nifi.web.server;
 
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -53,6 +54,12 @@ public class HostHeaderSanitizationCustomizer implements 
HttpConfiguration.Custo
 // Sometimes the hostname is left empty but the port is always 
populated
 validHosts.add("localhost");
 validHosts.add("localhost:" + serverPort);
+try {
+validHosts.add(InetAddress.getLocalHost().getHostName());
+validHosts.add(InetAddress.getLocalHost().getHostName() + ":" + 
serverPort);
+} catch (final Exception e) {
+logger.warn("Failed to determine local hostname.", e);
+}
 
 logger.info("Created " + this.toString());
 }



nifi git commit: NIFI-4193 Converting to use the dockerfile-maven plugin to replace deprecated plugin.

2017-11-27 Thread aldrin
Repository: nifi
Updated Branches:
  refs/heads/master ecb9c5e92 -> 616906145


NIFI-4193 Converting to use the dockerfile-maven plugin to replace deprecated 
plugin.

This closes #2155.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/61690614
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/61690614
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/61690614

Branch: refs/heads/master
Commit: 6169061456bf8ff98e511ddb0966ed692d98b6e1
Parents: ecb9c5e
Author: Aldrin Piri 
Authored: Mon Sep 11 12:59:28 2017 -0400
Committer: Aldrin Piri 
Committed: Mon Nov 27 20:41:59 2017 -0500

--
 nifi-docker/dockermaven/pom.xml | 82 
 nifi-docker/pom.xml | 72 ---
 2 files changed, 110 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/61690614/nifi-docker/dockermaven/pom.xml
--
diff --git a/nifi-docker/dockermaven/pom.xml b/nifi-docker/dockermaven/pom.xml
new file mode 100644
index 000..4422f50
--- /dev/null
+++ b/nifi-docker/dockermaven/pom.xml
@@ -0,0 +1,82 @@
+
+
+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;>
+4.0.0
+
+
+org.apache.nifi
+nifi-docker
+1.5.0-SNAPSHOT
+
+
+dockermaven
+
+
+
+docker
+
+
+
+com.spotify
+dockerfile-maven-plugin
+1.3.5
+
+
+default
+
+build
+
+
+
+1000
+1000
+
${project.version}
+
target/nifi-${nifi.version}-bin.tar.gz
+
+apache/nifi
+${project.version}
+latest
+
+
+
+
+
+
+maven-antrun-plugin
+1.8
+
+
+copy-for-docker
+process-sources
+
+
+
+
+
+
+
+
+
+
+run
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/61690614/nifi-docker/pom.xml
--
diff --git a/nifi-docker/pom.xml b/nifi-docker/pom.xml
index bf116ea..6656e55 100644
--- a/nifi-docker/pom.xml
+++ b/nifi-docker/pom.xml
@@ -24,51 +24,35 @@ language governing permissions and limitations under the 
License. -->
 pom
 
 
-1.4.0-SNAPSHOT
+${project.version}
 
 
-
-   
-   
-docker
-
-
-
-com.spotify
-docker-maven-plugin
-0.4.13
-
-
-package
-
-build
-
-
-
-
-apachenifi
-
${project.basedir}/dockermaven
-
-   ${nifi.version}
-
-
-1000
-1000
-

nifi-registry git commit: NIFIREG-57: Added EvolvingDifferenceDescriptor vs. StaticDifferenceDescriptor

2017-11-27 Thread bbende
Repository: nifi-registry
Updated Branches:
  refs/heads/master 589253778 -> a2f639f37


NIFIREG-57: Added EvolvingDifferenceDescriptor vs. StaticDifferenceDescriptor

This closes #42.

Signed-off-by: Bryan Bende 


Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/a2f639f3
Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/a2f639f3
Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/a2f639f3

Branch: refs/heads/master
Commit: a2f639f37819b464794fe4f790731026d34c0c55
Parents: 5892537
Author: Mark Payne 
Authored: Tue Nov 21 14:40:00 2017 -0500
Committer: Bryan Bende 
Committed: Mon Nov 27 18:02:13 2017 -0500

--
 .../registry/flow/VersionedFlowCoordinates.java |  15 ++
 .../registry/flow/VersionedRemoteGroupPort.java |  23 ++-
 .../ConciseEvolvingDifferenceDescriptor.java|  79 +++
 .../flow/diff/EvolvingDifferenceDescriptor.java |   6 +
 .../flow/diff/StandardFlowComparator.java   | 140 +++
 .../flow/diff/StaticDifferenceDescriptor.java   |  29 
 6 files changed, 200 insertions(+), 92 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/a2f639f3/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedFlowCoordinates.java
--
diff --git 
a/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedFlowCoordinates.java
 
b/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedFlowCoordinates.java
index ac98933..8e39c5b 100644
--- 
a/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedFlowCoordinates.java
+++ 
b/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedFlowCoordinates.java
@@ -26,6 +26,7 @@ public class VersionedFlowCoordinates {
 private String bucketId;
 private String flowId;
 private int version;
+private Boolean latest;
 
 @ApiModelProperty("The URL of the Flow Registry that contains the flow")
 public String getRegistryUrl() {
@@ -63,6 +64,15 @@ public class VersionedFlowCoordinates {
 this.version = version;
 }
 
+@ApiModelProperty("Whether or not these coordinates point to the latest 
version of the flow")
+public Boolean getLatest() {
+return latest;
+}
+
+public void setLatest(Boolean latest) {
+this.latest = latest;
+}
+
 @Override
 public int hashCode() {
 return Objects.hash(registryUrl, bucketId, flowId, version);
@@ -83,4 +93,9 @@ public class VersionedFlowCoordinates {
 final VersionedFlowCoordinates other = (VersionedFlowCoordinates) obj;
 return Objects.equals(registryUrl, other.registryUrl) && 
Objects.equals(bucketId, other.bucketId) && Objects.equals(flowId, 
other.flowId) && Objects.equals(version, other.version);
 }
+
+@Override
+public String toString() {
+return "VersionedFlowCoordinates[bucketId=" + bucketId + ", flowId=" + 
flowId + ", version=" + version + ", registryUrl=" + registryUrl + "]";
+}
 }

http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/a2f639f3/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteGroupPort.java
--
diff --git 
a/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteGroupPort.java
 
b/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteGroupPort.java
index 73b037e..ca85ce4 100644
--- 
a/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteGroupPort.java
+++ 
b/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteGroupPort.java
@@ -22,11 +22,12 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModelProperty;
 
 public class VersionedRemoteGroupPort extends VersionedComponent {
-private String groupId;
+private String remoteGroupId;
 private Integer concurrentlySchedulableTaskCount;
 private Boolean useCompression;
 private BatchSize batchSize;
 private ComponentType componentType;
+private String targetId;
 
 @ApiModelProperty("The number of task that may transmit flowfiles to the 
target port concurrently.")
 public Integer getConcurrentlySchedulableTaskCount() {
@@ -38,12 +39,12 @@ public class VersionedRemoteGroupPort extends 
VersionedComponent {
 }
 
 @ApiModelProperty("The id of the remote process group that the port 
resides in.")
-public String getGroupId() {
-return groupId;
+public String getRemoteGroupId() {
+return remoteGroupId;
 }
 
-public void 

nifi-minifi-cpp git commit: MINIFICPP-307 - support text mode in GenerateFlowFile

2017-11-27 Thread phrocker
Repository: nifi-minifi-cpp
Updated Branches:
  refs/heads/master 997b956d4 -> 5a80197e1


MINIFICPP-307 - support text mode in GenerateFlowFile

MINIFICPP-307 - fix linter issues, typo

This closes #195.

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/5a80197e
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/5a80197e
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/5a80197e

Branch: refs/heads/master
Commit: 5a80197e170645c33262460753c7d8bbedff5018
Parents: 997b956
Author: Dustin Rodrigues 
Authored: Sat Nov 18 14:45:52 2017 -0500
Committer: Marc Parisi 
Committed: Mon Nov 27 17:56:26 2017 -0500

--
 libminifi/src/processors/GenerateFlowFile.cpp | 38 +-
 1 file changed, 29 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/5a80197e/libminifi/src/processors/GenerateFlowFile.cpp
--
diff --git a/libminifi/src/processors/GenerateFlowFile.cpp 
b/libminifi/src/processors/GenerateFlowFile.cpp
index 3741a8f..32ca26b 100644
--- a/libminifi/src/processors/GenerateFlowFile.cpp
+++ b/libminifi/src/processors/GenerateFlowFile.cpp
@@ -45,6 +45,8 @@ core::Property GenerateFlowFile::BatchSize("Batch Size", "The 
number of FlowFile
 core::Property GenerateFlowFile::DataFormat("Data Format", "Specifies whether 
the data should be Text or Binary", GenerateFlowFile::DATA_FORMAT_BINARY);
 core::Property GenerateFlowFile::UniqueFlowFiles("Unique FlowFiles", "If true, 
each FlowFile that is generated will be unique. If false, a random value will 
be generated and all FlowFiles", "true");
 core::Relationship GenerateFlowFile::Success("success", "success operational 
on the flow record");
+const unsigned int TEXT_LEN = 90;
+static const char TEXT_CHARS[TEXT_LEN+1] = 
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()-_=+/?.,';:\"?<>\n\t
 ";
 
 void GenerateFlowFile::initialize() {
   // Set the supported properties
@@ -64,6 +66,7 @@ void GenerateFlowFile::onTrigger(core::ProcessContext 
*context, core::ProcessSes
   int64_t batchSize = 1;
   bool uniqueFlowFile = true;
   int64_t fileSize = 1024;
+  bool textData = false;
 
   std::string value;
   if (context->getProperty(FileSize.getName(), value)) {
@@ -72,6 +75,9 @@ void GenerateFlowFile::onTrigger(core::ProcessContext 
*context, core::ProcessSes
   if (context->getProperty(BatchSize.getName(), value)) {
 core::Property::StringToInt(value, batchSize);
   }
+  if (context->getProperty(DataFormat.getName(), value)) {
+textData = (value == GenerateFlowFile::DATA_FORMAT_TEXT);
+  }
   if (context->getProperty(UniqueFlowFiles.getName(), value)) {
 org::apache::nifi::minifi::utils::StringUtils::StringToBool(value, 
uniqueFlowFile);
   }
@@ -84,10 +90,17 @@ void GenerateFlowFile::onTrigger(core::ProcessContext 
*context, core::ProcessSes
 uint64_t dataSize = fileSize;
 GenerateFlowFile::WriteCallback callback(data, dataSize);
 char *current = data;
-for (int i = 0; i < fileSize; i += sizeof(int)) {
-  int randValue = random();
-  *(reinterpret_cast(current)) = randValue;
-  current += sizeof(int);
+if (textData) {
+  for (int i = 0; i < fileSize; i++) {
+int randValue = random();
+data[i] = TEXT_CHARS[randValue % TEXT_LEN];
+  }
+} else {
+  for (int i = 0; i < fileSize; i += sizeof(int)) {
+int randValue = random();
+*(reinterpret_cast(current)) = randValue;
+current += sizeof(int);
+  }
 }
 for (int i = 0; i < batchSize; i++) {
   // For each batch
@@ -101,14 +114,21 @@ void GenerateFlowFile::onTrigger(core::ProcessContext 
*context, core::ProcessSes
 delete[] data;
   } else {
 if (!_data) {
-  // We have not create the unique data yet
+  // We have not created the unique data yet
   _data = new char[fileSize];
   _dataSize = fileSize;
   char *current = _data;
-  for (int i = 0; i < fileSize; i += sizeof(int)) {
-int randValue = random();
-*(reinterpret_cast(current)) = randValue;
-current += sizeof(int);
+  if (textData) {
+for (int i = 0; i < fileSize; i++) {
+  int randValue = random();
+  _data[i] = TEXT_CHARS[randValue % TEXT_LEN];
+}
+  } else {
+for (int i = 0; i < fileSize; i += sizeof(int)) {
+  int randValue = random();
+  *(reinterpret_cast(current)) = randValue;
+  current += sizeof(int);
+}
   }
 }
 GenerateFlowFile::WriteCallback callback(_data, _dataSize);



[jira] [Commented] (MINIFI-412) Convert commons-daemon to use a mirror instead of Apache dist and upgrade

2017-11-27 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/MINIFI-412?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16267392#comment-16267392
 ] 

ASF GitHub Bot commented on MINIFI-412:
---

GitHub user apiri opened a pull request:

https://github.com/apache/nifi-minifi/pull/101

MINIFI-412 Upgrading commons-daemon to 1.1.0 and making use of a mirror

MINIFI-412 Upgrading commons-daemon to 1.1.0 and making use of a mirror 
instead of Apache dist.

Thank you for submitting a contribution to Apache NiFi - MiNiFi.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

### For all changes:
- [X] Is there a JIRA ticket associated with this PR? Is it referenced 
 in the commit message?

- [X] Does your PR title start with MINIFI- where  is the JIRA 
number you are trying to resolve? Pay particular attention to the hyphen "-" 
character.

- [X] Has your PR been rebased against the latest commit within the target 
branch (typically master)?

- [X] Is your initial contribution a single, squashed commit?

### For code changes:
- [X] Have you ensured that the full suite of tests is executed via mvn 
-Pcontrib-check clean install at the root nifi-minifi folder?
- [-] Have you written or updated unit tests to verify your changes?
- [- ] If adding new dependencies to the code, are these dependencies 
licensed in a way that is compatible for inclusion under [ASF 
2.0](http://www.apache.org/legal/resolved.html#category-a)? 
- [-] If applicable, have you updated the LICENSE file, including the main 
LICENSE file under minifi-assembly?
- [-] If applicable, have you updated the NOTICE file, including the main 
NOTICE file found under minifi-assembly?

### For documentation related changes:
- [-] Have you ensured that format looks appropriate for the output in 
which it is rendered?

### Note:
Please ensure that once the PR is submitted, you check travis-ci for build 
issues and submit an update to your PR as soon as possible.


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/apiri/nifi-minifi minifi-412

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/nifi-minifi/pull/101.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #101


commit 711d5844471bb8f4547e7f265b7546ae028ceb1b
Author: Aldrin Piri 
Date:   2017-11-27T19:50:41Z

MINIFI-412 Upgrading commons-daemon to 1.1.0 and making use of a mirror 
instead of Apache dist.




> Convert commons-daemon to use a mirror instead of Apache dist and upgrade
> -
>
> Key: MINIFI-412
> URL: https://issues.apache.org/jira/browse/MINIFI-412
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>  Components: Build
>Reporter: Aldrin Piri
>Assignee: Aldrin Piri
> Fix For: 0.3.0
>
>
> Commons-daemon was introduced as a means to provide Windows service support.
> In the past few days, commons-daemon had a new release moving the latest from 
> 1.0.15 to 1.1.0.  It does not seem that commons-daemon nor its mirrors have 
> anything other than the latest, 1.1.0 release.  To avoid hitting ASF archive 
> or dist we should convert to using a mirror and the latest version as long as 
> there are no issues.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)


[jira] [Created] (MINIFI-412) Convert commons-daemon to use a mirror instead of Apache dist and upgrade

2017-11-27 Thread Aldrin Piri (JIRA)
Aldrin Piri created MINIFI-412:
--

 Summary: Convert commons-daemon to use a mirror instead of Apache 
dist and upgrade
 Key: MINIFI-412
 URL: https://issues.apache.org/jira/browse/MINIFI-412
 Project: Apache NiFi MiNiFi
  Issue Type: Bug
  Components: Build
Reporter: Aldrin Piri
Assignee: Aldrin Piri


Commons-daemon was introduced as a means to provide Windows service support.

In the past few days, commons-daemon had a new release moving the latest from 
1.0.15 to 1.1.0.  It does not seem that commons-daemon nor its mirrors have 
anything other than the latest, 1.1.0 release.  To avoid hitting ASF archive or 
dist we should convert to using a mirror and the latest version as long as 
there are no issues.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)


[jira] [Updated] (MINIFI-412) Convert commons-daemon to use a mirror instead of Apache dist and upgrade

2017-11-27 Thread Aldrin Piri (JIRA)

 [ 
https://issues.apache.org/jira/browse/MINIFI-412?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Aldrin Piri updated MINIFI-412:
---
Fix Version/s: 0.3.0

> Convert commons-daemon to use a mirror instead of Apache dist and upgrade
> -
>
> Key: MINIFI-412
> URL: https://issues.apache.org/jira/browse/MINIFI-412
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>  Components: Build
>Reporter: Aldrin Piri
>Assignee: Aldrin Piri
> Fix For: 0.3.0
>
>
> Commons-daemon was introduced as a means to provide Windows service support.
> In the past few days, commons-daemon had a new release moving the latest from 
> 1.0.15 to 1.1.0.  It does not seem that commons-daemon nor its mirrors have 
> anything other than the latest, 1.1.0 release.  To avoid hitting ASF archive 
> or dist we should convert to using a mirror and the latest version as long as 
> there are no issues.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)


nifi-minifi-cpp git commit: MINIFICPP-324: Resolve build issues with missing civet dependencies

2017-11-27 Thread bqiu
Repository: nifi-minifi-cpp
Updated Branches:
  refs/heads/master d6c28e1ce -> 997b956d4


MINIFICPP-324: Resolve build issues with missing civet dependencies

This closes #207.

Signed-off-by: Bin Qiu 


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/997b956d
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/997b956d
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/997b956d

Branch: refs/heads/master
Commit: 997b956d42b75ceaf4b627c68fef85a041c91769
Parents: d6c28e1
Author: Marc Parisi 
Authored: Mon Nov 27 18:50:17 2017 +
Committer: Bin Qiu 
Committed: Mon Nov 27 10:54:41 2017 -0800

--
 libminifi/CMakeLists.txt | 1 +
 main/CMakeLists.txt  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/997b956d/libminifi/CMakeLists.txt
--
diff --git a/libminifi/CMakeLists.txt b/libminifi/CMakeLists.txt
index 2e49523..df775a7 100644
--- a/libminifi/CMakeLists.txt
+++ b/libminifi/CMakeLists.txt
@@ -86,6 +86,7 @@ else ()
 endif (OPENSSL_FOUND)
 
 add_library(minifi STATIC ${PROCESSOR_SOURCES})
+target_link_libraries(minifi c-library civetweb-cpp)
 
 target_link_libraries(minifi core-minifi)
 

http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/997b956d/main/CMakeLists.txt
--
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 633665c..5226979 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -54,8 +54,6 @@ include_directories(${OPENSSL_INCLUDE_DIR})
 # Link against minifi, yaml-cpp, civetweb-cpp, uuid, openssl, jsoncpp and 
rocksdb
 target_link_libraries(minifiexe core-minifi)
 
-target_link_libraries(minifiexe minifi yaml-cpp c-library civetweb-cpp 
${JSON_CPP_LIB} ${UUID_LIBRARIES} ${OPENSSL_LIBRARIES})
-
 if (APPLE)
target_link_libraries (minifiexe -Wl,-all_load minifi)
 else ()
@@ -63,6 +61,9 @@ else ()
 endif ()
 
 
+target_link_libraries(minifiexe yaml-cpp c-library civetweb-cpp 
${JSON_CPP_LIB} ${UUID_LIBRARIES} ${OPENSSL_LIBRARIES})
+
+
 if (APPLE)
get_property(extensions GLOBAL PROPERTY EXTENSION-OPTIONS)
foreach(EXTENSION ${extensions})



nifi-minifi-cpp git commit: MINIFICPP-320: Change Processors to be within their own linked object

2017-11-27 Thread bqiu
Repository: nifi-minifi-cpp
Updated Branches:
  refs/heads/master 0e4ce79b7 -> d6c28e1ce


MINIFICPP-320: Change Processors to be within their own linked object

This closes #206.

This will facilitate the eventual move and documentation that follows
enabling a processor module.

Signed-off-by: Bin Qiu 


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/d6c28e1c
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/d6c28e1c
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/d6c28e1c

Branch: refs/heads/master
Commit: d6c28e1ce284f57061fce1497f40d433609c9724
Parents: 0e4ce79
Author: Marc Parisi 
Authored: Sun Nov 5 10:52:35 2017 -0500
Committer: Bin Qiu 
Committed: Mon Nov 27 09:40:12 2017 -0800

--
 cmake/BuildTests.cmake  |  11 +-
 libminifi/include/core/FlowConfiguration.h  |  11 +-
 libminifi/include/core/Resource.h   | 106 +++---
 libminifi/include/core/yaml/YamlConfiguration.h |   1 -
 libminifi/include/processors/LoadProcessors.h   |  33 --
 .../test/archive-tests/CompressContentTests.cpp |   1 +
 .../test/archive-tests/FocusArchiveTests.cpp|   1 +
 .../archive-tests/ManipulateArchiveTests.cpp|   1 +
 libminifi/test/archive-tests/MergeFileTests.cpp |   1 +
 .../test/curl-tests/C2NullConfiguration.cpp |   1 +
 .../curl-tests/C2VerifyHeartbeatAndStop.cpp | 309 +-
 .../test/curl-tests/C2VerifyServeResults.cpp|   1 +
 .../test/curl-tests/HttpGetIntegrationTest.cpp  | 321 ++-
 .../test/curl-tests/HttpPostIntegrationTest.cpp |   2 +
 libminifi/test/curl-tests/ThreadPoolAdjust.cpp  | 225 ++---
 .../test/curl-tests/unit/InvokeHTTPTests.cpp|   3 +
 .../test/script-tests/LuaExecuteScriptTests.cpp |   3 +
 .../script-tests/PythonExecuteScriptTests.cpp   |   3 +
 libminifi/test/unit/ExtractTextTests.cpp|   2 +
 libminifi/test/unit/TailFileTests.cpp   |   2 +
 main/CMakeLists.txt |  11 +-
 21 files changed, 524 insertions(+), 525 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/d6c28e1c/cmake/BuildTests.cmake
--
diff --git a/cmake/BuildTests.cmake b/cmake/BuildTests.cmake
index 00ba43b..120064a 100644
--- a/cmake/BuildTests.cmake
+++ b/cmake/BuildTests.cmake
@@ -59,10 +59,15 @@ function(createTests testName)
 target_include_directories(${testName} BEFORE PRIVATE 
"${Boost_INCLUDE_DIRS}")
 endif()
 target_link_libraries(${testName} ${SPD_LIB} ${TEST_BASE_LIB})
-target_link_libraries(${testName} ${CMAKE_THREAD_LIBS_INIT} 
${OPENSSL_LIBRARIES} core-minifi minifi yaml-cpp c-library civetweb-cpp 
${JSON_CPP_LIB})
+target_link_libraries(${testName} ${CMAKE_THREAD_LIBS_INIT} 
${OPENSSL_LIBRARIES} core-minifi yaml-cpp c-library civetweb-cpp 
${JSON_CPP_LIB})
+if (APPLE)
+   target_link_libraries (${testName} -Wl,-all_load minifi)
+   else ()
+   target_link_libraries (${testName} -Wl,--whole-archive minifi 
-Wl,--no-whole-archive)
+   endif ()
 if (Boost_FOUND)
-   target_link_libraries(${testName} ${Boost_SYSTEM_LIBRARY})
-   target_link_libraries(${testName} ${Boost_FILESYSTEM_LIBRARY})
+target_link_libraries(${testName} ${Boost_SYSTEM_LIBRARY})
+target_link_libraries(${testName} ${Boost_FILESYSTEM_LIBRARY})
 endif()
 endfunction()
 

http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/d6c28e1c/libminifi/include/core/FlowConfiguration.h
--
diff --git a/libminifi/include/core/FlowConfiguration.h 
b/libminifi/include/core/FlowConfiguration.h
index 1d0b638..a45958e 100644
--- a/libminifi/include/core/FlowConfiguration.h
+++ b/libminifi/include/core/FlowConfiguration.h
@@ -25,17 +25,8 @@
 #include "core/controller/StandardControllerServiceProvider.h"
 #include "provenance/Provenance.h"
 #include "core/reporting/SiteToSiteProvenanceReportingTask.h"
-#include "processors/GetFile.h"
-#include "processors/PutFile.h"
-#include "processors/TailFile.h"
-#include "processors/ListenSyslog.h"
-#include "processors/GenerateFlowFile.h"
-#include "processors/ListenHTTP.h"
-#include "processors/LogAttribute.h"
-#include "processors/ExecuteProcess.h"
-#include "processors/AppendHostInfo.h"
-
 #include "core/Processor.h"
+#include "core/Resource.h"
 #include "core/logging/LoggerConfiguration.h"
 #include "core/ProcessContext.h"
 #include "core/ProcessSession.h"

http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/d6c28e1c/libminifi/include/core/Resource.h

[jira] [Resolved] (MINIFI-314) no-op Provenance Repository implementation

2017-11-27 Thread Aldrin Piri (JIRA)

 [ 
https://issues.apache.org/jira/browse/MINIFI-314?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Aldrin Piri resolved MINIFI-314.

Resolution: Fixed

> no-op Provenance Repository implementation
> --
>
> Key: MINIFI-314
> URL: https://issues.apache.org/jira/browse/MINIFI-314
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>  Components: Core Framework
>Reporter: Aldrin Piri
>Assignee: Jeff Zemerick
> Fix For: 0.3.0
>
>
> For constrained scenarios it could be advantageous to have a no-op provenance 
> repository implementation where there would be no I/O and/or Memory pressure 
> exerted as events would not be stored in any form.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)


[jira] [Updated] (MINIFI-314) no-op Provenance Repository implementation

2017-11-27 Thread Aldrin Piri (JIRA)

 [ 
https://issues.apache.org/jira/browse/MINIFI-314?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Aldrin Piri updated MINIFI-314:
---
Fix Version/s: 0.3.0

> no-op Provenance Repository implementation
> --
>
> Key: MINIFI-314
> URL: https://issues.apache.org/jira/browse/MINIFI-314
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>  Components: Core Framework
>Reporter: Aldrin Piri
>Assignee: Jeff Zemerick
> Fix For: 0.3.0
>
>
> For constrained scenarios it could be advantageous to have a no-op provenance 
> repository implementation where there would be no I/O and/or Memory pressure 
> exerted as events would not be stored in any form.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)


[1/2] nifi-minifi git commit: MINIFI-314: Adds NoOpProvenanceRepository.

2017-11-27 Thread aldrin
Repository: nifi-minifi
Updated Branches:
  refs/heads/master 97d509953 -> a4b57b069


MINIFI-314: Adds NoOpProvenanceRepository.

This closes #98.

Signed-off-by: Aldrin Piri 


Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/37ddeb15
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/37ddeb15
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/37ddeb15

Branch: refs/heads/master
Commit: 37ddeb15f8d38244c017db72700c816513cc51c7
Parents: 97d5099
Author: jzonthemtn 
Authored: Tue Nov 21 13:34:15 2017 -0500
Committer: Aldrin Piri 
Committed: Mon Nov 27 12:10:51 2017 -0500

--
 .../minifi-provenance-repositories/pom.xml  |  34 +
 .../provenance/NoOpProvenanceRepository.java| 143 +++
 ...he.nifi.provenance.ProvenanceEventRepository |  15 ++
 apache.nifi.provenance.ProvenanceRepository |  15 ++
 .../minifi-provenance-repository-bundle/pom.xml |   3 +-
 5 files changed, 209 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/37ddeb15/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
--
diff --git 
a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
 
b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
new file mode 100644
index 000..f1f80ae
--- /dev/null
+++ 
b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
@@ -0,0 +1,34 @@
+
+
+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;>
+4.0.0
+
+org.apache.nifi.minifi
+minifi-provenance-repository-bundle
+0.2.1-SNAPSHOT
+
+
+minifi-provenance-repositories
+
+
+
+org.apache.nifi
+nifi-data-provenance-utils
+
+
+

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/37ddeb15/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/src/main/java/org/apache/nifi/provenance/NoOpProvenanceRepository.java
--
diff --git 
a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/src/main/java/org/apache/nifi/provenance/NoOpProvenanceRepository.java
 
b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/src/main/java/org/apache/nifi/provenance/NoOpProvenanceRepository.java
new file mode 100644
index 000..726cf2b
--- /dev/null
+++ 
b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/src/main/java/org/apache/nifi/provenance/NoOpProvenanceRepository.java
@@ -0,0 +1,143 @@
+/*
+ * 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.provenance;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.nifi.authorization.Authorizer;
+import org.apache.nifi.authorization.user.NiFiUser;
+import org.apache.nifi.events.EventReporter;
+import org.apache.nifi.provenance.lineage.ComputeLineageSubmission;
+import org.apache.nifi.provenance.search.Query;
+import org.apache.nifi.provenance.search.QuerySubmission;
+import org.apache.nifi.provenance.search.SearchableField;
+
+/**
+ * Implementation of {@link ProvenanceRepository} that does not
+ * store events.
+ *
+ */
+public class NoOpProvenanceRepository implements ProvenanceRepository {
+
+  @Override
+  public void initialize(EventReporter eventReporter, Authorizer authorizer,
+  ProvenanceAuthorizableFactory factory, IdentifierLookup identifierLookup)
+  throws IOException {
+
+  }
+
+  @Override
+  public void close() throws IOException {
+
+  }
+
+  @Override
+  public 

[2/2] nifi-minifi git commit: MINIFI-314 Add the NoOp Repository jar to the provenance repositories NAR

2017-11-27 Thread aldrin
MINIFI-314 Add the NoOp Repository jar to the provenance repositories NAR


Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/a4b57b06
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/a4b57b06
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/a4b57b06

Branch: refs/heads/master
Commit: a4b57b0694d51343d44ba64d39d2a5b536e57950
Parents: 37ddeb1
Author: Aldrin Piri 
Authored: Mon Nov 27 12:08:16 2017 -0500
Committer: Aldrin Piri 
Committed: Mon Nov 27 12:11:03 2017 -0500

--
 .../minifi-provenance-repository-nar/pom.xml| 4 
 pom.xml | 5 +
 2 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/a4b57b06/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
--
diff --git 
a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
 
b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
index b00fa15..8d95caf 100644
--- 
a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
+++ 
b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
@@ -33,6 +33,10 @@ limitations under the License.
 minifi-persistent-provenance-repository
 
 
+org.apache.nifi.minifi
+minifi-provenance-repositories
+
+
 org.apache.nifi
 nifi-data-provenance-utils
 provided

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/a4b57b06/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ccb399f..ae12d67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,6 +229,11 @@ limitations under the License.
 runtime
 zip
 
+
+org.apache.nifi.minifi
+minifi-provenance-repositories
+0.2.1-SNAPSHOT
+
 
 
 ch.qos.logback



nifi git commit: NIFI-4445 on fast machines the engine ran for 0 millis so the test needs to allow this case

2017-11-27 Thread mattyb149
Repository: nifi
Updated Branches:
  refs/heads/master 9766558ca -> ecb9c5e92


NIFI-4445 on fast machines the engine ran for 0 millis so the test needs to 
allow this case

Signed-off-by: Matthew Burgess 

This closes #2296


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ecb9c5e9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ecb9c5e9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ecb9c5e9

Branch: refs/heads/master
Commit: ecb9c5e92927d756d99b9eb5aa5f1b5a8cd95f8c
Parents: 9766558
Author: joewitt 
Authored: Sun Nov 26 11:11:26 2017 -0500
Committer: Matthew Burgess 
Committed: Mon Nov 27 11:47:54 2017 -0500

--
 .../nifi/reporting/script/ScriptedReportingTaskGroovyTest.groovy   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/ecb9c5e9/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/reporting/script/ScriptedReportingTaskGroovyTest.groovy
--
diff --git 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/reporting/script/ScriptedReportingTaskGroovyTest.groovy
 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/reporting/script/ScriptedReportingTaskGroovyTest.groovy
index f0b77d3..8ca5377 100644
--- 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/reporting/script/ScriptedReportingTaskGroovyTest.groovy
+++ 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/groovy/org/apache/nifi/reporting/script/ScriptedReportingTaskGroovyTest.groovy
@@ -192,7 +192,7 @@ class ScriptedReportingTaskGroovyTest {
 task.onTrigger context
 def se = task.scriptEngine
 // This script should store a variable called x with a map of stats to 
values
-assertTrue se.x?.uptime > 0
+assertTrue se.x?.uptime >= 0
 task.offerScriptEngine(se)
 
 }



[nifi-minifi-cpp] Git Push Summary

2017-11-27 Thread phrocker
Repository: nifi-minifi-cpp
Updated Tags:  refs/tags/minifi-cpp-0.3.0-RC2 [created] 0e4ce79b7


nifi git commit: NIFI-4526: Allow Target URI's of Remote Process Groups to be changed. This closes #2298

2017-11-27 Thread mcgilman
Repository: nifi
Updated Branches:
  refs/heads/master ce9787a41 -> 9766558ca


NIFI-4526: Allow Target URI's of Remote Process Groups to be changed. This 
closes #2298


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9766558c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9766558c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9766558c

Branch: refs/heads/master
Commit: 9766558cab563a89e89e113082fc0bd2fabb1907
Parents: ce9787a
Author: Mark Payne 
Authored: Mon Nov 20 14:57:55 2017 -0500
Committer: Matt Gilman 
Committed: Mon Nov 27 10:50:32 2017 -0500

--
 .../apache/nifi/groups/RemoteProcessGroup.java  |  2 +
 .../nifi/remote/StandardRemoteProcessGroup.java | 67 
 .../nifi/remote/StandardRemoteGroupPort.java|  9 ++-
 .../dao/impl/StandardRemoteProcessGroupDAO.java |  4 ++
 4 files changed, 69 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/9766558c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroup.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroup.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroup.java
index cb1e6c8..79b9509 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroup.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/RemoteProcessGroup.java
@@ -39,6 +39,8 @@ public interface RemoteProcessGroup extends 
ComponentAuthorizable, Positionable
 
 String getTargetUris();
 
+void setTargetUris(String targetUris);
+
 ProcessGroup getProcessGroup();
 
 void setProcessGroup(ProcessGroup group);

http://git-wip-us.apache.org/repos/asf/nifi/blob/9766558c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
index 8689d71..53d5c9f 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
@@ -98,7 +98,7 @@ public class StandardRemoteProcessGroup implements 
RemoteProcessGroup {
 
 private final String id;
 
-private final String targetUris;
+private volatile String targetUris;
 private final ProcessScheduler scheduler;
 private final EventReporter eventReporter;
 private final NiFiProperties nifiProperties;
@@ -176,8 +176,24 @@ public class StandardRemoteProcessGroup implements 
RemoteProcessGroup {
 };
 
 final Runnable checkAuthorizations = new InitializationTask();
-backgroundThreadExecutor = new FlowEngine(1, "Remote Process Group " + 
id + ": " + targetUris);
+backgroundThreadExecutor = new FlowEngine(1, "Remote Process Group " + 
id);
 backgroundThreadExecutor.scheduleWithFixedDelay(checkAuthorizations, 
5L, 30L, TimeUnit.SECONDS);
+backgroundThreadExecutor.submit(() -> {
+try {
+refreshFlowContents();
+} catch (final Exception e) {
+logger.warn("Unable to communicate with remote instance {}", 
new Object[] {this, e});
+}
+});
+}
+
+@Override
+public void setTargetUris(final String targetUris) {
+requireNonNull(targetUris);
+verifyCanUpdate();
+
+this.targetUris = targetUris;
+backgroundThreadExecutor.submit(new InitializationTask());
 }
 
 @Override
@@ -425,12 +441,25 @@ public class StandardRemoteProcessGroup implements 
RemoteProcessGroup {
 final Map inputPortByTargetId 
= inputPorts.values().stream()
 
.collect(Collectors.toMap(StandardRemoteGroupPort::getTargetIdentifier, 
Function.identity()));
 
-if 
(!inputPortByTargetId.containsKey(descriptor.getTargetId())) {
-

[nifi-minifi-cpp] Git Push Summary

2017-11-27 Thread phrocker
Repository: nifi-minifi-cpp
Updated Branches:
  refs/heads/MINIFICPP-304-RC2-0.3.0 [created] 0e4ce79b7


nifi-minifi-cpp git commit: MINIFICPP-319: Resolve missing licenses

2017-11-27 Thread aldrin
Repository: nifi-minifi-cpp
Updated Branches:
  refs/heads/master d3852a73b -> 0e4ce79b7


MINIFICPP-319: Resolve missing licenses

This closes #205.

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/0e4ce79b
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/0e4ce79b
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/0e4ce79b

Branch: refs/heads/master
Commit: 0e4ce79b78cbc9c89189eabb8042749a873d9723
Parents: d3852a7
Author: Marc Parisi 
Authored: Fri Nov 24 20:50:04 2017 -0500
Committer: Aldrin Piri 
Committed: Mon Nov 27 10:19:14 2017 -0500

--
 LICENSE | 260 +++
 1 file changed, 260 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/0e4ce79b/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 2713189..b90200c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -751,3 +751,263 @@ 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.
+
+This product contains code that is from LevelDB, which is available under the 
following license:
+
+Copyright (c) 2011 The LevelDB Authors. 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 Google Inc. 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.
+
+This product bundles rdcrc32.c and rdcrc32.h within librdkafka under the 
license as below.
+
+Copyright (c) 2006-2012, Thomas Pircher 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+This product bundles sys/queue.h within librdkafka, which under a 3-clause UC 
Regents copyright as below.
+
+ * Copyright (c) 1991, 1993
+ * The Regents of the University of California.  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
+ 

nifi git commit: NIFI-4622 Adding status tool to TLS toolkit

2017-11-27 Thread bbende
Repository: nifi
Updated Branches:
  refs/heads/master 16a23f5a0 -> ce9787a41


NIFI-4622 Adding status tool to TLS toolkit

This closes #2280.

Signed-off-by: Bryan Bende 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ce9787a4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ce9787a4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ce9787a4

Branch: refs/heads/master
Commit: ce9787a414e70f0fbcdbd3534eb87824fb0da288
Parents: 16a23f5
Author: Bryan Bende 
Authored: Fri Nov 17 17:15:03 2017 -0500
Committer: Bryan Bende 
Committed: Mon Nov 27 09:52:46 2017 -0500

--
 nifi-toolkit/nifi-toolkit-tls/pom.xml   |  10 ++
 .../apache/nifi/toolkit/tls/TlsToolkitMain.java |   2 +
 .../tls/commandLine/BaseCommandLine.java| 134 +---
 .../commandLine/BaseTlsToolkitCommandLine.java  | 157 +++
 .../tls/configuration/GetStatusConfig.java  |  41 +
 .../BaseCertificateAuthorityCommandLine.java|   4 +-
 .../TlsToolkitStandaloneCommandLine.java|   4 +-
 .../toolkit/tls/status/TlsToolkitGetStatus.java |  50 ++
 .../status/TlsToolkitGetStatusCommandLine.java  | 154 ++
 .../standalone/TlsToolkitStandaloneTest.java|   6 +-
 .../TlsToolkitGetStatusCommandLineTest.java | 120 ++
 11 files changed, 549 insertions(+), 133 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/ce9787a4/nifi-toolkit/nifi-toolkit-tls/pom.xml
--
diff --git a/nifi-toolkit/nifi-toolkit-tls/pom.xml 
b/nifi-toolkit/nifi-toolkit-tls/pom.xml
index e75c00a..94c8b7f 100644
--- a/nifi-toolkit/nifi-toolkit-tls/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-tls/pom.xml
@@ -63,6 +63,16 @@
 jetty-server
 
 
+org.glassfish.jersey.core
+jersey-client
+${jersey.version}
+
+
+org.glassfish.jersey.inject
+jersey-hk2
+${jersey.version}
+
+
 com.fasterxml.jackson.core
 jackson-databind
 ${jackson.version}

http://git-wip-us.apache.org/repos/asf/nifi/blob/ce9787a4/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/TlsToolkitMain.java
--
diff --git 
a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/TlsToolkitMain.java
 
b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/TlsToolkitMain.java
index c0dc4b2..2e6b8d1 100644
--- 
a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/TlsToolkitMain.java
+++ 
b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/TlsToolkitMain.java
@@ -21,6 +21,7 @@ import org.apache.nifi.toolkit.tls.commandLine.ExitCode;
 import 
org.apache.nifi.toolkit.tls.service.client.TlsCertificateAuthorityClientCommandLine;
 import 
org.apache.nifi.toolkit.tls.service.server.TlsCertificateAuthorityServiceCommandLine;
 import org.apache.nifi.toolkit.tls.standalone.TlsToolkitStandaloneCommandLine;
+import org.apache.nifi.toolkit.tls.status.TlsToolkitGetStatusCommandLine;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -42,6 +43,7 @@ public class TlsToolkitMain {
 mainMap.put("standalone", TlsToolkitStandaloneCommandLine.class);
 mainMap.put("server", TlsCertificateAuthorityServiceCommandLine.class);
 mainMap.put("client", TlsCertificateAuthorityClientCommandLine.class);
+mainMap.put("status", TlsToolkitGetStatusCommandLine.class);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/nifi/blob/ce9787a4/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/commandLine/BaseCommandLine.java
--
diff --git 
a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/commandLine/BaseCommandLine.java
 
b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/commandLine/BaseCommandLine.java
index 33b2c47..a75b7b8 100644
--- 
a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/commandLine/BaseCommandLine.java
+++ 
b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/commandLine/BaseCommandLine.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.nifi.toolkit.tls.commandLine;
 
 import org.apache.commons.cli.CommandLine;
@@ -23,72 +22,23 @@ import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
 import