nifi-minifi git commit: MINIFI-451 Updating Apache parent pom to version 19.

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master 6e5b00a8f -> 8f813958e


MINIFI-451 Updating Apache parent pom to version 19.

Signed-off-by: Joe Percivall 

This closes #122


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

Branch: refs/heads/master
Commit: 8f813958eb631b2b8ae8bc8eded71f166bf19c68
Parents: 6e5b00a
Author: Aldrin Piri 
Authored: Thu Apr 19 11:31:19 2018 -0400
Committer: Joe Percivall 
Committed: Sun Apr 22 21:15:24 2018 -0400

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8f813958/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9b52f2d..6a67872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
 
 org.apache
 apache
-17
+19
 
 
 

[3/3] nifi git commit: NIFI-4325 Added new processor that uses the JSON DSL.

[jpercivall]

NIFI-4325 Added new processor that uses the JSON DSL.

NIFI-4325 Cleaned up how ElasticSearch client service builds SSLContext, added 
query attribute to flowfiles and other changes requested in a code review.

This closes #2113.

Signed-off-by: Joe Percivall 


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

Branch: refs/heads/master
Commit: aa947e4d3e0e54877d24683fefa5da651332c433
Parents: 6b34d3b
Author: Mike Thomsen 
Authored: Sat Mar 3 17:32:42 2018 -0500
Committer: Joe Percivall 
Committed: Mon Mar 26 15:01:37 2018 -0400

--
 nifi-assembly/pom.xml   |  12 +
 .../nifi-elasticsearch-5-processors/pom.xml |   5 +
 .../org.apache.nifi.processor.Processor |   2 +-
 .../pom.xml |  47 ++
 .../src/main/resources/META-INF/LICENSE | 285 
 .../src/main/resources/META-INF/NOTICE  | 429 +++
 .../nifi-elasticsearch-client-service/pom.xml   | 163 +++
 .../ElasticSearchClientServiceImpl.java | 259 +++
 ...org.apache.nifi.controller.ControllerService |  15 +
 .../ElasticSearch5ClientService_IT.java | 105 +
 .../TestControllerServiceProcessor.java |  49 +++
 .../src/test/resources/setup.script |  32 ++
 .../nifi-elasticsearch-restapi-nar/pom.xml  |  43 ++
 .../src/main/resources/META-INF/LICENSE | 285 
 .../src/main/resources/META-INF/NOTICE  | 429 +++
 .../pom.xml | 116 +
 .../elasticsearch/JsonQueryElasticsearch.java   | 337 +++
 .../org.apache.nifi.processor.Processor |  15 +
 .../JsonQueryElasticsearchTest.java | 232 ++
 .../TestElasticSearchClientService.java | 206 +
 .../src/test/resources/DocumentExample.json |  21 +
 .../src/test/resources/log4j.properties |  22 +
 .../nifi-elasticsearch-bundle/pom.xml   |  11 +-
 .../pom.xml |  48 +++
 .../ElasticSearchClientService.java | 114 +
 .../nifi/elasticsearch/SearchResponse.java  |  67 +++
 .../nifi-standard-services-api-nar/pom.xml  |   6 +
 nifi-nar-bundles/nifi-standard-services/pom.xml |   1 +
 pom.xml |  28 +-
 29 files changed, 3368 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/aa947e4d/nifi-assembly/pom.xml
--
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 5e5eef3..baf8157 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -447,6 +447,18 @@ language governing permissions and limitations under the 
License. -->
 
 
 org.apache.nifi
+nifi-elasticsearch-client-service-nar
+1.6.0-SNAPSHOT
+nar
+
+
+org.apache.nifi
+nifi-elasticsearch-restapi-nar
+1.6.0-SNAPSHOT
+nar
+
+
+org.apache.nifi
 nifi-lumberjack-nar
 1.6.0-SNAPSHOT
 nar

http://git-wip-us.apache.org/repos/asf/nifi/blob/aa947e4d/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
index ba5e9aa..bea8596 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
@@ -54,6 +54,11 @@ language governing permissions and limitations under the 
License. -->
 ${es.version}
 
 
+org.elasticsearch.client
+rest
+${es.version}
+
+
 org.apache.nifi
 nifi-ssl-context-service-api
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/aa947e4d/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
 

[2/3] nifi git commit: NIFI-4325 Added new processor that uses the JSON DSL.

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/aa947e4d/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/src/main/resources/META-INF/LICENSE
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/src/main/resources/META-INF/LICENSE
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/src/main/resources/META-INF/LICENSE
new file mode 100644
index 000..ee59a5d
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,285 @@
+
+ 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 

[1/3] nifi git commit: NIFI-4325 Added new processor that uses the JSON DSL.

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 6b34d3bea -> aa947e4d3


http://git-wip-us.apache.org/repos/asf/nifi/blob/aa947e4d/nifi-nar-bundles/nifi-standard-services/nifi-elasticsearch-client-service-api/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientService.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-services/nifi-elasticsearch-client-service-api/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientService.java
 
b/nifi-nar-bundles/nifi-standard-services/nifi-elasticsearch-client-service-api/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientService.java
new file mode 100644
index 000..1d44bc8
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-standard-services/nifi-elasticsearch-client-service-api/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientService.java
@@ -0,0 +1,114 @@
+/*
+ * 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.elasticsearch;
+
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.controller.ControllerService;
+import org.apache.nifi.processor.util.StandardValidators;
+import org.apache.nifi.ssl.SSLContextService;
+
+import java.io.IOException;
+
+@Tags({"elasticsearch", "client"})
+@CapabilityDescription("A controller service for accessing an ElasticSearch 
client.")
+public interface ElasticSearchClientService extends ControllerService {
+PropertyDescriptor HTTP_HOSTS = new PropertyDescriptor.Builder()
+.name("el-cs-http-hosts")
+.displayName("HTTP Hosts")
+.description("A comma-separated list of HTTP hosts that host 
ElasticSearch query nodes.")
+.required(true)
+.expressionLanguageSupported(true)
+.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+.build();
+PropertyDescriptor PROP_SSL_CONTEXT_SERVICE = new 
PropertyDescriptor.Builder()
+.name("el-cs-ssl-context-service")
+.displayName("SSL Context Service")
+.description("The SSL Context Service used to provide client 
certificate information for TLS/SSL "
++ "connections. This service only applies if the 
Elasticsearch endpoint(s) have been secured with TLS/SSL.")
+.required(false)
+.identifiesControllerService(SSLContextService.class)
+.build();
+PropertyDescriptor USERNAME = new PropertyDescriptor.Builder()
+.name("el-cs-username")
+.displayName("Username")
+.description("The username to use with XPack security.")
+.required(false)
+.expressionLanguageSupported(true)
+.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+.build();
+PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder()
+.name("el-cs-password")
+.displayName("Password")
+.description("The password to use with XPack security.")
+.required(false)
+.sensitive(true)
+.expressionLanguageSupported(true)
+.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+.build();
+PropertyDescriptor CONNECT_TIMEOUT = new PropertyDescriptor.Builder()
+.name("el-cs-connect-timeout")
+.displayName("Connect timeout")
+.description("Controls the amount of time, in milliseconds, before 
a timeout occurs when trying to connect.")
+.required(true)
+.defaultValue("5000")
+.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+.build();
+PropertyDescriptor SOCKET_TIMEOUT = new PropertyDescriptor.Builder()
+.name("el-cs-socket-timeout")
+.displayName("Read timeout")
+.description("Controls the amount of time, in milliseconds, before 
a timeout occurs when waiting for a response.")
+.required(true)
+.defaultValue("6")
+.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+  

nifi-minifi git commit: MINIFI-416 Adjusting Docker based integration tests to run with the conversion of images to use the Alpine based base image.

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master 677b08f00 -> 632adb9a3


MINIFI-416 Adjusting Docker based integration tests to run with the conversion 
of images to use the Alpine based base image.

Signed-off-by: Joe Percivall 


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

Branch: refs/heads/master
Commit: 632adb9a3de6d60bbd1cc9a0eb131a88258fa51d
Parents: 677b08f
Author: Aldrin Piri 
Authored: Wed Dec 13 23:38:31 2017 -0500
Committer: Joe Percivall 
Committed: Thu Dec 14 19:29:30 2017 -0500

--
 .../minifi-c2-docker/dockerhub/DockerBuild.sh   |  2 +-
 .../minifi-c2-docker/dockerhub/DockerRun.sh |  2 +-
 minifi-c2/minifi-c2-integration-tests/pom.xml   |  2 +-
 minifi-docker/dockerhub/DockerBuild.sh  |  2 +-
 minifi-docker/dockerhub/DockerRun.sh|  2 +-
 minifi-integration-tests/pom.xml|  4 ++-
 .../c2/HierarchicalC2IntegrationTest.java   |  6 ++--
 .../nifi/minifi/integration/util/LogUtil.java   |  1 +
 .../src/test/resources/Dockerfile.minifi.test   | 26 
 .../src/test/resources/Dockerfile.minific2.test | 25 
 .../docker-compose-c2-hierarchical.yml  | 31 +++-
 .../resources/docker-compose-v1-standalone.yml  |  7 +++--
 12 files changed, 91 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/632adb9a/minifi-c2/minifi-c2-docker/dockerhub/DockerBuild.sh
--
diff --git a/minifi-c2/minifi-c2-docker/dockerhub/DockerBuild.sh 
b/minifi-c2/minifi-c2-docker/dockerhub/DockerBuild.sh
index 0ce7783..7a64a3d 100755
--- a/minifi-c2/minifi-c2-docker/dockerhub/DockerBuild.sh
+++ b/minifi-c2/minifi-c2-docker/dockerhub/DockerBuild.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/bash
+#!/bin/sh
 
 DOCKER_UID=1000
 if [ -n "$1" ]; then

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/632adb9a/minifi-c2/minifi-c2-docker/dockerhub/DockerRun.sh
--
diff --git a/minifi-c2/minifi-c2-docker/dockerhub/DockerRun.sh 
b/minifi-c2/minifi-c2-docker/dockerhub/DockerRun.sh
index 9436848..a491927 100755
--- a/minifi-c2/minifi-c2-docker/dockerhub/DockerRun.sh
+++ b/minifi-c2/minifi-c2-docker/dockerhub/DockerRun.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/bash
+#!/bin/sh
 DOCKER_IMAGE="$(egrep -v '(^#|^\s*$|^\s*\t*#)' DockerImage.txt)"
 echo "Running Docker Image: $DOCKER_IMAGE"
 docker run -it -d $DOCKER_IMAGE

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/632adb9a/minifi-c2/minifi-c2-integration-tests/pom.xml
--
diff --git a/minifi-c2/minifi-c2-integration-tests/pom.xml 
b/minifi-c2/minifi-c2-integration-tests/pom.xml
index 79ff8bf..bb9b3f5 100644
--- a/minifi-c2/minifi-c2-integration-tests/pom.xml
+++ b/minifi-c2/minifi-c2-integration-tests/pom.xml
@@ -56,7 +56,7 @@ limitations under the License.
 
 com.palantir.docker.compose
 docker-compose-rule-junit4
-0.31.1
+0.33.0
 test
 
 

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/632adb9a/minifi-docker/dockerhub/DockerBuild.sh
--
diff --git a/minifi-docker/dockerhub/DockerBuild.sh 
b/minifi-docker/dockerhub/DockerBuild.sh
index efadfa0..69d0459 100755
--- a/minifi-docker/dockerhub/DockerBuild.sh
+++ b/minifi-docker/dockerhub/DockerBuild.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/bash
+#!/bin/sh
 
 DOCKER_UID=1000
 if [ -n "$1" ]; then

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/632adb9a/minifi-docker/dockerhub/DockerRun.sh
--
diff --git a/minifi-docker/dockerhub/DockerRun.sh 
b/minifi-docker/dockerhub/DockerRun.sh
index 9436848..a491927 100755
--- a/minifi-docker/dockerhub/DockerRun.sh
+++ b/minifi-docker/dockerhub/DockerRun.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/bash
+#!/bin/sh
 DOCKER_IMAGE="$(egrep -v '(^#|^\s*$|^\s*\t*#)' DockerImage.txt)"
 echo "Running Docker Image: $DOCKER_IMAGE"
 docker 

nifi git commit: NIFI-4047: Addressed issue with inconsistent Lexical policy between used cached schemas and non-cached schemas

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master cc741d2be -> d8dc2bb00


NIFI-4047: Addressed issue with inconsistent Lexical policy between used cached 
schemas and non-cached schemas

This closes #1907

Signed-off-by: Joe Percivall 


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

Branch: refs/heads/master
Commit: d8dc2bb00b6ccfe3faa42481ae541616401b4075
Parents: cc741d2
Author: Mark Payne 
Authored: Fri Jun 9 10:07:25 2017 -0400
Committer: Joe Percivall 
Committed: Fri Jun 9 12:05:11 2017 -0400

--
 .../main/java/org/apache/nifi/processors/standard/QueryRecord.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/d8dc2bb0/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java
index 5551ed1..8a9a771 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java
@@ -472,7 +472,7 @@ public class QueryRecord extends AbstractProcessor {
 final RecordReaderFactory recordParserFactory) throws SQLException {
 
 final Properties properties = new Properties();
-properties.put(CalciteConnectionProperty.LEX.camelName(), 
Lex.JAVA.name());
+properties.put(CalciteConnectionProperty.LEX.camelName(), 
Lex.MYSQL_ANSI.name());
 
 Connection connection = null;
 ResultSet resultSet = null;

nifi-minifi git commit: MINIFI-178 Updating README and Admin guide to use HTTPS links.

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master a2f6e9d8c -> bade5d740


MINIFI-178 Updating README and Admin guide to use HTTPS links.

This closes #70

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: bade5d74057db0b229b4d63fb170b8264ecab834
Parents: a2f6e9d
Author: Aldrin Piri 
Authored: Wed Dec 28 17:14:29 2016 -0500
Committer: Joseph Percivall 
Committed: Thu Jan 5 15:24:50 2017 -0500

--
 README.md|  4 ++--
 .../src/main/markdown/System_Admin_Guide.md  |  2 +-
 minifi-toolkit/minifi-toolkit-assembly/README.md | 19 ++-
 3 files changed, 13 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/bade5d74/README.md
--
diff --git a/README.md b/README.md
index 69659a8..ec6916f 100644
--- a/README.md
+++ b/README.md
@@ -148,8 +148,8 @@ The following provides more details on the included 
cryptographic software:
 Apache NiFi - MiNiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in
 java cryptography libraries for SSL, SSH, and the protection
 of sensitive configuration parameters. See
-http://bouncycastle.org/about.html
+https://bouncycastle.org/about.html
 http://www.jasypt.org/faq.html
 http://jcraft.com/c-info.html
-http://www.oracle.com/us/products/export/export-regulations-345813.html
+https://www.oracle.com/us/products/export/export-regulations-345813.html
 for more details on each of these libraries cryptography features.

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/bade5d74/minifi-docs/src/main/markdown/System_Admin_Guide.md
--
diff --git a/minifi-docs/src/main/markdown/System_Admin_Guide.md 
b/minifi-docs/src/main/markdown/System_Admin_Guide.md
index efc23b4..f2bcd40 100644
--- a/minifi-docs/src/main/markdown/System_Admin_Guide.md
+++ b/minifi-docs/src/main/markdown/System_Admin_Guide.md
@@ -326,7 +326,7 @@ The config.yml in the _conf_ directory is the main 
configuration file for contro
 and follows the YAML format laid out [here](http://www.yaml.org/).
 
 Alternatively, the MiNiFi Toolkit Converter can aid in creating a config.yml 
from a generated template exported from a NiFi instance.  This
-tool can be downloaded from http://nifi.apache.org/minifi/download.html under 
the `MiNiFi Toolkit Binaries` section.  Information on the toolkit's usage is
+tool can be downloaded from https://nifi.apache.org/minifi/download.html under 
the `MiNiFi Toolkit Binaries` section.  Information on the toolkit's usage is
 available at https://nifi.apache.org/minifi/minifi-toolkit.html.
 
 **Note:** Values for periods of time and data sizes must include the unit of 
measure,

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/bade5d74/minifi-toolkit/minifi-toolkit-assembly/README.md
--
diff --git a/minifi-toolkit/minifi-toolkit-assembly/README.md 
b/minifi-toolkit/minifi-toolkit-assembly/README.md
index 159c8f2..d50959f 100644
--- a/minifi-toolkit/minifi-toolkit-assembly/README.md
+++ b/minifi-toolkit/minifi-toolkit-assembly/README.md
@@ -5,7 +5,7 @@
   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
+  https://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.
@@ -27,9 +27,10 @@ MiNiFi is a child project effort of Apache NiFi.  The MiNiFi 
toolkit aids in cre
 
 ## Requirements
 * JRE 1.8
+
 ## Getting Started
 
-The latest version of the MiNiFi Toolkit Converter can be found at 
http://nifi.apache.org/minifi/download.html under the `MiNiFi Toolkit Binaries` 
section.
+The latest version of the MiNiFi Toolkit Converter can be found at 
https://nifi.apache.org/minifi/download.html under the `MiNiFi Toolkit 
Binaries` section.
 
 After downloading the binary and extracting it, to run the MiNiFi Toolkit 
Converter:
 - Change directory to the location where you installed MiNiFi Toolkit and run 
it and view usage information
@@ -53,24 +54,24 @@ Note: Currently MiNiFi does not support 

nifi git commit: NIFI-3249 - UpdateAttribute performance improvements

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 16898668c -> 35e8bedcc


NIFI-3249 - UpdateAttribute performance improvements

This closes #1356

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 35e8bedcc878ceb67638a50ff6c2506a7bb92c75
Parents: 1689866
Author: Bryan Rosander <brosan...@apache.org>
Authored: Thu Dec 22 12:02:31 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Dec 28 14:54:05 2016 -0500

--
 .../processors/attributes/UpdateAttribute.java  | 115 +++
 .../additionalDetails.html  |   6 +
 2 files changed, 75 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/35e8bedc/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
--
diff --git 
a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
 
b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
index 86f523a..4dee379 100644
--- 
a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
+++ 
b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
@@ -44,6 +44,7 @@ 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.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.annotation.lifecycle.OnStopped;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.PropertyValue;
 import org.apache.nifi.components.ValidationContext;
@@ -144,16 +145,20 @@ public class UpdateAttribute extends AbstractProcessor 
implements Searchable {
 };
 
 // static properties
+public static final String DELETE_ATTRIBUTES_EXPRESSION_NAME = "Delete 
Attributes Expression";
 public static final PropertyDescriptor DELETE_ATTRIBUTES = new 
PropertyDescriptor.Builder()
-.name("Delete Attributes Expression")
-.description("Regular expression for attributes to be deleted from 
FlowFiles.")
+.name(DELETE_ATTRIBUTES_EXPRESSION_NAME)
+.displayName(DELETE_ATTRIBUTES_EXPRESSION_NAME)
+.description("Regular expression for attributes to be deleted from 
FlowFiles.  Existing attributes that match will be deleted regardless of 
whether they are updated by this processor.")
 .required(false)
 .addValidator(DELETE_PROPERTY_VALIDATOR)
 .expressionLanguageSupported(true)
 .build();
 
+public static final String STORE_STATE_NAME = "Store State";
 public static final PropertyDescriptor STORE_STATE = new 
PropertyDescriptor.Builder()
-.name("Store State")
+.name(STORE_STATE_NAME)
+.displayName(STORE_STATE_NAME)
 .description("Select whether or not state will be stored. 
Selecting 'Stateless' will offer the default functionality of purely updating 
the attributes on a " +
 "FlowFile in a stateless manner. Selecting a stateful 
option will not only store the attributes on the FlowFile but also in the 
Processors " +
 "state. See the 'Stateful Usage' topic of the 'Additional 
Details' section of this processor's documentation for more information")
@@ -161,14 +166,20 @@ public class UpdateAttribute extends AbstractProcessor 
implements Searchable {
 .allowableValues(DO_NOT_STORE_STATE, STORE_STATE_LOCALLY)
 .defaultValue(DO_NOT_STORE_STATE)
 .build();
+
+public static final String STATEFUL_VARIABLES_INIT_VALUE_NAME = "Stateful 
Variables Initial Value";
 public static final PropertyDescriptor STATEFUL_VARIABLES_INIT_VALUE = new 
PropertyDescriptor.Builder()
-.name("Stateful Variables Initial Value")
+.name(STATEFUL_VARIABLES_INIT_VALUE_NAME)
+.displayName(STATEFUL_VARIABLES_INIT_VALUE_NAME)
 .description(&q

[nifi] Git Push Summary

[jpercivall]

Repository: nifi
Updated Tags:  refs/tags/rel/nifi-1.1.1 [created] e26fa480e

svn commit: r1775773 [2/2] - in /nifi/site/trunk/docs/nifi-docs/components: org.apache.nifi.processors.script.ExecuteScript/ org.apache.nifi.processors.script.InvokeScriptedProcessor/ org.apache.nifi.

[jpercivall]

egy is set to Move File and a file already 
exists in the
  destination directory with the same name, this property specifies how that 
naming conflict should be resolvedLog level 
when file not foundERRORTRACEDEBUGINFOWARNERRORFATALLog level to use in case the file does not exist when the 
processor is triggeredLog level when 
permission deniedERRORTRACEDEBUGINFOWARNERRORFATALLog level to use in case user jwitt does not have sufficient 
permissions to read the fileRelationships: NameDescriptionsuccessAny
 FlowFile that is successfully fetched from the file system will be 
 transferred to this Relationship.not.foundAny 
FlowFile that could not be fetched from the file system because the file could 
not be found will be transferred to this 
Relationship.permission.deniedAny FlowFile that 
could not be fetched from the file system due to the user running NiFi not 
having sufficient permissions will be transferred to this 
Relationship.failureAny FlowFile that could not be 
fetched from the file system for any reason other than insufficient permissions 
or the file not existing will be transferred to this 
Relationship.Reads Attributes: None 
specified.Writes Attributes: None specified.State management: 
This processor has no state management.Restricted: Provides 
operator the ability to read from and delete any file that NiFi has access 
to.See Also:GetFile, PutFile, 
ListFile
\ No newline at end of file
+FetchFileDescription: Reads the contents 
of a file from disk and streams it into the contents of an incoming FlowFile. 
Once this is done, the file is optionally moved elsewhere or deleted to help 
keep the file system organized.Tags: local, files, filesystem, 
ingest, ingress, get, source, input, restrictedProperties: In 
the list below, the names of required properties appear in 
bold. Any other properties (not in bold) are considered 
optional. The table also indicates any default values, and whether a property 
supports the NiFi 
Expression Language.NameDefault 
ValueAllowable ValuesDescriptionFile to F
 etch${absolute.path}/${filename}The fully-qualified filename of 
the file to fetch from the file systemSupports Expression 
Language: trueCompletion 
StrategyNoneNone Move 
File Delete File Specifies what to do 
 with the original file on the file system once it has been pulled into 
NiFiMove Destination DirectoryThe 
directory to the move the original file to once it has been fetched from the 
file system. This property is ignored unless the Completion Strategy is set to 
"Move File". If the directory does not exist, it will be 
created.Supports Expression Language: 
trueMove Conflict 
StrategyRenameRename Replace File Keep Existing Fail 
If Completion Strategy is set to Move File and a file already 
exists in the
  destination directory with the same name, this property specifies how that 
naming conflict should be resolvedLog level 
when file not foundERRORTRACEDEBUGINFOWARNERRORFATALLog level to use in case the file does not exist when the 
processor is triggeredLog level when 
permission deniedERRORTRACEDEBUGINFOWARNERRORFATALLog level to use in case user jpercivall does not have 
sufficient permissions to read the fileRelationships: 
NameDescriptionsuccessAny
 FlowFile that is successfully fetched from the file system wil
 l be transferred to this Relationship.not.foundAny 
FlowFile that could not be fetched from the file system because the file could 
not be found will be transferred to this 
Relationship.permission.deniedAny FlowFile that 
could not be fetched from the file system due to the user running NiFi not 
having sufficient permissions will be transferred to this 
Relationship.failureAny FlowFile that could not be 
fetched from the file system for any reason other than insufficient permissions 
or the file not existing will be transferred to this 
Relationship.Reads Attributes: None 
specified.Writes Attributes: None specified.State management: 
This processor has no state management.Restricted: Provides 
operator the ability to read from and delete any file that NiFi has access 
to.See Also:GetFile, PutFile, 
ListFile
\ No newline at end of file

Modified: 
nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.PostHTTP/index.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.PostHTTP/index.html?rev=1775773=1775772=1775773=diff
==
--- 
nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.PostHTTP/index.html
 (original)
+++ 
nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.PostHTTP/index.html
 Thu Dec 22 23:17:45 2016
@@ -1 +1 @@
-PostHTTPDescription: Performs an HTTP 
Post with the content of the FlowFileTags: http, https, remote, 
copy, archiveProperties: In the list below, the names of 
required properties appear in bold. Any other properties (not 
in bold) 

svn commit: r1775773 [1/2] - in /nifi/site/trunk/docs/nifi-docs/components: org.apache.nifi.processors.script.ExecuteScript/ org.apache.nifi.processors.script.InvokeScriptedProcessor/ org.apache.nifi.

[jpercivall]

Author: jpercivall
Date: Thu Dec 22 23:17:45 2016
New Revision: 1775773

URL: http://svn.apache.org/viewvc?rev=1775773=rev
Log:
Updating for nifi-1.1.1

Modified:

nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.script.ExecuteScript/index.html

nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.script.InvokeScriptedProcessor/index.html

nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.splunk.GetSplunk/index.html

nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.EncryptContent/index.html

nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.FetchFile/index.html

nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.PostHTTP/index.html

Modified: 
nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.script.ExecuteScript/index.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.script.ExecuteScript/index.html?rev=1775773=1775772=1775773=diff
==
--- 
nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.script.ExecuteScript/index.html
 (original)
+++ 
nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.script.ExecuteScript/index.html
 Thu Dec 22 23:17:45 2016
@@ -1 +1 @@
-ExecuteScriptDescription: Experimental - 
Executes a script given the flow file and a process session.  The script is 
responsible for handling the incoming flow file (transfer to SUCCESS or remove, 
e.g.) as well as any flow files created by the script. If the handling is 
incomplete or incorrect, the session will be rolled back. Experimental: Impact 
of sustained usage not yet verified.Tags: script, execute, 
groovy, python, jython, jruby, ruby, javascript, js, lua, luaj, 
restrictedProperties: In the list below, the names of required 
properties appear in bold. Any other properties (not in bold) 
are considered optional. The table also indicates any default values, and 
whether a property supports the NiF
 i Expression Language.NameDefault ValueAllowable 
ValuesDescriptionScript 
EngineECMAScriptECMAScriptThe 
engine to execute scriptsScript FilePath to script file to execute. Only one of Script File or 
Script Body may be usedSupports Expression Language: 
trueScript BodyBody of script to execute. Only one of Script File or Script 
Body may be usedModule DirectoryComma-separated list of paths to files and/or directories which
  contain modules required by the script.Dynamic 
Properties: Dynamic Properties allow the user to specify both the name 
and value of a property.NameValueDescriptionA script engine property to updateThe value to 
set it toUpdates a script engine property specified by the Dynamic 
Property's key with the value specified by the Dynamic Property's 
valueSupports Expression Language: 
trueRelationships: NameDescriptionsuccessFlowFiles
 that were successfully processedfailureFlowFiles 
that failed to be processedReads Attributes: None 
specified.Writes Attributes: None specified.State management: 
ScopeDescription
 LOCAL, CLUSTERScripts can store and retrieve state using the 
State Management APIs. Consult the State Manager section of the Developer's 
Guide for more details.Restricted: Provides 
operator the ability to execute arbitrary code assuming all permissions that 
NiFi has.
\ No newline at end of file
+ExecuteScriptDescription: Experimental - 
Executes a script given the flow file and a process session.  The script is 
responsible for handling the incoming flow file (transfer to SUCCESS or remove, 
e.g.) as well as any flow files created by the script. If the handling is 
incomplete or incorrect, the session will be rolled back. Experimental: Impact 
of sustained usage not yet verified.Tags: script, execute, 
groovy, python, jython, jruby, ruby, javascript, js, lua, luaj, 
restrictedProperties: In the list below, the names of required 
properties appear in bold. Any other properties (not in bold) 
are considered optional. The table also indicates any default values, and 
whether a property supports the NiF
 i Expression Language.NameDefault ValueAllowable 
ValuesDescriptionScript 
EngineAppleScriptAppleScriptECMAScriptThe engine to execute scriptsScript FilePath to script file to execute. 
Only one of Script File or Script Body may be usedSupports 
Expression Language: trueScript 
BodyBody of script to execute. Only one of Script File or Script 
Body may be usedModule DirectoryComma-separated list of paths to files and
 /or directories which contain modules required by the 
script.Dynamic Properties: Dynamic Properties 
allow the user to specify both the name and value of a property.NameValueDescriptionA script engine property to updateThe value to 
set it toUpdates a script engine property specified by the Dynamic 
Property's key with the value specified by the Dynamic

svn commit: r1775772 - in /nifi/site/trunk/docs/nifi-docs/html: ./ images/

[jpercivall]

Author: jpercivall
Date: Thu Dec 22 23:09:37 2016
New Revision: 1775772

URL: http://svn.apache.org/viewvc?rev=1775772=rev
Log:
Updating docs to 1.1.1

Added:
nifi/site/trunk/docs/nifi-docs/html/images/buttonDisable.png   (with props)
nifi/site/trunk/docs/nifi-docs/html/images/buttonEnable.png   (with props)
nifi/site/trunk/docs/nifi-docs/html/images/buttonStart.png   (with props)
nifi/site/trunk/docs/nifi-docs/html/images/buttonStop.png   (with props)
Removed:
nifi/site/trunk/docs/nifi-docs/html/images/NiFiArchitecture.png
nifi/site/trunk/docs/nifi-docs/html/images/iconUsers.png
nifi/site/trunk/docs/nifi-docs/html/images/iconViewDetails.png
Modified:
nifi/site/trunk/docs/nifi-docs/html/administration-guide.html
nifi/site/trunk/docs/nifi-docs/html/developer-guide.html
nifi/site/trunk/docs/nifi-docs/html/expression-language-guide.html
nifi/site/trunk/docs/nifi-docs/html/getting-started.html
nifi/site/trunk/docs/nifi-docs/html/nifi-in-depth.html
nifi/site/trunk/docs/nifi-docs/html/overview.html
nifi/site/trunk/docs/nifi-docs/html/user-guide.html

Modified: nifi/site/trunk/docs/nifi-docs/html/administration-guide.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/administration-guide.html?rev=1775772=1775771=1775772=diff
==
--- nifi/site/trunk/docs/nifi-docs/html/administration-guide.html (original)
+++ nifi/site/trunk/docs/nifi-docs/html/administration-guide.html Thu Dec 22 
23:09:37 2016
@@ -1,20 +1,4 @@
-
-
+
 
 
 
@@ -4884,6 +4868,14 @@ from the remote node before considering
 The 
location of the node firewall file. This is a file that may be used to list all 
the nodes that are allowed to connect
 to the cluster. It provides an additional layer of security. This value is 
blank by default, meaning that no firewall file is to be used.
 
+
+nifi.cluster.flow.election.max.wait.time
+Specifies 
the amount of time to wait before electing a Flow as the "correct" Flow. If the 
number of Nodes that have voted is equal to the number specified by the 
nifi.cluster.flow.election.max.candidates property, the cluster 
will not wait this long. The default is 5 min. Note that the time 
starts as soon as the first vote is cast.
+
+
+nifi.cluster.flow.election.max.candidates
+Specifies 
the number of Nodes required in the cluster to cause early election of Flows. 
This allows the Nodes in the cluster to avoid having to wait a long time before 
starting processing if we reach at least this number of nodes in the 
cluster.
+
 
 
 
@@ -5068,7 +5060,7 @@ that is specified.
 
 
 
-Last updated 2016-11-26 01:07:10 -05:00
+Last updated 2016-12-19 16:06:26 -05:00
 
 
 

Modified: nifi/site/trunk/docs/nifi-docs/html/developer-guide.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/developer-guide.html?rev=1775772=1775771=1775772=diff
==
--- nifi/site/trunk/docs/nifi-docs/html/developer-guide.html (original)
+++ nifi/site/trunk/docs/nifi-docs/html/developer-guide.html Thu Dec 22 
23:09:37 2016
@@ -1,20 +1,4 @@
-
-
+
 
 
 
@@ -3318,7 +3302,7 @@ worry about bothering us. Just ping the
 
 
 
-Last updated 2016-11-26 01:07:10 -05:00
+Last updated 2016-12-19 16:06:26 -05:00
 
 
 

Modified: nifi/site/trunk/docs/nifi-docs/html/expression-language-guide.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/expression-language-guide.html?rev=1775772=1775771=1775772=diff
==
--- nifi/site/trunk/docs/nifi-docs/html/expression-language-guide.html 
(original)
+++ nifi/site/trunk/docs/nifi-docs/html/expression-language-guide.html Thu Dec 
22 23:09:37 2016
@@ -1,20 +1,4 @@
-
-
+
 
 
 
@@ -3819,7 +3803,7 @@ an embedded Expression, though it does n
 
 
 
-Last updated 2016-11-26 01:07:10 -05:00
+Last updated 2016-12-19 16:06:26 -05:00
 
 
 

Modified: nifi/site/trunk/docs/nifi-docs/html/getting-started.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/getting-started.html?rev=1775772=1775771=1775772=diff
==
--- nifi/site/trunk/docs/nifi-docs/html/getting-started.html (original)
+++ nifi/site/trunk/docs/nifi-docs/html/getting-started.html Thu Dec 22 
23:09:37 2016
@@ -1,20 +1,4 @@
-
-
+
 
 
 
@@ -1623,7 +1607,7 @@ work back to the Apache NiFi community s
 
 
 
-Last updated 2016-11-26 01:07:10 -05:00
+Last updated 2016-12-19 16:06:27 -05:00
 
 
 

Added: nifi/site/trunk/docs/nifi-docs/html/images/buttonDisable.png
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/html/images/buttonDisable.png?rev=17

nifi-site git commit: NIFI-3203 Chaning download page for release 1.1.1

[jpercivall]

Repository: nifi-site
Updated Branches:
  refs/heads/master 6ababb766 -> 43105fd88


NIFI-3203 Chaning download page for release 1.1.1


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

Branch: refs/heads/master
Commit: 43105fd88eb318b2655eb11fbf2871325f6e352c
Parents: 6ababb7
Author: Joseph Percivall 
Authored: Thu Dec 22 17:58:50 2016 -0500
Committer: Joseph Percivall 
Committed: Thu Dec 22 17:58:50 2016 -0500

--
 src/pages/html/download.hbs | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/43105fd8/src/pages/html/download.hbs
--
diff --git a/src/pages/html/download.hbs b/src/pages/html/download.hbs
index 9a92a29..caad665 100644
--- a/src/pages/html/download.hbs
+++ b/src/pages/html/download.hbs
@@ -23,28 +23,28 @@ title: Apache NiFi Downloads
 
 Releases
 
-1.1.0
+1.1.1
 
 
 Sources:
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.0/nifi-1.1.0-source-release.zip;>nifi-1.1.0-source-release.zip
 ( https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-source-release.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-source-release.zip.sha256;>sha256
 )
+https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.1/nifi-1.1.1-source-release.zip;>nifi-1.1.1-source-release.zip
 ( https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-source-release.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-source-release.zip.sha256;>sha256
 )
 
 
 
 Binaries
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.0/nifi-1.1.0-bin.tar.gz;>nifi-1.1.0-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.tar.gz.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.tar.gz.sha256;>sha256
 )
+https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.1/nifi-1.1.1-bin.tar.gz;>nifi-1.1.1-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha256;>sha256
 )
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.0/nifi-1.1.0-bin.zip;>nifi-1.1.0-bin.zip
 ( https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.zip.asc;>asc, 
https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.zip.md5;>md5, 
https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.zip.sha1;>sha1, 
https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.zip.sha256;>sha256
 )
+https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.1/nifi-1.1.1-bin.zip;>nifi-1.1.1-bin.zip
 ( https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.zip.asc;>asc, 
https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.zip.md5;>md5, 
https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.zip.sha1;>sha1, 
https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.zip.sha256;>sha256
 )
 
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz;>nifi-toolkit-1.1.0-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz.sha256;>sha256
 )
+https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz;>nifi-toolkit-1.1.1-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz.asc;>asc,
 

svn commit: r1775766 [1/2] - in /nifi/site/trunk: assets/js/jquery.min.js download.html

[jpercivall]

Author: jpercivall
Date: Thu Dec 22 22:54:56 2016
New Revision: 1775766

URL: http://svn.apache.org/viewvc?rev=1775766=rev
Log:
NIFI-3203 Chaning download page for release 1.1.1

Modified:
nifi/site/trunk/assets/js/jquery.min.js
nifi/site/trunk/download.html

Modified: nifi/site/trunk/assets/js/jquery.min.js
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/assets/js/jquery.min.js?rev=1775766=1775765=1775766=diff
==
--- nifi/site/trunk/assets/js/jquery.min.js (original)
+++ nifi/site/trunk/assets/js/jquery.min.js Thu Dec 22 22:54:56 2016
@@ -1,4 +1,5 @@
-/*! jQuery v2.2.2 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof 
module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw
 new Error("jQuery requires a window with a document");return 
b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var 
c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.2",n=function(a,b){return
 new 
n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return
 
b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return
 e.call(this)},get:function(a){return 
null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var 
b=n.merge(this.constructor(),a);return 
b.prevObject=this,b.context=this.context,b},each:function(a){return 
n.each(this,a)},map:function(a){return 
this.pushStack(n.map(this,function(b,c){return 
a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this
 ,arguments))},first:function(){return this.eq(0)},last:function(){return 
this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return 
this.pushStack(c>=0&>c?[this[c]]:[])},end:function(){return 
this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var
 
a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof
 g&&(j=g,g=arguments[h]||{},h++),"object"==typeof 
g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b
 in 
a)c=g[b],d=a[b],g!==d&&(j&&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&(c)?c:[]):f=c&(c)?c:{},g[b]=n.extend(j,f,d)):void
 0!==d&&(g[b]=d));return 
g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw
 new 
Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return
 null!=a&===a.window},isNumeric:function(a){va
 r 
b=a&();return!n.isArray(a)&(b)+1>=0},isPlainObject:function(a){var
 
b;if("object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype||{},"isPrototypeOf"))return!1;for(b
 in a);return void 0===b||k.call(a,b)},isEmptyObject:function(a){var b;for(b in 
a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof 
a||"function"==typeof a?i[j.call(a)]||"object":typeof 
a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use 
strict")?(b=d.createElement("script"),b.text=a,d.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return
 a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return 
a.nodeName&()===b.toLowerCase()},each:function(a,b){var 
c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else 
for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return 
null==a?"":(a+"").
 replace(o,"")},makeArray:function(a,b){var c=b||[];return 
null!=a&&(s(Object(a))?n.merge(c,"string"==typeof 
a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){return 
null==b?-1:h.call(b,a,c)},merge:function(a,b){for(var 
c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return 
a.length=e,a},grep:function(a,b,c){for(var 
d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&(a[f]);return 
e},map:function(a,b,c){var 
d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&(e);else
 for(g in a)e=b(a[g],g,c),null!=e&(e);return 
f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof 
b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return 
a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void
 0},now:Date.now,support:l}),"function"==typeof 
Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.ea

svn commit: r1775766 [2/2] - in /nifi/site/trunk: assets/js/jquery.min.js download.html

[jpercivall]

Modified: nifi/site/trunk/download.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/download.html?rev=1775766=1775765=1775766=diff
==
--- nifi/site/trunk/download.html (original)
+++ nifi/site/trunk/download.html Thu Dec 22 22:54:56 2016
@@ -120,28 +120,28 @@
 
 Releases
 
-1.1.0
+1.1.1
 
 
 Sources:
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.0/nifi-1.1.0-source-release.zip;>nifi-1.1.0-source-release.zip
 ( https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-source-release.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-source-release.zip.sha256;>sha256
 )
+https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.1/nifi-1.1.1-source-release.zip;>nifi-1.1.1-source-release.zip
 ( https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-source-release.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-source-release.zip.sha256;>sha256
 )
 
 
 
 Binaries
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.0/nifi-1.1.0-bin.tar.gz;>nifi-1.1.0-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.tar.gz.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.tar.gz.sha256;>sha256
 )
+https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.1/nifi-1.1.1-bin.tar.gz;>nifi-1.1.1-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha256;>sha256
 )
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.0/nifi-1.1.0-bin.zip;>nifi-1.1.0-bin.zip
 ( https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.zip.asc;>asc, 
https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.zip.md5;>md5, 
https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.zip.sha1;>sha1, 
https://www.apache.org/dist/nifi/1.1.0/nifi-1.1.0-bin.zip.sha256;>sha256
 )
+https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.1/nifi-1.1.1-bin.zip;>nifi-1.1.1-bin.zip
 ( https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.zip.asc;>asc, 
https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.zip.md5;>md5, 
https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.zip.sha1;>sha1, 
https://www.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.zip.sha256;>sha256
 )
 
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz;>nifi-toolkit-1.1.0-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.tar.gz.sha256;>sha256
 )
+https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz;>nifi-toolkit-1.1.1-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz.sha256;>sha256
 )
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.0/nifi-toolkit-1.1.0-bin.zip;>nifi-toolkit-1.1.0-bin.zip
 ( https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.1.0/nifi-toolkit-1.1.0-bin.zip.sha256;>sha256
 )
+https://www.apache.org/dyn/closer.lua?path=/nifi/1.1.1/nifi-toolkit-1.1.1-bin.zip;>nifi-toolkit-1.1.1-bin.zip
 ( https://www.apache.org/dist/nifi/1.1.1/nifi-toolkit-1.1.1-bin.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.1.1/nifi-toolkit-1.1.1-bin.zip.md5;>md5,
 

svn commit: r17548 - /release/nifi/1.1.0/

[jpercivall]

Author: jpercivall
Date: Thu Dec 22 22:51:47 2016
New Revision: 17548

Log:
Removing 1.1.0 with the release of 1.1.1

Removed:
release/nifi/1.1.0/

svn commit: r17547 - /dev/nifi/1.1.1/ /release/nifi/1.1.1/

[jpercivall]

Author: jpercivall
Date: Thu Dec 22 22:37:25 2016
New Revision: 17547

Log:
NIFI-3203

Added:
release/nifi/1.1.1/
  - copied from r17546, dev/nifi/1.1.1/
Removed:
dev/nifi/1.1.1/

nifi-minifi git commit: MINIFI-128 Adjusting handling of change ingestor configuration and error messaging.

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master 2fcf5ec60 -> a2f6e9d8c


MINIFI-128 Adjusting handling of change ingestor configuration and error 
messaging.

This closes #68

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: a2f6e9d8c336071dfb44aafdd3b4391230fe1193
Parents: 2fcf5ec
Author: Aldrin Piri 
Authored: Tue Dec 20 15:42:03 2016 -0500
Committer: Joseph Percivall 
Committed: Thu Dec 22 16:43:51 2016 -0500

--
 .../apache/nifi/minifi/bootstrap/RunMiNiFi.java | 50 
 .../nifi/minifi/bootstrap/ShutdownHook.java | 10 ++--
 2 files changed, 35 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/a2f6e9d8/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java
--
diff --git 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java
 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java
index 9ac7e23..b46f312 100644
--- 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java
+++ 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java
@@ -16,6 +16,21 @@
  */
 package org.apache.nifi.minifi.bootstrap;
 
+import org.apache.commons.io.input.TeeInputStream;
+import org.apache.commons.lang3.StringUtils;
+import 
org.apache.nifi.minifi.bootstrap.configuration.ConfigurationChangeCoordinator;
+import 
org.apache.nifi.minifi.bootstrap.configuration.ConfigurationChangeException;
+import 
org.apache.nifi.minifi.bootstrap.configuration.ConfigurationChangeListener;
+import org.apache.nifi.minifi.bootstrap.status.PeriodicStatusReporter;
+import org.apache.nifi.minifi.bootstrap.util.ConfigTransformer;
+import org.apache.nifi.minifi.commons.status.FlowStatusReport;
+import org.apache.nifi.stream.io.ByteArrayInputStream;
+import org.apache.nifi.stream.io.ByteArrayOutputStream;
+import org.apache.nifi.util.Tuple;
+import org.apache.nifi.util.file.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.EOFException;
 import java.io.File;
@@ -63,21 +78,6 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.commons.io.input.TeeInputStream;
-import org.apache.commons.lang3.StringUtils;
-import 
org.apache.nifi.minifi.bootstrap.configuration.ConfigurationChangeException;
-import 
org.apache.nifi.minifi.bootstrap.configuration.ConfigurationChangeListener;
-import org.apache.nifi.minifi.bootstrap.status.PeriodicStatusReporter;
-import 
org.apache.nifi.minifi.bootstrap.configuration.ConfigurationChangeCoordinator;
-import org.apache.nifi.minifi.bootstrap.util.ConfigTransformer;
-import org.apache.nifi.minifi.commons.status.FlowStatusReport;
-import org.apache.nifi.stream.io.ByteArrayInputStream;
-import org.apache.nifi.stream.io.ByteArrayOutputStream;
-import org.apache.nifi.util.Tuple;
-import org.apache.nifi.util.file.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
 /**
@@ -1187,18 +1187,26 @@ public class RunMiNiFi implements 
QueryableStatusAggregator, ConfigurationFileHo
 return;
 }
 
+// Instantiate configuration listener and configured ingestors
+this.changeListener = new MiNiFiConfigurationChangeListener(this, 
defaultLogger);
+this.periodicStatusReporters = initializePeriodicNotifiers();
+startPeriodicNotifiers();
+try {
+this.changeCoordinator = initializeNotifier(this.changeListener);
+} catch (Exception e) {
+final String errorMsg = "Unable to start as {} is not properly 
configured due to: {}";
+cmdLogger.error(errorMsg, this.changeListener.getDescriptor(), 
e.getMessage());
+defaultLogger.error("Unable to initialize notifier.", e);
+// if we fail to initialize, exit without attempting to start
+System.exit(1);
+}
+
 Tuple tuple = startMiNiFi();
 if (tuple == null) {
 cmdLogger.info("Start method returned null, ending start 
command.");
 return;
 }
 
-// Instantiate configuration listener and configured ingestors
-this.changeListener = new 

nifi git commit: NIFI-3234: Updated two broken links in the Encryption Configuration sectionof the Admin Guide

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 445c07596 -> 00149603c


NIFI-3234: Updated two broken links in the Encryption Configuration sectionof 
the Admin Guide

This closes #1345

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 00149603c81593b502f8527f9b1d4c247499f60a
Parents: 445c075
Author: Sarah Olson <solso...@yahoo.com>
Authored: Tue Dec 20 09:33:37 2016 -0800
Committer: jpercivall <jperciv...@apache.org>
Committed: Tue Dec 20 17:41:08 2016 -0500

--
 nifi-docs/src/main/asciidoc/administration-guide.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/00149603/nifi-docs/src/main/asciidoc/administration-guide.adoc
--
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc 
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 2835576..2c643c1 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -867,8 +867,8 @@ Additional Resources
 * http://security.stackexchange.com/a/6415/16485[Bcrypt vs PBKDF2]
 * http://wildlyinaccurate.com/bcrypt-choosing-a-work-factor/[Choosing a work 
factor for Bcrypt]
 * 
https://docs.spring.io/spring-security/site/docs/current/apidocs/org/springframework/security/crypto/bcrypt/BCrypt.html[Spring
 Security Bcrypt]
-* https://www.openssl.org/docs/manmaster/crypto/EVP_BytesToKey.html[OpenSSL 
EVP BytesToKey PKCS#1v1.5]
-* https://www.openssl.org/docs/manmaster/crypto/PKCS5_PBKDF2_HMAC.html[OpenSSL 
PBKDF2 KDF]
+* https://www.openssl.org/docs/man1.1.0/crypto/EVP_BytesToKey.html[OpenSSL EVP 
BytesToKey PKCS#1v1.5]
+* https://wiki.openssl.org/index.php/Manual:PKCS5_PBKDF2_HMAC(3)[OpenSSL 
PBKDF2 KDF]
 * http://security.stackexchange.com/a/29139/16485[OpenSSL KDF flaws 
description]
 
 Salt and IV Encoding

svn commit: r17494 - /dev/nifi/1.1.1/

[jpercivall]

Author: jpercivall
Date: Mon Dec 19 22:26:51 2016
New Revision: 17494

Log:
Adding 1.1.1 RC-1 artifacts

Added:
dev/nifi/1.1.1/
dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz   (with props)
dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.asc
dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.md5
dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha1
dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha256
dev/nifi/1.1.1/nifi-1.1.1-bin.zip   (with props)
dev/nifi/1.1.1/nifi-1.1.1-bin.zip.asc
dev/nifi/1.1.1/nifi-1.1.1-bin.zip.md5
dev/nifi/1.1.1/nifi-1.1.1-bin.zip.sha1
dev/nifi/1.1.1/nifi-1.1.1-bin.zip.sha256
dev/nifi/1.1.1/nifi-1.1.1-source-release.zip   (with props)
dev/nifi/1.1.1/nifi-1.1.1-source-release.zip.asc
dev/nifi/1.1.1/nifi-1.1.1-source-release.zip.md5
dev/nifi/1.1.1/nifi-1.1.1-source-release.zip.sha1
dev/nifi/1.1.1/nifi-1.1.1-source-release.zip.sha256
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz   (with props)
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz.asc
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz.md5
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz.sha1
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.tar.gz.sha256
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.zip   (with props)
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.zip.asc
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.zip.md5
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.zip.sha1
dev/nifi/1.1.1/nifi-toolkit-1.1.1-bin.zip.sha256

Added: dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz
==
Binary file - no diff available.

Propchange: dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.asc
==
--- dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.asc (added)
+++ dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.asc Mon Dec 19 22:26:51 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJYWFdXAAoJEDxtuv4iiG/uvAYP/1E42kLtmFv1ljpSAuwpp92Z
+DNxw5Su9vC7oamPjpxCvLBSUuuYNjTgtFgkTBCLXp1jQXudhtEnFH4EyGLJm/lVV
+OxAZSI+4rnNXNazS8PYfsgIQcNqY2hcyT7xDejy9lgYTP49t6gpTcXIRbPiSw1/H
+G3jBdkCzzaIvZOawRiipnsMBa8I4KZnC/yxuOjWesLVAfwms2KHI84GN0sJwLL0Y
+g+KUYVOavGi+0FV7B5sCZKKQgcsc1JUApbc0qClLM0tx3u3EUQeWfaPoiocM22Vr
++FevRC9eYkjKmaKDW90vSSYB7FG5m/fj5Xc6TIgSb3+H13BcsxWcjZQboQ8xV/cX
+G3mrMNSicqO94VD3lG7h42VF6CxVb/igFEe/OxexeTqT/bMfqIr6IZvxtpOnmOdx
+o+fCF3JH7HVVrM9JuCwvRM2egV3kstUCzA7o/Z3SXbO+SJVEdRVnf92+MK49Igt9
+8fI6jpD9RY0CBT37Tef2CBHxureGuBmGj9Z6+vGA89mDQkMRmgzL6mlC8e4nMvoI
+ATyyKVhHnY/TGGYR1F6R8dv2HdD5omILaxRTcruCnJsJYsMCwsBiJtQ6XsT3gcR4
+Tsvt4MUC+Evq9eo4WCLgMCV6Bhu9JbAowPI5ISyt8aE8U9gurBCPOw+ZAJ7CQISD
+bOlbMSmUcobXcKC+g6EM
+=HVGU
+-END PGP SIGNATURE-

Added: dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.md5
==
--- dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.md5 (added)
+++ dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.md5 Mon Dec 19 22:26:51 2016
@@ -0,0 +1 @@
+e223496a990f856b05dcf9e30abb92d4

Added: dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha1
==
--- dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha1 (added)
+++ dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha1 Mon Dec 19 22:26:51 2016
@@ -0,0 +1 @@
+2c9067606c09d01327c0aa5f3de41526376a5987

Added: dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha256
==
--- dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha256 (added)
+++ dev/nifi/1.1.1/nifi-1.1.1-bin.tar.gz.sha256 Mon Dec 19 22:26:51 2016
@@ -0,0 +1 @@
+afb58050b0904dab329b19b14250b57d3978743a1108323bdc52aba0c2a75853

Added: dev/nifi/1.1.1/nifi-1.1.1-bin.zip
==
Binary file - no diff available.

Propchange: dev/nifi/1.1.1/nifi-1.1.1-bin.zip
--
svn:mime-type = application/octet-stream

Added: dev/nifi/1.1.1/nifi-1.1.1-bin.zip.asc
==
--- dev/nifi/1.1.1/nifi-1.1.1-bin.zip.asc (added)
+++ dev/nifi/1.1.1/nifi-1.1.1-bin.zip.asc Mon Dec 19 22:26:51 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJYWFdcAAoJEDxtuv4iiG/ue8cP/ROV6LXME6AGceD6y7OuJaud
+qGtj1ueHKL0KtJQ8rax4GAlkOSXEUTQYTLJmk7LDjBXZiEw6OMAGWQYNtDy6BSWU
+BGwXtO5WO1vn7V/wrExUDQO6QhP0c/Hs8pvGRoaQRbo3xFlscMiyFnK/R7Xlos3M
+sYfbZ5sCXb2nX9st9atxrd7Wmeao08lc1PT3UxVg0fCWeHl2xyL9wDW067g9Ecqj
+l01D3+DxRQPJaQHqaTpUKaxdk0vixFnGknd9jkGw2ziv2WfqfFHfJapOYjyBPb+2
+IHhzIzZQQUhCZe1+Jhd03bG4D8dO0cWyUjDxUj847DgXrZnPsMAZ+krD73YsfyoR
+FuKF5dUOH5/tbvG90ZalGmF+FM9XN0m0JVj8ICaI4sgmMpOHWPPMkLqVm/4pm+qF
+JugcaRCKXj4ppb8qWB5rzra8UT1pEdJHSeavu5k1GlzDMqBtHAmHfNsptME2tl4j
+U78wn

[nifi] Git Push Summary

[jpercivall]

Repository: nifi
Updated Tags:  refs/tags/nifi-1.1.1-RC1 [created] 92ad7fad6

[5/8] nifi git commit: NIFI-3203-rc1 prepare for next development iteration

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4934f67..74a3697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi
-1.1.1
+1.1.2-SNAPSHOT
 pom
 Apache NiFi is an easy to use, powerful, and reliable system 
to process and distribute data.
 
@@ -76,7 +76,7 @@ language governing permissions and limitations under the 
License. -->
 scm:git:git://git.apache.org/nifi.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi.git
 https://git-wip-us.apache.org/repos/asf?p=nifi.git
-nifi-1.1.1-RC1
+nifi-1.1.0-RC2
 
 
 JIRA
@@ -830,92 +830,92 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-api
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-api
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-utils
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-site-to-site-client
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-web-utils
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-expression-language
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-custom-ui-utilities
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-ui-extension
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-flowfile-packager
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-socket-utils
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-data-provenance-utils
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-runtime
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-bootstrap
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-toolkit-tls
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-toolkit-encrypt-config
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-toolkit-s2s
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-toolkit-zookeeper-migrator
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-resources
-1.1.1
+1.1.2-SNAPSHOT
 resources
 runtime
 zip
@@ -923,7 +923,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-docs
-1.1.1
+1.1.2-SNAPSHOT
 resources
 runtime
 zip
@@ -931,436 +931,436 @@ language governing permissions and limitations under 
the License. -->
 
 org.apache.nifi
 nifi-framework-nar
-1.1.1
+1.1.2-SNAPSHOT
 nar
 
 
 org.apache.nifi
 nifi-provenance-repository-nar
-1.1.1
+1.1.2-SNAPSHOT
 nar
 
 
 org.apache.nifi
 nifi-standard-services-api-nar
-1.1.1
+1.1.2-SNAPSHOT
 nar
 
 
 org.apache.nifi
 nifi-ssl-context-service-nar
-1.1.1
+1.1.2-SNAPSHOT
 nar
 
 
 org.apache.nifi
 nifi-ssl-context-service-api
-1.1.1
+1.1.2-SNAPSHOT
 

[3/8] nifi git commit: NIFI-3203-rc1 prepare release nifi-1.1.1-RC1

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
index 2ff8785..7a680f9 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-framework
-1.1.1-SNAPSHOT
+1.1.1
 
 nifi-user-actions
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
index c497e47..ec7b509 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1-SNAPSHOT
+1.1.1
 
 nifi-custom-ui-utilities
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
index 471b1b0..d718b33 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1-SNAPSHOT
+1.1.1
 
 nifi-jetty
 jar

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
index 3e55942..fee9c92 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1-SNAPSHOT
+1.1.1
 
 nifi-ui-extension
 jar

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index 797f8a1..702cfb3 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1-SNAPSHOT
+1.1.1
 
 org.apache.nifi
 nifi-web-api

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
index 293ac89..846c407 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1-SNAPSHOT
+1.1.1
 
 org.apache.nifi
 nifi-web-content-access

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
--
diff --git 

[7/8] nifi git commit: NIFI-3203-rc1 prepare for next development iteration

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
index 7a680f9..fa5f3f7 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-framework
-1.1.1
+1.1.2-SNAPSHOT
 
 nifi-user-actions
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
index ec7b509..8cca876 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1
+1.1.2-SNAPSHOT
 
 nifi-custom-ui-utilities
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
index d718b33..2b9a5b3 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1
+1.1.2-SNAPSHOT
 
 nifi-jetty
 jar

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
index fee9c92..3825526 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1
+1.1.2-SNAPSHOT
 
 nifi-ui-extension
 jar

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index 702cfb3..51b9c25 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1
+1.1.2-SNAPSHOT
 
 org.apache.nifi
 nifi-web-api

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
index 846c407..5c8a532 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.1.1
+1.1.2-SNAPSHOT
 
 org.apache.nifi
 nifi-web-content-access

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
--
diff --git 

[1/8] nifi git commit: NIFI-3203-rc1 prepare release nifi-1.1.1-RC1

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-3203-rc1 [created] d02d9d30b


http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3b4f5ce..4934f67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi
-1.1.1-SNAPSHOT
+1.1.1
 pom
 Apache NiFi is an easy to use, powerful, and reliable system 
to process and distribute data.
 
@@ -76,7 +76,7 @@ language governing permissions and limitations under the 
License. -->
 scm:git:git://git.apache.org/nifi.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi.git
 https://git-wip-us.apache.org/repos/asf?p=nifi.git
-nifi-1.1.0-RC2
+nifi-1.1.1-RC1
 
 
 JIRA
@@ -830,92 +830,92 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-api
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-framework-api
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-utils
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-site-to-site-client
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-web-utils
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-expression-language
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-custom-ui-utilities
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-ui-extension
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-flowfile-packager
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-socket-utils
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-data-provenance-utils
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-runtime
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-bootstrap
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-toolkit-tls
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-toolkit-encrypt-config
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-toolkit-s2s
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-toolkit-zookeeper-migrator
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-resources
-1.1.1-SNAPSHOT
+1.1.1
 resources
 runtime
 zip
@@ -923,7 +923,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-docs
-1.1.1-SNAPSHOT
+1.1.1
 resources
 runtime
 zip
@@ -931,436 +931,436 @@ language governing permissions and limitations under 
the License. -->
 
 org.apache.nifi
 nifi-framework-nar
-1.1.1-SNAPSHOT
+1.1.1
 nar
 
 
 org.apache.nifi
 nifi-provenance-repository-nar
-1.1.1-SNAPSHOT
+1.1.1
 nar
 
 
 org.apache.nifi
 nifi-standard-services-api-nar
-1.1.1-SNAPSHOT
+1.1.1
 nar
 
 
 org.apache.nifi
 nifi-ssl-context-service-nar
-1.1.1-SNAPSHOT
+1.1.1
 nar
 
 
 org.apache.nifi
 

[4/8] nifi git commit: NIFI-3203-rc1 prepare release nifi-1.1.1-RC1

[jpercivall]

NIFI-3203-rc1 prepare release nifi-1.1.1-RC1


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

Branch: refs/heads/NIFI-3203-rc1
Commit: a92f2e36ed6be695e4dc6f624f6b3a96e6d1a57c
Parents: 986e716
Author: Joseph Percivall 
Authored: Mon Dec 19 16:08:24 2016 -0500
Committer: Joseph Percivall 
Committed: Mon Dec 19 16:08:24 2016 -0500

--
 nifi-api/pom.xml|   2 +-
 nifi-assembly/pom.xml   |   2 +-
 nifi-bootstrap/pom.xml  |   2 +-
 nifi-commons/nifi-data-provenance-utils/pom.xml |   2 +-
 nifi-commons/nifi-expression-language/pom.xml   |   2 +-
 nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 nifi-commons/nifi-hadoop-utils/pom.xml  |   4 +-
 nifi-commons/nifi-hl7-query-language/pom.xml|   2 +-
 nifi-commons/nifi-logging-utils/pom.xml |   2 +-
 nifi-commons/nifi-processor-utilities/pom.xml   |   2 +-
 nifi-commons/nifi-properties/pom.xml|   2 +-
 nifi-commons/nifi-schema-utils/pom.xml  |   2 +-
 nifi-commons/nifi-security-utils/pom.xml|   2 +-
 nifi-commons/nifi-site-to-site-client/pom.xml   |   4 +-
 nifi-commons/nifi-socket-utils/pom.xml  |   2 +-
 nifi-commons/nifi-utils/pom.xml |   4 +-
 nifi-commons/nifi-web-utils/pom.xml |   2 +-
 nifi-commons/nifi-write-ahead-log/pom.xml   |   2 +-
 nifi-commons/pom.xml|   2 +-
 nifi-docs/pom.xml   |   2 +-
 .../nifi-nifi-example-nar/pom.xml   |   2 +-
 .../nifi-nifi-example-processors/pom.xml|   2 +-
 nifi-external/nifi-example-bundle/pom.xml   |   4 +-
 nifi-external/nifi-spark-receiver/pom.xml   |   2 +-
 nifi-external/nifi-storm-spout/pom.xml  |   2 +-
 nifi-external/pom.xml   |   2 +-
 nifi-framework-api/pom.xml  |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml |   2 +-
 .../nifi-service-bundle-archetype/pom.xml   |   2 +-
 nifi-maven-archetypes/pom.xml   |   2 +-
 nifi-mock/pom.xml   |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml  |   4 +-
 .../nifi-ambari-reporting-task/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml  |   4 +-
 .../nifi-amqp-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml   |   6 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml  |   6 +-
 .../nifi-avro-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml   |   4 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml|   4 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |   2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml|   2 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml|   4 +-
 .../nifi-azure-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml  |   2 +-
 .../nifi-cassandra-nar/pom.xml  |   2 +-
 .../nifi-cassandra-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml  |   4 +-
 .../nifi-couchbase-nar/pom.xml  |   6 +-
 .../nifi-couchbase-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-couchbase-bundle/pom.xml  |   4 +-
 .../nifi-datadog-nar/pom.xml|   2 +-
 .../nifi-datadog-reporting-task/pom.xml |   2 +-
 nifi-nar-bundles/nifi-datadog-bundle/pom.xml|   4 +-
 .../nifi-elasticsearch-5-nar/pom.xml|   2 +-
 .../nifi-elasticsearch-5-processors/pom.xml |   2 +-
 .../nifi-elasticsearch-nar/pom.xml  |   2 +-
 .../nifi-elasticsearch-processors/pom.xml   |   2 +-
 .../nifi-elasticsearch-bundle/pom.xml   |   6 +-
 .../nifi-email-bundle/nifi-email-nar/pom.xml|   2 +-
 .../nifi-email-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-email-bundle/pom.xml  |   4 +-
 .../nifi-enrich-bundle/nifi-enrich-nar/pom.xml  |   2 +-
 .../nifi-enrich-processors/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-enrich-bundle/pom.xml |   4 +-
 .../nifi-evtx-bundle/nifi-evtx-nar/pom.xml  |   2 +-
 .../nifi-evtx-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-evtx-bundle/pom.xml   |   4 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml|   4 +-
 .../nifi-flume-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-flume-bundle/pom.xml  |   6 +-
 .../nifi-framework-nar/pom.xml  |   2 +-
 .../nifi-framework/nifi-administration/pom.xml  |   2 +-
 .../nifi-framework/nifi-authorizer/pom.xml  

[2/8] nifi git commit: NIFI-3203-rc1 prepare release nifi-1.1.1-RC1

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
 
b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
index 9a1fc00..8e3cb1e 100644
--- 
a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
+++ 
b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
@@ -18,12 +18,12 @@
 
 org.apache.nifi
 nifi-site-to-site-reporting-bundle
-1.1.1-SNAPSHOT
+1.1.1
 
 
 nifi-site-to-site-reporting-task
 Publishes NiFi metrics and provenance events via 
S2S
-1.1.1-SNAPSHOT
+1.1.1
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml 
b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml
index 3bdc5bc..805bb12 100644
--- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.1.1-SNAPSHOT
+1.1.1
 
 
 nifi-site-to-site-reporting-bundle
@@ -34,7 +34,7 @@

org.apache.nifi
nifi-site-to-site-reporting-task
-   1.1.1-SNAPSHOT 
+   1.1.1 

 
 org.glassfish.jersey.core

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml 
b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml
index 1a09ef1..5d9ca09 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml
@@ -19,11 +19,11 @@
 
 org.apache.nifi
 nifi-slack-bundle
-1.1.1-SNAPSHOT
+1.1.1
 
 
 nifi-slack-nar
-1.1.1-SNAPSHOT
+1.1.1
 nar
 
 true
@@ -34,7 +34,7 @@
 
 org.apache.nifi
 nifi-slack-processors
-1.1.1-SNAPSHOT
+1.1.1
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml 
b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
index e67b2eb..a2f93a4 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.nifi
 nifi-slack-bundle
-1.1.1-SNAPSHOT
+1.1.1
 
 
 nifi-slack-processors

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-slack-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-slack-bundle/pom.xml 
b/nifi-nar-bundles/nifi-slack-bundle/pom.xml
index 97aba17..618abe8 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-slack-bundle/pom.xml
@@ -19,12 +19,12 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.1.1-SNAPSHOT
+1.1.1
 
 
 org.apache.nifi
 nifi-slack-bundle
-1.1.1-SNAPSHOT
+1.1.1
 pom
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
index 98e47f0..f5df688 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-snmp-bundle
-1.1.1-SNAPSHOT
+1.1.1
 
 nifi-snmp-nar
 nar

http://git-wip-us.apache.org/repos/asf/nifi/blob/a92f2e36/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
index 9728ef6..d2b9ab1 100644
--- 

[6/8] nifi git commit: NIFI-3203-rc1 prepare for next development iteration

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
 
b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
index 8e3cb1e..b0fad33 100644
--- 
a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
+++ 
b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml
@@ -18,12 +18,12 @@
 
 org.apache.nifi
 nifi-site-to-site-reporting-bundle
-1.1.1
+1.1.2-SNAPSHOT
 
 
 nifi-site-to-site-reporting-task
 Publishes NiFi metrics and provenance events via 
S2S
-1.1.1
+1.1.2-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml 
b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml
index 805bb12..e922bb9 100644
--- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.1.1
+1.1.2-SNAPSHOT
 
 
 nifi-site-to-site-reporting-bundle
@@ -34,7 +34,7 @@

org.apache.nifi
nifi-site-to-site-reporting-task
-   1.1.1 
+   1.1.2-SNAPSHOT 

 
 org.glassfish.jersey.core

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml 
b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml
index 5d9ca09..db6eca2 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml
@@ -19,11 +19,11 @@
 
 org.apache.nifi
 nifi-slack-bundle
-1.1.1
+1.1.2-SNAPSHOT
 
 
 nifi-slack-nar
-1.1.1
+1.1.2-SNAPSHOT
 nar
 
 true
@@ -34,7 +34,7 @@
 
 org.apache.nifi
 nifi-slack-processors
-1.1.1
+1.1.2-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml 
b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
index a2f93a4..8149f19 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.nifi
 nifi-slack-bundle
-1.1.1
+1.1.2-SNAPSHOT
 
 
 nifi-slack-processors

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-slack-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-slack-bundle/pom.xml 
b/nifi-nar-bundles/nifi-slack-bundle/pom.xml
index 618abe8..1344768 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-slack-bundle/pom.xml
@@ -19,12 +19,12 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.1.1
+1.1.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-slack-bundle
-1.1.1
+1.1.2-SNAPSHOT
 pom
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
index f5df688..455f8f1 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-snmp-bundle
-1.1.1
+1.1.2-SNAPSHOT
 
 nifi-snmp-nar
 nar

http://git-wip-us.apache.org/repos/asf/nifi/blob/d02d9d30/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
index d2b9ab1..22c3923 100644
--- 

[8/8] nifi git commit: NIFI-3203-rc1 prepare for next development iteration

[jpercivall]

NIFI-3203-rc1 prepare for next development iteration


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

Branch: refs/heads/NIFI-3203-rc1
Commit: d02d9d30b13dc5d0d014d6797b330a7804f921b4
Parents: a92f2e3
Author: Joseph Percivall 
Authored: Mon Dec 19 16:08:38 2016 -0500
Committer: Joseph Percivall 
Committed: Mon Dec 19 16:08:38 2016 -0500

--
 nifi-api/pom.xml|   2 +-
 nifi-assembly/pom.xml   |   2 +-
 nifi-bootstrap/pom.xml  |   2 +-
 nifi-commons/nifi-data-provenance-utils/pom.xml |   2 +-
 nifi-commons/nifi-expression-language/pom.xml   |   2 +-
 nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 nifi-commons/nifi-hadoop-utils/pom.xml  |   4 +-
 nifi-commons/nifi-hl7-query-language/pom.xml|   2 +-
 nifi-commons/nifi-logging-utils/pom.xml |   2 +-
 nifi-commons/nifi-processor-utilities/pom.xml   |   2 +-
 nifi-commons/nifi-properties/pom.xml|   2 +-
 nifi-commons/nifi-schema-utils/pom.xml  |   2 +-
 nifi-commons/nifi-security-utils/pom.xml|   2 +-
 nifi-commons/nifi-site-to-site-client/pom.xml   |   4 +-
 nifi-commons/nifi-socket-utils/pom.xml  |   2 +-
 nifi-commons/nifi-utils/pom.xml |   4 +-
 nifi-commons/nifi-web-utils/pom.xml |   2 +-
 nifi-commons/nifi-write-ahead-log/pom.xml   |   2 +-
 nifi-commons/pom.xml|   2 +-
 nifi-docs/pom.xml   |   2 +-
 .../nifi-nifi-example-nar/pom.xml   |   2 +-
 .../nifi-nifi-example-processors/pom.xml|   2 +-
 nifi-external/nifi-example-bundle/pom.xml   |   4 +-
 nifi-external/nifi-spark-receiver/pom.xml   |   2 +-
 nifi-external/nifi-storm-spout/pom.xml  |   2 +-
 nifi-external/pom.xml   |   2 +-
 nifi-framework-api/pom.xml  |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml |   2 +-
 .../nifi-service-bundle-archetype/pom.xml   |   2 +-
 nifi-maven-archetypes/pom.xml   |   2 +-
 nifi-mock/pom.xml   |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml  |   4 +-
 .../nifi-ambari-reporting-task/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml  |   4 +-
 .../nifi-amqp-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml   |   6 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml  |   6 +-
 .../nifi-avro-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml   |   4 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml|   4 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |   2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml|   2 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml|   4 +-
 .../nifi-azure-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml  |   2 +-
 .../nifi-cassandra-nar/pom.xml  |   2 +-
 .../nifi-cassandra-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml  |   4 +-
 .../nifi-couchbase-nar/pom.xml  |   6 +-
 .../nifi-couchbase-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-couchbase-bundle/pom.xml  |   4 +-
 .../nifi-datadog-nar/pom.xml|   2 +-
 .../nifi-datadog-reporting-task/pom.xml |   2 +-
 nifi-nar-bundles/nifi-datadog-bundle/pom.xml|   4 +-
 .../nifi-elasticsearch-5-nar/pom.xml|   2 +-
 .../nifi-elasticsearch-5-processors/pom.xml |   2 +-
 .../nifi-elasticsearch-nar/pom.xml  |   2 +-
 .../nifi-elasticsearch-processors/pom.xml   |   2 +-
 .../nifi-elasticsearch-bundle/pom.xml   |   6 +-
 .../nifi-email-bundle/nifi-email-nar/pom.xml|   2 +-
 .../nifi-email-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-email-bundle/pom.xml  |   4 +-
 .../nifi-enrich-bundle/nifi-enrich-nar/pom.xml  |   2 +-
 .../nifi-enrich-processors/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-enrich-bundle/pom.xml |   4 +-
 .../nifi-evtx-bundle/nifi-evtx-nar/pom.xml  |   2 +-
 .../nifi-evtx-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-evtx-bundle/pom.xml   |   4 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml|   4 +-
 .../nifi-flume-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-flume-bundle/pom.xml  |   6 +-
 .../nifi-framework-nar/pom.xml  |   2 +-
 .../nifi-framework/nifi-administration/pom.xml  |   2 +-
 

[1/6] nifi git commit: NIFI-3178 Corrected missing Operate Palette button images in User Admin Guide

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/support/nifi-1.1.x 8e3c4eb9a -> 986e71609


NIFI-3178 Corrected missing Operate Palette button images in User Admin Guide

This closes #1314.

Signed-off-by: Bryan Bende <bbe...@apache.org>


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

Branch: refs/heads/support/nifi-1.1.x
Commit: ed202b6d2a8a597e46836a5a9ae04a6fe71c8056
Parents: 8e3c4eb
Author: Andrew Lim <andrewlim.apa...@gmail.com>
Authored: Fri Dec 9 12:51:38 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Mon Dec 19 15:20:09 2016 -0500

--
 .../src/main/asciidoc/images/buttonDisable.png  | Bin 0 -> 1028 bytes
 nifi-docs/src/main/asciidoc/images/buttonEnable.png | Bin 0 -> 777 bytes
 nifi-docs/src/main/asciidoc/images/buttonStart.png  | Bin 0 -> 725 bytes
 nifi-docs/src/main/asciidoc/images/buttonStop.png   | Bin 0 -> 451 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/ed202b6d/nifi-docs/src/main/asciidoc/images/buttonDisable.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/buttonDisable.png 
b/nifi-docs/src/main/asciidoc/images/buttonDisable.png
new file mode 100644
index 000..1a061d2
Binary files /dev/null and 
b/nifi-docs/src/main/asciidoc/images/buttonDisable.png differ

http://git-wip-us.apache.org/repos/asf/nifi/blob/ed202b6d/nifi-docs/src/main/asciidoc/images/buttonEnable.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/buttonEnable.png 
b/nifi-docs/src/main/asciidoc/images/buttonEnable.png
new file mode 100644
index 000..5d13988
Binary files /dev/null and 
b/nifi-docs/src/main/asciidoc/images/buttonEnable.png differ

http://git-wip-us.apache.org/repos/asf/nifi/blob/ed202b6d/nifi-docs/src/main/asciidoc/images/buttonStart.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/buttonStart.png 
b/nifi-docs/src/main/asciidoc/images/buttonStart.png
new file mode 100644
index 000..a2dc137
Binary files /dev/null and b/nifi-docs/src/main/asciidoc/images/buttonStart.png 
differ

http://git-wip-us.apache.org/repos/asf/nifi/blob/ed202b6d/nifi-docs/src/main/asciidoc/images/buttonStop.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/buttonStop.png 
b/nifi-docs/src/main/asciidoc/images/buttonStop.png
new file mode 100644
index 000..fdc0e30
Binary files /dev/null and b/nifi-docs/src/main/asciidoc/images/buttonStop.png 
differ

[3/6] nifi git commit: NIFI-3145 Rewriting double validation in NumberParsing

[jpercivall]

NIFI-3145 Rewriting double validation in NumberParsing

Adding more tests to TestQuery

NIFI-3145 Adding logic to handle lowercase hex values

This closes #1296


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

Branch: refs/heads/support/nifi-1.1.x
Commit: cd6ed27c86e58d15933cecec81284043be8c
Parents: 070776e
Author: jpercivall <jperciv...@apache.org>
Authored: Sun Dec 4 12:44:07 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Mon Dec 19 15:22:06 2016 -0500

--
 .../language/evaluation/util/NumberParsing.java |  93 +++---
 .../expression/language/TestQuery.java  | 122 ++-
 2 files changed, 168 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/cd6ed211/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/util/NumberParsing.java
--
diff --git 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/util/NumberParsing.java
 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/util/NumberParsing.java
index bbfd4e2..0e1ac6e 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/util/NumberParsing.java
+++ 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/util/NumberParsing.java
@@ -21,54 +21,57 @@ import java.util.regex.Pattern;
 
 public class NumberParsing {
 
-
 public static enum ParseResultType {
 NOT_NUMBER, WHOLE_NUMBER, DECIMAL;
 }
-private static final String Digits = "(\\p{Digit}+)";
-
-// Double regex according to Oracle documentation: 
http://docs.oracle.com/javase/6/docs/api/java/lang/Double.html#valueOf%28java.lang.String%29
-private static final String HexDigits  = "(\\p{XDigit}+)";
-// an exponent is 'e' or 'E' followed by an optionally
-// signed decimal integer.
-private static final String Exp= "[eE][+-]?"+Digits;
-private static final String fpRegex=
-("[\\x00-\\x20]*"+  // Optional leading "whitespace"
-"[+-]?(" + // Optional sign character
-"NaN|" +   // "NaN" string
-"Infinity|" +  // "Infinity" string
-
-// A decimal floating-point string representing a finite 
positive
-// number without a leading sign has at most five basic 
pieces:
-// Digits . Digits ExponentPart FloatTypeSuffix
-//
-// Since this method allows integer-only strings as input
-// in addition to strings of floating-point literals, the
-// two sub-patterns below are simplifications of the 
grammar
-// productions from the Java Language Specification, 2nd
-// edition, section 3.10.2.
-
-// Digits ._opt Digits_opt ExponentPart_opt 
FloatTypeSuffix_opt
-"((("+Digits+"(\\.)?("+Digits+"?)("+Exp+")?)|"+
-
-// . Digits ExponentPart_opt FloatTypeSuffix_opt
-"(\\.("+Digits+")("+Exp+")?)|"+
-
-// Hexadecimal strings
-"((" +
-// 0[xX] HexDigits ._opt BinaryExponent FloatTypeSuffix_opt
-"(0[xX]" + HexDigits + "(\\.)?)|" +
-
-// 0[xX] HexDigits_opt . HexDigits BinaryExponent 
FloatTypeSuffix_opt
-"(0[xX]" + HexDigits + "?(\\.)" + HexDigits + ")" +
-
-")[pP][+-]?" + Digits + "))" +
-"[fFdD]?))" +
-"[\\x00-\\x20]*");// Optional trailing "whitespace"
-
-private static final Pattern DOUBLE_PATTERN = Pattern.compile(fpRegex);
-
-private static final Pattern NUMBER_PATTERN = 
Pattern.compile("-?((\\d+)|(0[xX]" + HexDigits + "))");
+private static final String OptionalSign  = "[\\-\\+]?";
+
+private static final String Infinity = "(Infinity)";
+private static final String NotANumber = "(NaN)";
+
+// Ba

[2/6] nifi git commit: NIFI-3152: Ensure that we always close the IndexWriter when appropriate in SimpleIndexManager, even if an IOException is thrown when trying to commit the IndexWriter

[jpercivall]

NIFI-3152: Ensure that we always close the IndexWriter when appropriate in 
SimpleIndexManager, even if an IOException is thrown when trying to commit the 
IndexWriter

This closes #1300.

Signed-off-by: Bryan Bende <bbe...@apache.org>


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

Branch: refs/heads/support/nifi-1.1.x
Commit: 070776ebaef9b5c4a0632dd79fdf32617c879f40
Parents: ed202b6
Author: Mark Payne <marka...@hotmail.com>
Authored: Mon Dec 5 14:30:57 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Mon Dec 19 15:21:12 2016 -0500

--
 .../org/apache/nifi/provenance/lucene/SimpleIndexManager.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/070776eb/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/SimpleIndexManager.java
--
diff --git 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/SimpleIndexManager.java
 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/SimpleIndexManager.java
index 9e3bacd..81816d2 100644
--- 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/SimpleIndexManager.java
+++ 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/SimpleIndexManager.java
@@ -158,8 +158,11 @@ public class SimpleIndexManager implements IndexManager {
 } else if (count.getCount() <= 1) {
 // we are finished with this writer.
 logger.debug("Decrementing count for Index Writer for {} to 
{}; Closing writer", indexingDirectory, count.getCount() - 1);
-writer.commit();
-count.close();
+try {
+writer.commit();
+} finally {
+count.close();
+}
 } else {
 // decrement the count.
 logger.debug("Decrementing count for Index Writer for {} to 
{}", indexingDirectory, count.getCount() - 1);

[5/6] nifi git commit: NIFI-3071: Deprecated InputStreams & OutputStream sin org.apache.nifi.stream.io package in favor of using their Java counterparts

[jpercivall]

NIFI-3071: Deprecated InputStreams & OutputStream sin org.apache.nifi.stream.io 
package in favor of using their Java counterparts


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

Branch: refs/heads/support/nifi-1.1.x
Commit: 9153fca2172c7a8d9b97a2c848d6a0529f1ad13c
Parents: a71d73b
Author: Mark Payne <marka...@hotmail.com>
Authored: Sun Dec 4 11:43:41 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Mon Dec 19 15:24:29 2016 -0500

--
 .../nifi/stream/io/BufferedInputStream.java | 438 +--
 .../nifi/stream/io/BufferedOutputStream.java| 105 +
 .../nifi/stream/io/ByteArrayInputStream.java| 187 +---
 .../nifi/stream/io/ByteArrayOutputStream.java   | 201 +
 .../apache/nifi/stream/io/DataOutputStream.java | 346 +--
 .../stream/io/LeakyBucketStreamThrottler.java   |   6 +-
 .../stream/io/TestLeakyBucketThrottler.java |   4 +-
 .../nifi/processors/splunk/PutSplunk.java   |  20 +-
 .../nifi/processors/standard/TailFile.java  |  15 +-
 .../processors/standard/util/JmsFactory.java|   6 +-
 10 files changed, 59 insertions(+), 1269 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/9153fca2/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java
--
diff --git 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java
 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java
index 324f59f..8dba899 100644
--- 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java
+++ 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/BufferedInputStream.java
@@ -16,445 +16,19 @@
  */
 package org.apache.nifi.stream.io;
 
-import java.io.IOException;
 import java.io.InputStream;
 
 /**
- * This class is a slight modification of the BufferedInputStream in the 
java.io package. The modification is that this implementation does not provide 
synchronization on method calls, which means
- * that this class is not suitable for use by multiple threads. However, the 
absence of these synchronized blocks results in potentially much better 
performance.
+ * @deprecated use java.io.BufferedInputStream instead
  */
-public class BufferedInputStream extends InputStream {
+@Deprecated
+public class BufferedInputStream extends java.io.BufferedInputStream {
 
-private final InputStream in;
-
-private static int DEFAULT_BUFFER_SIZE = 8192;
-
-/**
- * The maximum size of array to allocate.
- * Some VMs reserve some header words in an array.
- * Attempts to allocate larger arrays may result in
- * OutOfMemoryError: Requested array size exceeds VM limit
- */
-private static int MAX_BUFFER_SIZE = Integer.MAX_VALUE - 8;
-
-/**
- * The internal buffer array where the data is stored. When necessary,
- * it may be replaced by another array of
- * a different size.
- */
-protected byte buf[];
-
-/**
- * The index one greater than the index of the last valid byte in
- * the buffer.
- * This value is always
- * in the range 0 through buf.length;
- * elements buf[0] through buf[count-1]
- * contain buffered input data obtained
- * from the underlying input stream.
- */
-private int count;
-
-/**
- * The current position in the buffer. This is the index of the next
- * character to be read from the buf array.
- * 
- * This value is always in the range 0
- * through count. If it is less
- * than count, then buf[pos]
- * is the next byte to be supplied as input;
- * if it is equal to count, then
- * the next read or skip
- * operation will require more bytes to be
- * read from the contained input stream.
- *
- * @see java.io.BufferedInputStream#buf
- */
-private int pos;
-
-/**
- * The value of the pos field at the time the last
- * mark method was called.
- * 
- * This value is always
- * in the range -1 through pos.
- * If there is no marked position in the input
- * stream, this field is -1. If
- * there is a marked position in the input
- * stream, then buf[markpos]
- * is the first byte to be supplied as input
- * after a reset operation. If
- * markpos is not -1,
- * then all bytes from positions buf[markpos]
- * through buf[pos-1] must remain
- * in the buffer array (though they may be
- * moved to another place in the buffer array,
- * with suit

nifi git commit: NIFI-3194: Fixed error handling in PutElasticsearchHttp

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/support/nifi-1.1.x 2f43ad363 -> 8e3c4eb9a


NIFI-3194: Fixed error handling in PutElasticsearchHttp

Thise closes #1327

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/support/nifi-1.1.x
Commit: 8e3c4eb9a4246346f9b29b40933e3b7da556eb2c
Parents: 2f43ad3
Author: Matt Burgess <mattyb...@apache.org>
Authored: Tue Dec 13 16:26:32 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Mon Dec 19 14:53:00 2016 -0500

--
 .../elasticsearch/PutElasticsearchHttp.java | 11 ++-
 .../elasticsearch/TestPutElasticsearchHttp.java | 73 +---
 2 files changed, 58 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/8e3c4eb9/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
index 3ba46bb..f50b2ed 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
@@ -311,9 +311,16 @@ public class PutElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
 final Response getResponse;
 try {
 getResponse = sendRequestToElasticsearch(okHttpClient, url, 
username, password, "PUT", requestBody);
-} catch (IllegalStateException | IOException ioe) {
-throw new ProcessException(ioe);
+} catch (final Exception e) {
+logger.error("Routing to {} due to exception: {}", new 
Object[]{REL_FAILURE.getName(), e}, e);
+flowFilesToTransfer.forEach((flowFileToTransfer) -> {
+flowFileToTransfer = session.penalize(flowFileToTransfer);
+session.transfer(flowFileToTransfer, REL_FAILURE);
+});
+flowFilesToTransfer.clear();
+return;
 }
+
 final int statusCode = getResponse.code();
 
 if (isSuccess(statusCode)) {

http://git-wip-us.apache.org/repos/asf/nifi/blob/8e3c4eb9/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
index 9ce578f..d88bf91 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
@@ -37,6 +37,7 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import java.io.IOException;
+import java.net.ConnectException;
 import java.util.HashMap;
 
 import static org.junit.Assert.assertNotNull;
@@ -195,6 +196,25 @@ public class TestPutElasticsearchHttp {
 }
 
 @Test
+public void testPutElasticSearchOnTriggerWithConnectException() throws 
IOException {
+PutElasticsearchTestProcessor processor = new 
PutElasticsearchTestProcessor(true);
+processor.setStatus(-1, "Connection Exception");
+runner = TestRunners.newTestRunner(processor); // simulate failures
+runner.setValidateExpressionUsage(false);
+runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200;);
+runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
+runner.setProperty(PutElasticsearchHttp.TYPE, "

nifi git commit: NIFI-3194: Fixed error handling in PutElasticsearchHttp

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master aef17f9a8 -> 3b9163539


NIFI-3194: Fixed error handling in PutElasticsearchHttp

Thise closes #1327

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 3b916353983a547e03ca79f4c7d0f01831c326b4
Parents: aef17f9
Author: Matt Burgess <mattyb...@apache.org>
Authored: Tue Dec 13 16:26:32 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Mon Dec 19 14:51:41 2016 -0500

--
 .../elasticsearch/PutElasticsearchHttp.java | 11 ++-
 .../elasticsearch/TestPutElasticsearchHttp.java | 73 +---
 2 files changed, 58 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/3b916353/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
index 2b39a86..479d396 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
@@ -321,9 +321,16 @@ public class PutElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
 final Response getResponse;
 try {
 getResponse = sendRequestToElasticsearch(okHttpClient, url, 
username, password, "PUT", requestBody);
-} catch (IllegalStateException | IOException ioe) {
-throw new ProcessException(ioe);
+} catch (final Exception e) {
+logger.error("Routing to {} due to exception: {}", new 
Object[]{REL_FAILURE.getName(), e}, e);
+flowFilesToTransfer.forEach((flowFileToTransfer) -> {
+flowFileToTransfer = session.penalize(flowFileToTransfer);
+session.transfer(flowFileToTransfer, REL_FAILURE);
+});
+flowFilesToTransfer.clear();
+return;
 }
+
 final int statusCode = getResponse.code();
 
 if (isSuccess(statusCode)) {

http://git-wip-us.apache.org/repos/asf/nifi/blob/3b916353/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
index fae63ee..a8575d4 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
@@ -37,6 +37,7 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import java.io.IOException;
+import java.net.ConnectException;
 import java.util.HashMap;
 
 import static org.junit.Assert.assertNotNull;
@@ -222,6 +223,25 @@ public class TestPutElasticsearchHttp {
 }
 
 @Test
+public void testPutElasticSearchOnTriggerWithConnectException() throws 
IOException {
+PutElasticsearchTestProcessor processor = new 
PutElasticsearchTestProcessor(true);
+processor.setStatus(-1, "Connection Exception");
+runner = TestRunners.newTestRunner(processor); // simulate failures
+runner.setValidateExpressionUsage(false);
+runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200;);
+runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
+runner.setProperty(PutElasticsearchHttp.TYPE, "

svn commit: r17485 - /dev/nifi/1.0.1/ /release/nifi/1.0.1/

[jpercivall]

Author: jpercivall
Date: Mon Dec 19 16:04:48 2016
New Revision: 17485

Log:
NIFI-3202

Added:
release/nifi/1.0.1/
  - copied from r17484, dev/nifi/1.0.1/
Removed:
dev/nifi/1.0.1/

nifi git commit: NIFI-3206: Add ifElse function to Expression Language

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 34627f78b -> 21ed55669


NIFI-3206: Add ifElse function to Expression Language

This closes #1333

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 21ed556691719c592df89f36f0ccec26364e3997
Parents: 34627f7
Author: Matt Burgess <mattyb...@apache.org>
Authored: Thu Dec 15 13:12:55 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Fri Dec 16 15:13:01 2016 -0500

--
 .../language/antlr/AttributeExpressionLexer.g   |  1 +
 .../language/antlr/AttributeExpressionParser.g  |  2 +-
 .../attribute/expression/language/Query.java|  8 +++
 .../evaluation/functions/IfElseEvaluator.java   | 53 
 .../expression/language/TestQuery.java  | 17 +++
 .../asciidoc/expression-language-guide.adoc | 37 --
 6 files changed, 112 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/21ed5566/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
--
diff --git 
a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
 
b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
index 071fda9..6c0bcff 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
+++ 
b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
@@ -182,6 +182,7 @@ SUBSTRING   : 'substring';
 REPLACE: 'replace';
 REPLACE_FIRST  : 'replaceFirst';
 REPLACE_ALL : 'replaceAll';
+IF_ELSE : 'ifElse';
 
 // 4 arg functions
 GET_DELIMITED_FIELD: 'getDelimitedField';

http://git-wip-us.apache.org/repos/asf/nifi/blob/21ed5566/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
--
diff --git 
a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
 
b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
index 11cbec8..576f011 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
+++ 
b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
@@ -77,7 +77,7 @@ zeroArgString : (TO_UPPER | TO_LOWER | TRIM | TO_STRING | 
URL_ENCODE | URL_DECOD
 oneArgString : ((SUBSTRING_BEFORE | SUBSTRING_BEFORE_LAST | SUBSTRING_AFTER | 
SUBSTRING_AFTER_LAST | REPLACE_NULL | REPLACE_EMPTY |
PREPEND | APPEND | FORMAT | STARTS_WITH | 
ENDS_WITH | CONTAINS | JOIN | JSON_PATH | FROM_RADIX) LPAREN! anyArg RPAREN!) |
   (TO_RADIX LPAREN! anyArg (COMMA! anyArg)? RPAREN!);
-twoArgString : ((REPLACE | REPLACE_FIRST | REPLACE_ALL) LPAREN! anyArg COMMA! 
anyArg RPAREN!) |
+twoArgString : ((REPLACE | REPLACE_FIRST | REPLACE_ALL | IF_ELSE) LPAREN! 
anyArg COMMA! anyArg RPAREN!) |
   (SUBSTRING LPAREN! anyArg (COMMA! anyArg)? RPAREN!);
 fiveArgString : GET_DELIMITED_FIELD LPAREN! anyArg (COMMA! anyArg (COMMA! 
anyArg (COMMA! anyArg (COMMA! anyArg)?)?)?)? RPAREN!;
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/21ed5566/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
--
diff --git 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
index 06caf53..18396aa 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
+++ 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
@@ -54,6 +54,7 @@ import 
org.apache.nifi.attribute.expression.language.evaluation.fun

svn commit: r17410 - /dev/nifi/1.0.1/

[jpercivall]

Author: jpercivall
Date: Thu Dec 15 21:34:12 2016
New Revision: 17410

Log:
Committing 1.0.1 RC1 artifacts

Added:
dev/nifi/1.0.1/
dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz   (with props)
dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.asc
dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.md5
dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.sha1
dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.sha256
dev/nifi/1.0.1/nifi-1.0.1-bin.zip   (with props)
dev/nifi/1.0.1/nifi-1.0.1-bin.zip.asc
dev/nifi/1.0.1/nifi-1.0.1-bin.zip.md5
dev/nifi/1.0.1/nifi-1.0.1-bin.zip.sha1
dev/nifi/1.0.1/nifi-1.0.1-bin.zip.sha256
dev/nifi/1.0.1/nifi-1.0.1-source-release.zip   (with props)
dev/nifi/1.0.1/nifi-1.0.1-source-release.zip.asc
dev/nifi/1.0.1/nifi-1.0.1-source-release.zip.md5
dev/nifi/1.0.1/nifi-1.0.1-source-release.zip.sha1
dev/nifi/1.0.1/nifi-1.0.1-source-release.zip.sha256
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.tar.gz   (with props)
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.tar.gz.asc
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.tar.gz.md5
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.tar.gz.sha1
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.tar.gz.sha256
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.zip   (with props)
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.zip.asc
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.zip.md5
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.zip.sha1
dev/nifi/1.0.1/nifi-toolkit-1.0.1-bin.zip.sha256

Added: dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz
==
Binary file - no diff available.

Propchange: dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.asc
==
--- dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.asc (added)
+++ dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.asc Thu Dec 15 21:34:12 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJYUwU8AAoJEDxtuv4iiG/uGd8P/iqnQMQBpFpnsAvTbbEM8Mce
+4eJcIt3+sA835ekC+vXbycf8LZHvDzsNgXQ5cjWh5TDMU9QMbMtb3fNUBmWfZrwe
+R4AkMH9FW3ZGkOTbHJfzohhsZK3yCh4nMUCbPiM2BaZfJJ1aagIeLO/oUrE3Vb2U
+fXI5xHIrxbDUL0sSvDe/UstJIJo3ZFiTENqAFU3BB8NZM87AxLcm7yS8O79O/+Ds
+5i6lPmjKaIKGK1S+ouT3O6AE4jxbqWBhpMPK/fk788xAHW56rxeicO0u2Tr3vBPp
+pNvVFnedow9ju7Jn4qgP6P2Pm6u7CuGj7y8nyy138P1o3jZLbX9fjBagyjeMcTLa
+PYoG9AljEU3lmsNf6RlQzj30P1z9t9q3LaLtNtB8ICgVupmubYG5EW9TI3ahC2Ja
+KySmKvuZ3cTp188C0CgkEKaPJ0yaIaHzKo3IhPTInbWAVHC/DouzDxw05tXHJAKF
+oJDF0TBcT044/3fRgtXo6QJRX9B4XBloEi6QJyXt87m55CG8JP+DJGtbJhVR5M9B
+7z5ldz0Wvb3FLpFBkMXhuO1SoUQqr4f0O912Vyiw6hFT8Osorcc/J9V7VeGUmMNE
+lrVaUA7kDK+aU3vlYQV4I5M9ujum9AMomhBFJtgQIc/RiqvN1yDo+cgZO2Rb0XBR
+fGFi9ETNO9QXHrdfDlxB
+=2opT
+-END PGP SIGNATURE-

Added: dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.md5
==
--- dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.md5 (added)
+++ dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.md5 Thu Dec 15 21:34:12 2016
@@ -0,0 +1 @@
+3d1986a0f2742849e501aaf9f3999332

Added: dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.sha1
==
--- dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.sha1 (added)
+++ dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.sha1 Thu Dec 15 21:34:12 2016
@@ -0,0 +1 @@
+ef01944a821c653837d4cf2392446f362eb0abf2

Added: dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.sha256
==
--- dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.sha256 (added)
+++ dev/nifi/1.0.1/nifi-1.0.1-bin.tar.gz.sha256 Thu Dec 15 21:34:12 2016
@@ -0,0 +1 @@
+7029265ad5f4540b48639622782c8ee3b077c0cdfc4be0257da59ca84ba0b2fe

Added: dev/nifi/1.0.1/nifi-1.0.1-bin.zip
==
Binary file - no diff available.

Propchange: dev/nifi/1.0.1/nifi-1.0.1-bin.zip
--
svn:mime-type = application/octet-stream

Added: dev/nifi/1.0.1/nifi-1.0.1-bin.zip.asc
==
--- dev/nifi/1.0.1/nifi-1.0.1-bin.zip.asc (added)
+++ dev/nifi/1.0.1/nifi-1.0.1-bin.zip.asc Thu Dec 15 21:34:12 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJYUwVAAAoJEDxtuv4iiG/utc8P/jFyLTub6unNXSdv0KRLFa+j
+Z2zr6fEYjxNDHyKXXVHqrflGRI1+gxZCjBhvPM010jI+ikvzOS+8hNdrHZKCaSjf
+W/u17N5LngUfy303eSBZXGV8P4zwzswxtqeL3nAbyy/LIWth6j1d0jJfY/AZ4nBe
+WZdWBoEdgwAgYiYeYlTTqg1X2qB436SDzRIUJukgA0Z6uyjFnHTFoivF/b7cJ/F0
+DiphV+fuIjTS3BlnXdVTQoGldryrMMIaoIHSgahwaUXoYUZUyjm5550gqx2fSKkb
+qUya1Aq8ErAlxz0hI9OZgi2ttL0aclBN1c5H0RXQAHRpjhMb4Ie58Illw8hN7t3y
+OHzYjQ1sQE+mdEH0yozGK1J39gKJUZQGIxZvgXMqYjyPCzy4MKYgSlB833k52AgR
+Z2n6o0DEs7eaNJG+esXP/7h2LEakxjfc+vB3ORTv8SdxLMZUI+MmiqKmicGzi3VH
+KufnIVA49HBbfKK

[nifi] Git Push Summary

[jpercivall]

Repository: nifi
Updated Tags:  refs/tags/nifi-1.0.1-RC1 [created] 9c8b42872

[2/8] nifi git commit: NIFI-3202-rc1 prepare release nifi-1.0.1-RC1

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-slack-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-slack-bundle/pom.xml 
b/nifi-nar-bundles/nifi-slack-bundle/pom.xml
index cec86c6..12eaa1c 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-slack-bundle/pom.xml
@@ -19,12 +19,12 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-slack-bundle
-1.0.1-SNAPSHOT
+1.0.1
 pom
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
index 3d94d7f..c9b079d 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-snmp-bundle
-1.0.1-SNAPSHOT
+1.0.1
 
 nifi-snmp-nar
 nar

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
index 9b4083f..b3c9141 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
@@ -14,7 +14,7 @@

org.apache.nifi
nifi-snmp-bundle
-   1.0.1-SNAPSHOT
+   1.0.1

nifi-snmp-processors
jar

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-snmp-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/pom.xml
index 1ee1ef4..bb2f28a 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-snmp-bundle/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.0.1-SNAPSHOT
+1.0.1
 
 nifi-snmp-bundle
 pom
@@ -32,7 +32,7 @@
 
 org.apache.nifi
 nifi-snmp-processors
-1.0.1-SNAPSHOT
+1.0.1
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml 
b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
index 2035dc2..54ef8f6 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.nifi
 nifi-social-media-bundle
-1.0.1-SNAPSHOT
+1.0.1
 
 
 nifi-social-media-nar
@@ -33,7 +33,7 @@
 
 org.apache.nifi
 nifi-twitter-processors
-1.0.1-SNAPSHOT
+1.0.1
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml 
b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
index 4c72ebe..248f28d 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.nifi
 nifi-social-media-bundle
-1.0.1-SNAPSHOT
+1.0.1
 
 
 nifi-twitter-processors

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/pom.xml 
b/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
index a478040..e2cfb29 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.0.1-SNAPSHOT
+1.0.1
 
 
 nifi-social-media-bundle

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml

[3/8] nifi git commit: NIFI-3202-rc1 prepare release nifi-1.0.1-RC1

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index 6f9ba6a..ecc18b7 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1-SNAPSHOT
+1.0.1
 
 org.apache.nifi
 nifi-web-api

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
index d4f4b1a..4687ebe 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1-SNAPSHOT
+1.0.1
 
 org.apache.nifi
 nifi-web-content-access

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index c997972..74ca830 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1-SNAPSHOT
+1.0.1
 
 org.apache.nifi
 nifi-web-content-viewer

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
index 474891c..ed2f4eb 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1-SNAPSHOT
+1.0.1
 
 org.apache.nifi
 nifi-web-docs

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
index a32cfed..a3ba8fc 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1-SNAPSHOT
+1.0.1
 
 org.apache.nifi
 nifi-web-error

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
index 34d796d..b519bf5 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1-SNAPSHOT
+1.0.1
 
 org.apache.nifi
 nifi-web-optimistic-locking

http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml

[6/8] nifi git commit: NIFI-3202-rc1 prepare for next development iteration

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-slack-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-slack-bundle/pom.xml 
b/nifi-nar-bundles/nifi-slack-bundle/pom.xml
index 12eaa1c..9f96c1d 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-slack-bundle/pom.xml
@@ -19,12 +19,12 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-slack-bundle
-1.0.1
+1.0.2-SNAPSHOT
 pom
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
index c9b079d..972888e 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-snmp-bundle
-1.0.1
+1.0.2-SNAPSHOT
 
 nifi-snmp-nar
 nar

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
index b3c9141..4f26dbf 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml
@@ -14,7 +14,7 @@

org.apache.nifi
nifi-snmp-bundle
-   1.0.1
+   1.0.2-SNAPSHOT

nifi-snmp-processors
jar

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-snmp-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/pom.xml 
b/nifi-nar-bundles/nifi-snmp-bundle/pom.xml
index bb2f28a..e0a9a3d 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-snmp-bundle/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.0.1
+1.0.2-SNAPSHOT
 
 nifi-snmp-bundle
 pom
@@ -32,7 +32,7 @@
 
 org.apache.nifi
 nifi-snmp-processors
-1.0.1
+1.0.2-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml 
b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
index 54ef8f6..fd4c439 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.nifi
 nifi-social-media-bundle
-1.0.1
+1.0.2-SNAPSHOT
 
 
 nifi-social-media-nar
@@ -33,7 +33,7 @@
 
 org.apache.nifi
 nifi-twitter-processors
-1.0.1
+1.0.2-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml 
b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
index 248f28d..99ac2b8 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.nifi
 nifi-social-media-bundle
-1.0.1
+1.0.2-SNAPSHOT
 
 
 nifi-twitter-processors

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/pom.xml 
b/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
index e2cfb29..328a4e4 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-1.0.1
+1.0.2-SNAPSHOT
 
 
 nifi-social-media-bundle

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml

[4/8] nifi git commit: NIFI-3202-rc1 prepare release nifi-1.0.1-RC1

[jpercivall]

NIFI-3202-rc1 prepare release nifi-1.0.1-RC1


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

Branch: refs/heads/NIFI-3202-rc1
Commit: 1890f6c522514027ae46f86601f4771f62cadc6d
Parents: 5d81cab
Author: Joseph Percivall 
Authored: Thu Dec 15 14:20:29 2016 -0500
Committer: Joseph Percivall 
Committed: Thu Dec 15 14:20:29 2016 -0500

--
 nifi-api/pom.xml|   2 +-
 nifi-assembly/pom.xml   |   2 +-
 nifi-bootstrap/pom.xml  |   2 +-
 nifi-commons/nifi-data-provenance-utils/pom.xml |   2 +-
 nifi-commons/nifi-expression-language/pom.xml   |   2 +-
 nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 nifi-commons/nifi-hadoop-utils/pom.xml  |   4 +-
 nifi-commons/nifi-hl7-query-language/pom.xml|   2 +-
 nifi-commons/nifi-logging-utils/pom.xml |   2 +-
 nifi-commons/nifi-processor-utilities/pom.xml   |   2 +-
 nifi-commons/nifi-properties/pom.xml|   2 +-
 nifi-commons/nifi-security-utils/pom.xml|   2 +-
 nifi-commons/nifi-site-to-site-client/pom.xml   |   4 +-
 nifi-commons/nifi-socket-utils/pom.xml  |   2 +-
 nifi-commons/nifi-utils/pom.xml |   4 +-
 nifi-commons/nifi-web-utils/pom.xml |   2 +-
 nifi-commons/nifi-write-ahead-log/pom.xml   |   2 +-
 nifi-commons/pom.xml|   2 +-
 nifi-docs/pom.xml   |   2 +-
 .../nifi-nifi-example-nar/pom.xml   |   2 +-
 .../nifi-nifi-example-processors/pom.xml|   2 +-
 nifi-external/nifi-example-bundle/pom.xml   |   4 +-
 nifi-external/nifi-spark-receiver/pom.xml   |   2 +-
 nifi-external/nifi-storm-spout/pom.xml  |   2 +-
 nifi-external/pom.xml   |   2 +-
 nifi-framework-api/pom.xml  |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml |   2 +-
 .../nifi-service-bundle-archetype/pom.xml   |   2 +-
 nifi-maven-archetypes/pom.xml   |   2 +-
 nifi-mock/pom.xml   |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml  |   4 +-
 .../nifi-ambari-reporting-task/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml  |   4 +-
 .../nifi-amqp-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml   |   6 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml  |   6 +-
 .../nifi-avro-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml   |   4 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml|   4 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |   2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml|   2 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml|   4 +-
 .../nifi-azure-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml  |   2 +-
 .../nifi-cassandra-nar/pom.xml  |   2 +-
 .../nifi-cassandra-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml  |   4 +-
 .../nifi-couchbase-nar/pom.xml  |   6 +-
 .../nifi-couchbase-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-couchbase-bundle/pom.xml  |   4 +-
 .../nifi-datadog-nar/pom.xml|   2 +-
 .../nifi-datadog-reporting-task/pom.xml |   2 +-
 nifi-nar-bundles/nifi-datadog-bundle/pom.xml|   4 +-
 .../nifi-elasticsearch-nar/pom.xml  |   2 +-
 .../nifi-elasticsearch-processors/pom.xml   |   2 +-
 .../nifi-elasticsearch-bundle/pom.xml   |   4 +-
 .../nifi-email-bundle/nifi-email-nar/pom.xml|   2 +-
 .../nifi-email-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-email-bundle/pom.xml  |   4 +-
 .../nifi-enrich-bundle/nifi-enrich-nar/pom.xml  |   2 +-
 .../nifi-enrich-processors/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-enrich-bundle/pom.xml |   4 +-
 .../nifi-evtx-bundle/nifi-evtx-nar/pom.xml  |   2 +-
 .../nifi-evtx-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-evtx-bundle/pom.xml   |   4 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml|   4 +-
 .../nifi-flume-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-flume-bundle/pom.xml  |   6 +-
 .../nifi-framework-nar/pom.xml  |   2 +-
 .../nifi-framework/nifi-administration/pom.xml  |   2 +-
 .../nifi-framework/nifi-authorizer/pom.xml  |   2 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |   2 +-
 .../nifi-framework/nifi-documentation/pom.xml   |   2 +-
 .../nifi-framework/nifi-file-authorizer/pom.xml 

[7/8] nifi git commit: NIFI-3202-rc1 prepare for next development iteration

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index ecc18b7..74f09e4 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1
+1.0.2-SNAPSHOT
 
 org.apache.nifi
 nifi-web-api

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
index 4687ebe..7255c1a 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1
+1.0.2-SNAPSHOT
 
 org.apache.nifi
 nifi-web-content-access

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index 74ca830..59cb6c9 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1
+1.0.2-SNAPSHOT
 
 org.apache.nifi
 nifi-web-content-viewer

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
index ed2f4eb..edaedd3 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1
+1.0.2-SNAPSHOT
 
 org.apache.nifi
 nifi-web-docs

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
index a3ba8fc..abefc19 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1
+1.0.2-SNAPSHOT
 
 org.apache.nifi
 nifi-web-error

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
index b519bf5..2c9594e 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-web
-1.0.1
+1.0.2-SNAPSHOT
 
 org.apache.nifi
 nifi-web-optimistic-locking

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml

[8/8] nifi git commit: NIFI-3202-rc1 prepare for next development iteration

[jpercivall]

NIFI-3202-rc1 prepare for next development iteration


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

Branch: refs/heads/NIFI-3202-rc1
Commit: bd66aa5bf8518bcd6b342fc8541c002ccef1d449
Parents: 1890f6c
Author: Joseph Percivall 
Authored: Thu Dec 15 14:20:42 2016 -0500
Committer: Joseph Percivall 
Committed: Thu Dec 15 14:20:42 2016 -0500

--
 nifi-api/pom.xml|   2 +-
 nifi-assembly/pom.xml   |   2 +-
 nifi-bootstrap/pom.xml  |   2 +-
 nifi-commons/nifi-data-provenance-utils/pom.xml |   2 +-
 nifi-commons/nifi-expression-language/pom.xml   |   2 +-
 nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 nifi-commons/nifi-hadoop-utils/pom.xml  |   4 +-
 nifi-commons/nifi-hl7-query-language/pom.xml|   2 +-
 nifi-commons/nifi-logging-utils/pom.xml |   2 +-
 nifi-commons/nifi-processor-utilities/pom.xml   |   2 +-
 nifi-commons/nifi-properties/pom.xml|   2 +-
 nifi-commons/nifi-security-utils/pom.xml|   2 +-
 nifi-commons/nifi-site-to-site-client/pom.xml   |   4 +-
 nifi-commons/nifi-socket-utils/pom.xml  |   2 +-
 nifi-commons/nifi-utils/pom.xml |   4 +-
 nifi-commons/nifi-web-utils/pom.xml |   2 +-
 nifi-commons/nifi-write-ahead-log/pom.xml   |   2 +-
 nifi-commons/pom.xml|   2 +-
 nifi-docs/pom.xml   |   2 +-
 .../nifi-nifi-example-nar/pom.xml   |   2 +-
 .../nifi-nifi-example-processors/pom.xml|   2 +-
 nifi-external/nifi-example-bundle/pom.xml   |   4 +-
 nifi-external/nifi-spark-receiver/pom.xml   |   2 +-
 nifi-external/nifi-storm-spout/pom.xml  |   2 +-
 nifi-external/pom.xml   |   2 +-
 nifi-framework-api/pom.xml  |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml |   2 +-
 .../nifi-service-bundle-archetype/pom.xml   |   2 +-
 nifi-maven-archetypes/pom.xml   |   2 +-
 nifi-mock/pom.xml   |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml  |   4 +-
 .../nifi-ambari-reporting-task/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml  |   4 +-
 .../nifi-amqp-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml   |   6 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml  |   6 +-
 .../nifi-avro-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml   |   4 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml|   4 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |   2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml|   2 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml|   4 +-
 .../nifi-azure-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml  |   2 +-
 .../nifi-cassandra-nar/pom.xml  |   2 +-
 .../nifi-cassandra-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml  |   4 +-
 .../nifi-couchbase-nar/pom.xml  |   6 +-
 .../nifi-couchbase-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-couchbase-bundle/pom.xml  |   4 +-
 .../nifi-datadog-nar/pom.xml|   2 +-
 .../nifi-datadog-reporting-task/pom.xml |   2 +-
 nifi-nar-bundles/nifi-datadog-bundle/pom.xml|   4 +-
 .../nifi-elasticsearch-nar/pom.xml  |   2 +-
 .../nifi-elasticsearch-processors/pom.xml   |   2 +-
 .../nifi-elasticsearch-bundle/pom.xml   |   4 +-
 .../nifi-email-bundle/nifi-email-nar/pom.xml|   2 +-
 .../nifi-email-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-email-bundle/pom.xml  |   4 +-
 .../nifi-enrich-bundle/nifi-enrich-nar/pom.xml  |   2 +-
 .../nifi-enrich-processors/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-enrich-bundle/pom.xml |   4 +-
 .../nifi-evtx-bundle/nifi-evtx-nar/pom.xml  |   2 +-
 .../nifi-evtx-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-evtx-bundle/pom.xml   |   4 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml|   4 +-
 .../nifi-flume-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-flume-bundle/pom.xml  |   6 +-
 .../nifi-framework-nar/pom.xml  |   2 +-
 .../nifi-framework/nifi-administration/pom.xml  |   2 +-
 .../nifi-framework/nifi-authorizer/pom.xml  |   2 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |   2 +-
 .../nifi-framework/nifi-documentation/pom.xml   |   2 +-
 

[1/8] nifi git commit: NIFI-3202-rc1 prepare release nifi-1.0.1-RC1

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-3202-rc1 [created] bd66aa5bf


http://git-wip-us.apache.org/repos/asf/nifi/blob/1890f6c5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 07b855a..535b2f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi
-1.0.1-SNAPSHOT
+1.0.1
 pom
 Apache NiFi is an easy to use, powerful, and reliable system 
to process and distribute data.
 
@@ -76,7 +76,7 @@ language governing permissions and limitations under the 
License. -->
 scm:git:git://git.apache.org/nifi.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi.git
 https://git-wip-us.apache.org/repos/asf?p=nifi.git
-nifi-1.0.0-RC1
+nifi-1.0.1-RC1
 
 
 JIRA
@@ -817,82 +817,82 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-api
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-framework-api
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-utils
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-site-to-site-client
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-web-utils
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-expression-language
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-custom-ui-utilities
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-ui-extension
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-flowfile-packager
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-socket-utils
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-data-provenance-utils
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-runtime
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-bootstrap
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-toolkit-tls
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-toolkit-encrypt-config
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-resources
-1.0.1-SNAPSHOT
+1.0.1
 resources
 runtime
 zip
@@ -900,7 +900,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-docs
-1.0.1-SNAPSHOT
+1.0.1
 resources
 runtime
 zip
@@ -908,397 +908,397 @@ language governing permissions and limitations under 
the License. -->
 
 org.apache.nifi
 nifi-framework-nar
-1.0.1-SNAPSHOT
+1.0.1
 nar
 
 
 org.apache.nifi
 nifi-provenance-repository-nar
-1.0.1-SNAPSHOT
+1.0.1
 nar
 
 
 org.apache.nifi
 nifi-standard-services-api-nar
-1.0.1-SNAPSHOT
+1.0.1
 nar
 
 
 org.apache.nifi
 nifi-ssl-context-service-nar
-1.0.1-SNAPSHOT
+1.0.1
 nar
 
 
 org.apache.nifi
 nifi-ssl-context-service-api
-1.0.1-SNAPSHOT
+1.0.1
 
 
 org.apache.nifi
 nifi-distributed-cache-services-nar
-1.0.1-SNAPSHOT
+1.0.1
 nar
 
 
 

[5/8] nifi git commit: NIFI-3202-rc1 prepare for next development iteration

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd66aa5b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 535b2f9..ef6689d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi
-1.0.1
+1.0.2-SNAPSHOT
 pom
 Apache NiFi is an easy to use, powerful, and reliable system 
to process and distribute data.
 
@@ -76,7 +76,7 @@ language governing permissions and limitations under the 
License. -->
 scm:git:git://git.apache.org/nifi.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi.git
 https://git-wip-us.apache.org/repos/asf?p=nifi.git
-nifi-1.0.1-RC1
+nifi-1.0.0-RC1
 
 
 JIRA
@@ -817,82 +817,82 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-api
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-api
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-utils
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-site-to-site-client
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-web-utils
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-expression-language
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-custom-ui-utilities
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-ui-extension
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-flowfile-packager
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-socket-utils
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-data-provenance-utils
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-runtime
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-bootstrap
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-toolkit-tls
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-toolkit-encrypt-config
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-resources
-1.0.1
+1.0.2-SNAPSHOT
 resources
 runtime
 zip
@@ -900,7 +900,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-docs
-1.0.1
+1.0.2-SNAPSHOT
 resources
 runtime
 zip
@@ -908,397 +908,397 @@ language governing permissions and limitations under 
the License. -->
 
 org.apache.nifi
 nifi-framework-nar
-1.0.1
+1.0.2-SNAPSHOT
 nar
 
 
 org.apache.nifi
 nifi-provenance-repository-nar
-1.0.1
+1.0.2-SNAPSHOT
 nar
 
 
 org.apache.nifi
 nifi-standard-services-api-nar
-1.0.1
+1.0.2-SNAPSHOT
 nar
 
 
 org.apache.nifi
 nifi-ssl-context-service-nar
-1.0.1
+1.0.2-SNAPSHOT
 nar
 
 
 org.apache.nifi
 nifi-ssl-context-service-api
-1.0.1
+1.0.2-SNAPSHOT
 
 
 org.apache.nifi
 nifi-distributed-cache-services-nar
-1.0.1
+1.0.2-SNAPSHOT
 nar
 
 
 org.apache.nifi
 nifi-standard-nar
-1.0.1
+  

[03/20] nifi git commit: NIFI-2704: - Re-using the DataTransferAuthorizable in the DataTransferResource. - Removing use of the DataTransferResource when obtaining site to site details as it performs a

[jpercivall]

NIFI-2704:
- Re-using the DataTransferAuthorizable in the DataTransferResource.
- Removing use of the DataTransferResource when obtaining site to site details 
as it performs additional unnecessary checks.
- Code clean up.
- This closes #971.


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

Branch: refs/heads/support/nifi-1.0.x
Commit: bde1c240faa64b83b68887c9455302ea89374c9f
Parents: 94bc7c6
Author: Matt Gilman <matt.c.gil...@gmail.com>
Authored: Tue Aug 30 14:10:41 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Dec 14 16:20:34 2016 -0500

--
 .../nifi/web/StandardNiFiServiceFacade.java |  29 +++-
 .../nifi/web/api/DataTransferResource.java  | 141 ++-
 .../apache/nifi/web/api/SiteToSiteResource.java |  23 ++-
 .../src/main/resources/nifi-web-api-context.xml |   1 +
 .../nifi/web/api/TestDataTransferResource.java  |   7 +-
 5 files changed, 119 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/bde1c240/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index dfa3e95..e7196e4 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -26,6 +26,7 @@ import org.apache.nifi.admin.service.AuditService;
 import org.apache.nifi.authorization.AccessDeniedException;
 import org.apache.nifi.authorization.AccessPolicy;
 import org.apache.nifi.authorization.AuthorizableLookup;
+import org.apache.nifi.authorization.AuthorizationRequest;
 import org.apache.nifi.authorization.AuthorizationResult;
 import org.apache.nifi.authorization.AuthorizationResult.Result;
 import org.apache.nifi.authorization.AuthorizeAccess;
@@ -34,8 +35,8 @@ import org.apache.nifi.authorization.Group;
 import org.apache.nifi.authorization.RequestAction;
 import org.apache.nifi.authorization.Resource;
 import org.apache.nifi.authorization.User;
+import org.apache.nifi.authorization.UserContextKeys;
 import org.apache.nifi.authorization.resource.Authorizable;
-import org.apache.nifi.authorization.resource.DataTransferAuthorizable;
 import org.apache.nifi.authorization.resource.ResourceFactory;
 import org.apache.nifi.authorization.user.NiFiUser;
 import org.apache.nifi.authorization.user.NiFiUserUtils;
@@ -2449,7 +2450,10 @@ public class StandardNiFiServiceFacade implements 
NiFiServiceFacade {
 }
 
 /**
- * Ensures the specified user has permission to access the specified port.
+ * Ensures the specified user has permission to access the specified port. 
This method does
+ * not utilize the DataTransferAuthorizable as that will enforce the 
entire chain is
+ * authorized for the transfer. This method is only invoked when obtaining 
the site to site
+ * details so the entire chain isn't necessary.
  */
 private boolean isUserAuthorized(final NiFiUser user, final RootGroupPort 
port) {
 final boolean isSiteToSiteSecure = 
Boolean.TRUE.equals(properties.isSiteToSiteSecure());
@@ -2459,9 +2463,24 @@ public class StandardNiFiServiceFacade implements 
NiFiServiceFacade {
 return true;
 }
 
-// authorize this port for data transfer
-final Authorizable dataTransferAuthorizable = new 
DataTransferAuthorizable(port);
-final AuthorizationResult result = 
dataTransferAuthorizable.checkAuthorization(authorizer, RequestAction.WRITE, 
user);
+final Map<String, String> userContext;
+if (user.getClientAddress() != null && 
!user.getClientAddress().trim().isEmpty()) {
+userContext = new HashMap<>();
+userContext.put(UserContextKeys.CLIENT_ADDRESS.name(), 
user.getClientAddress());
+} else {
+userContext = null;
+}
+
+final AuthorizationRequest request = new AuthorizationRequest.Builder()
+
.resource(ResourceFactory.getDataTransferResource(port.getResource()))
+.identity(user.getIdentity())
+   

[20/20] nifi git commit: NIFI-2717: Ensure that when performing site-to-site communications that we always commit the transaction on the remote side before committing it on the local side

[jpercivall]

NIFI-2717: Ensure that when performing site-to-site communications that we 
always commit the transaction on the remote side before committing it on the 
local side


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

Branch: refs/heads/support/nifi-1.0.x
Commit: 5d81cabdc7817dbf6f9901ffa6a1981ce3e57123
Parents: e80a670
Author: Mark Payne <marka...@hotmail.com>
Authored: Wed Aug 31 15:02:30 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Thu Dec 15 12:06:32 2016 -0500

--
 .../main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/5d81cabd/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
index 1996357..e8b542e 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
@@ -305,8 +305,8 @@ public class StandardRemoteGroupPort extends 
RemoteGroupPort {
 final long uploadMillis = 
stopWatch.getDuration(TimeUnit.MILLISECONDS);
 final String dataSize = FormatUtils.formatDataSize(bytesSent);
 
-session.commit();
 transaction.complete();
+session.commit();
 
 final String flowFileDescription = (flowFilesSent.size() < 20) ? 
flowFilesSent.toString() : flowFilesSent.size() + " FlowFiles";
 logger.info("{} Successfully sent {} ({}) to {} in {} milliseconds 
at a rate of {}", new Object[]{

[02/20] nifi git commit: NIFI-2694: - Addressing instances where phase one objects were being referenced instead of phase two objects. - Code clean up.

[jpercivall]

NIFI-2694: - Addressing instances where phase one objects were being referenced 
instead of phase two objects. - Code clean up.

This closes #970.

Signed-off-by: Bryan Bende <bbe...@apache.org>


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

Branch: refs/heads/support/nifi-1.0.x
Commit: 94bc7c656f896d306d907da2d33dc5d9b1ac9426
Parents: d5f94c4
Author: Matt Gilman <matt.c.gil...@gmail.com>
Authored: Tue Aug 30 10:07:09 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Dec 14 16:20:26 2016 -0500

--
 .../apache/nifi/web/api/ControllerResource.java |  5 +--
 .../apache/nifi/web/api/CountersResource.java   |  5 ++-
 .../org/apache/nifi/web/api/LabelResource.java  |  2 +-
 .../nifi/web/api/ProcessGroupResource.java  | 32 +++-
 4 files changed, 25 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/94bc7c65/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
index 1fe87ab..09abe53 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
@@ -677,9 +677,9 @@ public class ControllerResource extends ApplicationResource 
{
 authorizeController(RequestAction.WRITE);
 },
 null,
-(endDateEtity) -> {
+(endDateEntity) -> {
 // purge the actions
-serviceFacade.deleteActions(endDateEtity.getEndDate());
+serviceFacade.deleteActions(endDateEntity.getEndDate());
 
 // generate the response
 return generateOkResponse(new HistoryEntity()).build();
@@ -700,6 +700,7 @@ public class ControllerResource extends ApplicationResource 
{
 }
 
 // setters
+
 public void setServiceFacade(final NiFiServiceFacade serviceFacade) {
 this.serviceFacade = serviceFacade;
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/94bc7c65/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java
index a8be20d..e3a2b9e 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java
@@ -226,6 +226,9 @@ public class CountersResource extends ApplicationResource {
 )
 public Response updateCounter(
 @Context final HttpServletRequest httpServletRequest,
+@ApiParam(
+value = "The id of the counter."
+)
 @PathParam("id") final String id) {
 
 if (isReplicateRequest()) {
@@ -244,7 +247,7 @@ public class CountersResource extends ApplicationResource {
 null,
 (componentEntity) -> {
 // reset the specified counter
-final CounterDTO counter = 
serviceFacade.updateCounter(requestComponentEntity.getId());
+final CounterDTO counter = 
serviceFacade.updateCounter(componentEntity.getId());
 
 // create the response entity
 final CounterEntity entity = new CounterEntity();

http://git-wip-us.apache.org/repos/asf/nifi/blob/94bc7c65/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java
--
diff --git 
a/nifi-nar-bundle

[19/20] nifi git commit: NIFI-2822 - pass the JWT Authorization token i. This closes #1065

[jpercivall]

NIFI-2822 - pass the JWT Authorization token i. This closes #1065


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

Branch: refs/heads/support/nifi-1.0.x
Commit: e80a670b0ecc9b6a06e415010c188793b5575021
Parents: cdfed07
Author: Yolanda M. Davis <yolanda.m.da...@gmail.com>
Authored: Mon Sep 26 12:11:28 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Thu Dec 15 11:16:59 2016 -0500

--
 .../src/main/webapp/WEB-INF/jsp/index.jsp   | 2 ++
 .../nifi-jolt-transform-json-ui/src/main/webapp/app/app.js  | 9 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/e80a670b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
index 96eda99..26ba321 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -31,6 +31,8 @@
 
 
 
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/e80a670b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
index 67c440c..2e9cf0c 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
@@ -17,7 +17,12 @@
 
 'use strict';
 
-var AppRun =  function($rootScope,$state){
+var AppRun =  function($rootScope,$state,$http){
+
+if (nf.Storage.hasItem('jwt')) {
+var token = nf.Storage.getItem('jwt');
+$http.defaults.headers.common.Authorization = 'Bearer ' + token;
+}
 
 $rootScope.$on('$stateChangeError', function(event, toState, toParams, 
fromState, fromParams, error){
 event.preventDefault();
@@ -35,7 +40,7 @@ var AppConfig = function ($urlRouterProvider) {
 
 };
 
-AppRun.$inject = ['$rootScope','$state'];
+AppRun.$inject = ['$rootScope','$state','$http'];
 
 AppConfig.$inject = ['$urlRouterProvider'];
 

[08/20] nifi git commit: NIFI-3198: Refactored how PublishKafka and PublishKafka_0_10 work to improve throughput and resilience. Fixed bug in StreamDemarcator. Slight refactoring of consume processors

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/ed17df50/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/InFlightMessageTracker.java
--
diff --git 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/InFlightMessageTracker.java
 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/InFlightMessageTracker.java
new file mode 100644
index 000..e7d5cb7
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/InFlightMessageTracker.java
@@ -0,0 +1,178 @@
+/*
+ * 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.kafka.pubsub;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.nifi.flowfile.FlowFile;
+
+public class InFlightMessageTracker {
+private final ConcurrentMap messageCountsByFlowFile = 
new ConcurrentHashMap<>();
+private final ConcurrentMap failures = new 
ConcurrentHashMap<>();
+private final Object progressMutex = new Object();
+
+public void incrementAcknowledgedCount(final FlowFile flowFile) {
+final Counts counter = 
messageCountsByFlowFile.computeIfAbsent(flowFile, ff -> new Counts());
+counter.incrementAcknowledgedCount();
+
+synchronized (progressMutex) {
+progressMutex.notify();
+}
+}
+
+public int getAcknowledgedCount(final FlowFile flowFile) {
+final Counts counter = messageCountsByFlowFile.get(flowFile);
+return (counter == null) ? 0 : counter.getAcknowledgedCount();
+}
+
+public void incrementSentCount(final FlowFile flowFile) {
+final Counts counter = 
messageCountsByFlowFile.computeIfAbsent(flowFile, ff -> new Counts());
+counter.incrementSentCount();
+}
+
+public int getSentCount(final FlowFile flowFile) {
+final Counts counter = messageCountsByFlowFile.get(flowFile);
+return (counter == null) ? 0 : counter.getSentCount();
+}
+
+public void fail(final FlowFile flowFile, final Exception exception) {
+failures.putIfAbsent(flowFile, exception);
+
+synchronized (progressMutex) {
+progressMutex.notify();
+}
+}
+
+public Exception getFailure(final FlowFile flowFile) {
+return failures.get(flowFile);
+}
+
+public boolean isFailed(final FlowFile flowFile) {
+return getFailure(flowFile) != null;
+}
+
+public void reset() {
+messageCountsByFlowFile.clear();
+failures.clear();
+}
+
+public PublishResult failOutstanding(final Exception exception) {
+messageCountsByFlowFile.keySet().stream()
+.filter(ff -> !isComplete(ff))
+.filter(ff -> !failures.containsKey(ff))
+.forEach(ff -> failures.put(ff, exception));
+
+return createPublishResult();
+}
+
+private boolean isComplete(final FlowFile flowFile) {
+final Counts counts = messageCountsByFlowFile.get(flowFile);
+if (counts.getAcknowledgedCount() == counts.getSentCount()) {
+// all messages received successfully.
+return true;
+}
+
+if (failures.containsKey(flowFile)) {
+// FlowFile failed so is complete
+return true;
+}
+
+return false;
+}
+
+private boolean isComplete() {
+return messageCountsByFlowFile.keySet().stream()
+.allMatch(flowFile -> isComplete(flowFile));
+}
+
+void awaitCompletion(final long millis) throws InterruptedException, 
TimeoutException {
+final long startTime = System.nanoTime();
+final long maxTime = startTime + 

[06/20] nifi git commit: NIFI-3198: Refactored how PublishKafka and PublishKafka_0_10 work to improve throughput and resilience. Fixed bug in StreamDemarcator. Slight refactoring of consume processors

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/ed17df50/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
--
diff --git 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
new file mode 100644
index 000..f9f2485
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
@@ -0,0 +1,262 @@
+/*
+ * 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.kafka.pubsub;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+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.stream.Collectors;
+
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.util.MockFlowFile;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestPublishKafka {
+private static final String TOPIC_NAME = "unit-test";
+
+private PublisherPool mockPool;
+private PublisherLease mockLease;
+private TestRunner runner;
+
+@Before
+public void setup() {
+mockPool = mock(PublisherPool.class);
+mockLease = mock(PublisherLease.class);
+
+when(mockPool.obtainPublisher()).thenReturn(mockLease);
+
+runner = TestRunners.newTestRunner(new PublishKafka() {
+@Override
+protected PublisherPool createPublisherPool(final ProcessContext 
context) {
+return mockPool;
+}
+});
+
+runner.setProperty(PublishKafka.TOPIC, TOPIC_NAME);
+}
+
+@Test
+public void testSingleSuccess() throws IOException {
+final MockFlowFile flowFile = runner.enqueue("hello world");
+
+
when(mockLease.complete()).thenReturn(createAllSuccessPublishResult(flowFile, 
1));
+
+runner.run();
+runner.assertAllFlowFilesTransferred(PublishKafka.REL_SUCCESS, 1);
+
+verify(mockLease, times(1)).publish(any(FlowFile.class), 
any(InputStream.class), eq(null), eq(null), eq(TOPIC_NAME));
+verify(mockLease, times(1)).complete();
+verify(mockLease, times(0)).poison();
+verify(mockLease, times(1)).close();
+}
+
+@Test
+public void testMultipleSuccess() throws IOException {
+final Set flowFiles = new HashSet<>();
+flowFiles.add(runner.enqueue("hello world"));
+flowFiles.add(runner.enqueue("hello world"));
+flowFiles.add(runner.enqueue("hello world"));
+
+
+
when(mockLease.complete()).thenReturn(createAllSuccessPublishResult(flowFiles, 
1));
+
+runner.run();
+runner.assertAllFlowFilesTransferred(PublishKafka.REL_SUCCESS, 3);
+
+verify(mockLease, times(3)).publish(any(FlowFile.class), 
any(InputStream.class), eq(null), eq(null), eq(TOPIC_NAME));
+verify(mockLease, times(1)).complete();
+verify(mockLease, times(0)).poison();
+verify(mockLease, times(1)).close();
+}
+
+@Test
+public void testSingleFailure() throws IOException {
+final MockFlowFile flowFile = runner.enqueue("hello world");
+
+
when(mockLease.complete()).thenReturn(createFailurePublishResult(flowFile));
+
+runner.run();
+

[15/20] nifi git commit: NIFI-2777: NIFI-2856: - Only performing response merging when the node is the cluster cooridinator even if there is a single response. - Fixing PropertyDescriptor merging to e

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/0b1d15a7/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMergerSpec.groovy
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMergerSpec.groovy
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMergerSpec.groovy
deleted file mode 100644
index 03aa08a..000
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMergerSpec.groovy
+++ /dev/null
@@ -1,218 +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.coordination.http
-
-import com.sun.jersey.api.client.ClientResponse
-import org.apache.nifi.cluster.manager.NodeResponse
-import org.apache.nifi.cluster.protocol.NodeIdentifier
-import org.apache.nifi.util.NiFiProperties
-import org.apache.nifi.web.api.dto.AccessPolicyDTO
-import org.apache.nifi.web.api.dto.ConnectionDTO
-import org.apache.nifi.web.api.dto.ControllerConfigurationDTO
-import org.apache.nifi.web.api.dto.FunnelDTO
-import org.apache.nifi.web.api.dto.LabelDTO
-import org.apache.nifi.web.api.dto.PermissionsDTO
-import org.apache.nifi.web.api.dto.status.ConnectionStatusDTO
-import org.apache.nifi.web.api.dto.status.ConnectionStatusSnapshotDTO
-import org.apache.nifi.web.api.entity.ConnectionEntity
-import org.apache.nifi.web.api.entity.ConnectionsEntity
-import org.apache.nifi.web.api.entity.ControllerConfigurationEntity
-import org.apache.nifi.web.api.entity.FunnelEntity
-import org.apache.nifi.web.api.entity.FunnelsEntity
-import org.apache.nifi.web.api.entity.LabelEntity
-import org.apache.nifi.web.api.entity.LabelsEntity
-import org.codehaus.jackson.map.ObjectMapper
-import org.codehaus.jackson.map.SerializationConfig
-import org.codehaus.jackson.map.annotate.JsonSerialize
-import org.codehaus.jackson.xc.JaxbAnnotationIntrospector
-import spock.lang.Specification
-import spock.lang.Unroll
-
-@Unroll
-class StandardHttpResponseMergerSpec extends Specification {
-
-def setup() {
-def propFile = 
StandardHttpResponseMergerSpec.class.getResource("/conf/nifi.properties").getFile()
-System.setProperty NiFiProperties.PROPERTIES_FILE_PATH, propFile
-}
-
-def cleanup() {
-System.clearProperty NiFiProperties.PROPERTIES_FILE_PATH
-}
-
-def "MergeResponses: mixed HTTP GET response statuses, expecting 
#expectedStatus"() {
-given:
-def responseMerger = new 
StandardHttpResponseMerger(NiFiProperties.createBasicNiFiProperties(null,null))
-def requestUri = new URI('http://server/resource')
-def requestId = UUID.randomUUID().toString()
-def Map> mockToRequestEntity = [:]
-def nodeResponseSet = nodeResponseData.collect {
-int n = it.node
-def clientResponse = Mock(ClientResponse)
-mockToRequestEntity.put clientResponse, it
-new NodeResponse(new NodeIdentifier("cluster-node-$n", 'addr', n, 
'sktaddr', n * 10, 'stsaddr', n * 100, n * 1000, false, null), "get", 
requestUri, clientResponse, 500L, requestId)
-} as Set
-
-when:
-def returnedResponse = responseMerger.mergeResponses(requestUri, 
'get', nodeResponseSet).getStatus()
-
-then:
-mockToRequestEntity.entrySet().forEach {
-ClientResponse mockClientResponse = it.key
-_ * mockClientResponse.getStatus() >> it.value.status
-}
-0 * _
-returnedResponse == expectedStatus
-
-where:
-nodeResponseData   
 || expectedStatus
-[[node: 1, status: 200], [node: 2, status: 200], [node: 3, status: 
401]] as Set || 401
-[[node: 1, status: 200], [node: 2, status: 200], [node: 3, status: 

[18/20] nifi git commit: NIFI-2768: - Ensuring we correctly enforce authorization when the destination of a connection changes. This includes source, destination, and parent process group. - Ensuring

[jpercivall]

NIFI-2768: - Ensuring we correctly enforce authorization when the destination 
of a connection changes. This includes source, destination, and parent process 
group. - Ensuring the UI reseting accordingly when a request fails.

This closes #1014.

Signed-off-by: Bryan Bende <bbe...@apache.org>


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

Branch: refs/heads/support/nifi-1.0.x
Commit: cdfed075a1563695a15d088a3ce5a10a3f73f99f
Parents: af1732a
Author: Matt Gilman <matt.c.gil...@gmail.com>
Authored: Tue Sep 13 11:22:03 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Thu Dec 15 10:21:03 2016 -0500

--
 .../src/main/java/org/apache/nifi/web/api/ConnectionResource.java  | 2 +-
 .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/cdfed075/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
index 11abf86..fb25211 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
@@ -223,7 +223,7 @@ public class ConnectionResource extends ApplicationResource 
{
 
 // if a destination has been specified and is different
 final Connectable currentDestination = 
connAuth.getDestination();
-if (requestConnection.getDestination() != null && 
currentDestination.getIdentifier().equals(requestConnection.getDestination().getId()))
 {
+if (requestConnection.getDestination() != null && 
!currentDestination.getIdentifier().equals(requestConnection.getDestination().getId()))
 {
 // verify access of the new destination (current 
destination was already authorized as part of the connection check)
 final Authorizable newDestinationAuthorizable = 
lookup.getConnectable(requestConnection.getDestination().getId());
 newDestinationAuthorizable.authorize(authorizer, 
RequestAction.WRITE, NiFiUserUtils.getNiFiUser());

http://git-wip-us.apache.org/repos/asf/nifi/blob/cdfed075/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
index 01d411a..dcc54f1 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
@@ -1386,7 +1386,7 @@ nf.Connection = (function () {
 
nf.CanvasUtils.reloadConnectionSourceAndDestination(null, 
previousDestinationId);
 
nf.CanvasUtils.reloadConnectionSourceAndDestination(response.sourceId, 
response.destinationId);
 }).fail(function (xhr, status, error) {
-if (xhr.status === 400 || xhr.status === 404 
|| xhr.status === 409) {
+if (xhr.status === 400 || xhr.status === 401 
|| xhr.status === 403 || xhr.status === 404 || xhr.status === 409) {
 nf.Dialog.showOkDialog({
 headerText: 'Connection',
 dialogContent: 
nf.Common.escapeHtml(xhr.responseText)

[09/20] nifi git commit: NIFI-3198: Refactored how PublishKafka and PublishKafka_0_10 work to improve throughput and resilience. Fixed bug in StreamDemarcator. Slight refactoring of consume processors

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/ed17df50/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
--
diff --git 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
new file mode 100644
index 000..c7d1a60
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
@@ -0,0 +1,262 @@
+/*
+ * 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.kafka.pubsub;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+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.stream.Collectors;
+
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.util.MockFlowFile;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestPublishKafka {
+private static final String TOPIC_NAME = "unit-test";
+
+private PublisherPool mockPool;
+private PublisherLease mockLease;
+private TestRunner runner;
+
+@Before
+public void setup() {
+mockPool = mock(PublisherPool.class);
+mockLease = mock(PublisherLease.class);
+
+when(mockPool.obtainPublisher()).thenReturn(mockLease);
+
+runner = TestRunners.newTestRunner(new PublishKafka_0_10() {
+@Override
+protected PublisherPool createPublisherPool(final ProcessContext 
context) {
+return mockPool;
+}
+});
+
+runner.setProperty(PublishKafka_0_10.TOPIC, TOPIC_NAME);
+}
+
+@Test
+public void testSingleSuccess() throws IOException {
+final MockFlowFile flowFile = runner.enqueue("hello world");
+
+
when(mockLease.complete()).thenReturn(createAllSuccessPublishResult(flowFile, 
1));
+
+runner.run();
+runner.assertAllFlowFilesTransferred(PublishKafka_0_10.REL_SUCCESS, 1);
+
+verify(mockLease, times(1)).publish(any(FlowFile.class), 
any(InputStream.class), eq(null), eq(null), eq(TOPIC_NAME));
+verify(mockLease, times(1)).complete();
+verify(mockLease, times(0)).poison();
+verify(mockLease, times(1)).close();
+}
+
+@Test
+public void testMultipleSuccess() throws IOException {
+final Set flowFiles = new HashSet<>();
+flowFiles.add(runner.enqueue("hello world"));
+flowFiles.add(runner.enqueue("hello world"));
+flowFiles.add(runner.enqueue("hello world"));
+
+
+
when(mockLease.complete()).thenReturn(createAllSuccessPublishResult(flowFiles, 
1));
+
+runner.run();
+runner.assertAllFlowFilesTransferred(PublishKafka_0_10.REL_SUCCESS, 3);
+
+verify(mockLease, times(3)).publish(any(FlowFile.class), 
any(InputStream.class), eq(null), eq(null), eq(TOPIC_NAME));
+verify(mockLease, times(1)).complete();
+verify(mockLease, times(0)).poison();
+verify(mockLease, times(1)).close();
+}
+
+@Test
+public void testSingleFailure() throws IOException {
+final MockFlowFile flowFile = runner.enqueue("hello world");
+
+
when(mockLease.complete()).thenReturn(createFailurePublishResult(flowFile));
+
+runner.run();
+

[05/20] nifi git commit: NIFI-2824: - Updating replication logic to account for the potential replication target and then invoking the corresponding action.

[jpercivall]

NIFI-2824: - Updating replication logic to account for the potential 
replication target and then invoking the corresponding action.

Signed-off-by: Yolanda M. Davis <ymda...@apache.org>

This closes #1068


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

Branch: refs/heads/support/nifi-1.0.x
Commit: 1ba7f8302c2d6573ff9f43acd49e644213c480f6
Parents: 3feb59d
Author: Matt Gilman <matt.c.gil...@gmail.com>
Authored: Mon Sep 26 16:03:07 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Dec 14 16:20:44 2016 -0500

--
 .../web/StandardNiFiWebConfigurationContext.java   | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/1ba7f830/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
index 021f216..fb38ce9 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
@@ -49,6 +49,7 @@ import 
org.apache.nifi.controller.reporting.ReportingTaskProvider;
 import org.apache.nifi.controller.service.ControllerServiceProvider;
 import org.apache.nifi.registry.VariableRegistry;
 import org.apache.nifi.util.NiFiProperties;
+import org.apache.nifi.web.api.ApplicationResource.ReplicationTarget;
 import org.apache.nifi.web.api.dto.AllowableValueDTO;
 import org.apache.nifi.web.api.dto.ControllerServiceDTO;
 import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
@@ -72,14 +73,12 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * Implements the NiFiWebConfigurationContext interface to support a context 
in both standalone and clustered environments.
@@ -292,17 +291,25 @@ public class StandardNiFiWebConfigurationContext 
implements NiFiWebConfiguration
 return componentFacade.updateComponent(requestContext, annotationData, 
properties);
 }
 
+private ReplicationTarget getReplicationTarget() {
+return clusterCoordinator.isActiveClusterCoordinator() ? 
ReplicationTarget.CLUSTER_NODES : ReplicationTarget.CLUSTER_COORDINATOR;
+}
+
 private NodeResponse replicate(final String method, final URI uri, final 
Object entity, final Map<String, String> headers) throws InterruptedException {
 final NodeIdentifier coordinatorNode = 
clusterCoordinator.getElectedActiveCoordinatorNode();
 if (coordinatorNode == null) {
 throw new NoClusterCoordinatorException();
 }
 
-final Set coordinatorNodes = 
Collections.singleton(coordinatorNode);
-return requestReplicator.replicate(coordinatorNodes, method, uri, 
entity, headers, false, true).awaitMergedResponse();
+// Determine whether we should replicate only to the cluster 
coordinator, or if we should replicate directly
+// to the cluster nodes themselves.
+if (getReplicationTarget() == ReplicationTarget.CLUSTER_NODES) {
+return requestReplicator.replicate(method, uri, entity, 
headers).awaitMergedResponse();
+} else {
+return requestReplicator.forwardToCoordinator(coordinatorNode, 
method, uri, entity, headers).awaitMergedResponse();
+}
 }
 
-
 /**
  * Facade over accessing different types of NiFi components.
  */

[17/20] nifi git commit: [NIFI-2781] removing bower and allowing npm to manage client side resources in nifi-web-ui and nifi-jolt-transform-json-ui. This closes #1030

[jpercivall]

[NIFI-2781] removing bower and allowing npm to manage client side resources in 
nifi-web-ui and nifi-jolt-transform-json-ui. This closes #1030


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

Branch: refs/heads/support/nifi-1.0.x
Commit: af1732aa610e5b409b295dc35be17d4ab45c7375
Parents: 0b1d15a
Author: Scott Aslan <scottyas...@gmail.com>
Authored: Mon Sep 19 13:16:07 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Thu Dec 15 09:52:12 2016 -0500

--
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 39 +++---
 .../nifi-web-ui/src/main/frontend/bower.json| 20 --
 .../nifi-web-ui/src/main/frontend/package.json  | 14 +++
 .../nifi-jolt-transform-json-ui/pom.xml | 42 +++-
 .../src/main/frontend/.bowerrc  |  6 ---
 .../src/main/frontend/bower.json| 15 ---
 .../src/main/frontend/package.json  | 12 ++
 .../src/main/webapp/WEB-INF/jsp/index.jsp   |  2 +-
 8 files changed, 75 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index a8c1994..c96076e 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -136,7 +136,26 @@
 
 
 
-copy-bower-json
+copy-client-side-deps
+prepare-package
+
+copy-resources
+
+
+
${frontend.assets}
+
+
+
${frontend.working.dir}/node_modules
+false
+
+**/*
+
+
+
+
+
+
+copy-package-json
 generate-sources
 
 copy-resources
@@ -148,7 +167,7 @@
 
${frontend.dependency.configs}
 false
 
-bower.json
+package.json
 
 
 
@@ -271,22 +290,12 @@
 
 
 
-install-bower
+npm install
 
 npm
 
 
-install bower
-
${frontend.working.dir}
-
-
-
-bower-install
-
-bower
-
-
-install ${bower.options} 
--config.directory=${frontend.assets}
+--cache-min Infinity install
 
${frontend.working.dir}
 
 
@@ -787,7 +796,7 @@
 
 
 nbactions.xml
-src/main/frontend/bower.json
+
src/main/frontend/package.json
 src/main/webapp/js/json2.js
 src/main/webapp/js/jquery/
 
src/main/webapp/js/d3/d3.min.js

http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bower.json
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bo

[10/20] nifi git commit: NIFI-3198: Refactored how PublishKafka and PublishKafka_0_10 work to improve throughput and resilience. Fixed bug in StreamDemarcator. Slight refactoring of consume processors

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/ed17df50/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
--
diff --git 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
index a85563d..6fd9053 100644
--- 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
+++ 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
@@ -16,104 +16,36 @@
  */
 package org.apache.nifi.processors.kafka.pubsub;
 
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.UUID;
+import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.OffsetAndMetadata;
-import org.apache.kafka.common.KafkaException;
-import org.apache.kafka.common.TopicPartition;
 
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.util.MockFlowFile;
+import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import org.junit.Before;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
 public class ConsumeKafkaTest {
 
-static class MockConsumerPool extends ConsumerPool {
-
-final int actualMaxLeases;
-final List actualTopics;
-final Map actualKafkaProperties;
-boolean throwKafkaExceptionOnPoll = false;
-boolean throwKafkaExceptionOnCommit = false;
-Queue> nextPlannedRecordsQueue = new 
ArrayDeque<>();
-Map nextExpectedCommitOffsets = 
null;
-Map actualCommitOffsets = null;
-boolean wasConsumerLeasePoisoned = false;
-boolean wasConsumerLeaseClosed = false;
-boolean wasPoolClosed = false;
-
-public MockConsumerPool(int maxLeases, List topics, 
Map kafkaProperties, ComponentLog logger) {
-super(maxLeases, topics, kafkaProperties, null);
-actualMaxLeases = maxLeases;
-actualTopics = topics;
-actualKafkaProperties = kafkaProperties;
-}
-
-@Override
-public ConsumerLease obtainConsumer() {
-return new ConsumerLease() {
-@Override
-public ConsumerRecords poll() {
-if (throwKafkaExceptionOnPoll) {
-throw new KafkaException("i planned to fail");
-}
-final ConsumerRecords records = 
nextPlannedRecordsQueue.poll();
-return (records == null) ? ConsumerRecords.empty() : 
records;
-}
-
-@Override
-public void commitOffsets(Map offsets) {
-if (throwKafkaExceptionOnCommit) {
-throw new KafkaException("i planned to fail");
-}
-actualCommitOffsets = offsets;
-}
-
-@Override
-public void poison() {
-wasConsumerLeasePoisoned = true;
-}
-
-@Override
-public void close() {
-wasConsumerLeaseClosed = true;
-}
-};
-}
-
-@Override
-public void close() {
-wasPoolClosed = true;
-}
-
-void resetState() {
-throwKafkaExceptionOnPoll = false;
-throwKafkaExceptionOnCommit = false;
-nextPlannedRecordsQueue = null;
-

[16/20] nifi git commit: NIFI-2777: NIFI-2856: - Only performing response merging when the node is the cluster cooridinator even if there is a single response. - Fixing PropertyDescriptor merging to e

[jpercivall]

NIFI-2777:
NIFI-2856:
- Only performing response merging when the node is the cluster cooridinator 
even if there is a single response.
- Fixing PropertyDescriptor merging to ensure the 'choosen' descriptor is 
included in map of all responses.

This closes #1095.


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

Branch: refs/heads/support/nifi-1.0.x
Commit: 0b1d15a786a46dfb569197f97766e421b49096ac
Parents: 47b368f
Author: Matt Gilman <matt.c.gil...@gmail.com>
Authored: Tue Oct 4 14:52:18 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Dec 14 16:40:52 2016 -0500

--
 .../coordination/http/HttpResponseMapper.java   |  65 ++
 .../coordination/http/HttpResponseMerger.java   |  65 --
 .../http/StandardHttpResponseMapper.java| 228 +++
 .../http/StandardHttpResponseMerger.java| 227 --
 .../StandardAsyncClusterResponse.java   |  22 +-
 .../ThreadPoolRequestReplicator.java|  26 +--
 .../node/NodeClusterCoordinator.java|  37 +--
 .../manager/PropertyDescriptorDtoMerger.java|   2 +-
 .../http/StandardHttpResponseMapperSpec.groovy  | 217 ++
 .../http/StandardHttpResponseMergerSpec.groovy  | 218 --
 10 files changed, 555 insertions(+), 552 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/0b1d15a7/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/HttpResponseMapper.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/HttpResponseMapper.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/HttpResponseMapper.java
new file mode 100644
index 000..659f5e1
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/HttpResponseMapper.java
@@ -0,0 +1,65 @@
+/*
+ * 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.coordination.http;
+
+import org.apache.nifi.cluster.manager.NodeResponse;
+
+import java.net.URI;
+import java.util.Set;
+
+/**
+ * 
+ * An HttpResponseMapper is responsible for taking the responses from all 
nodes in a cluster
+ * and distilling them down to a single response that would be appropriate to 
respond with, to the
+ * user/client who made the original web requests.
+ * 
+ */
+public interface HttpResponseMapper {
+
+/**
+ * Maps the responses from all nodes in the cluster to a single 
NodeResponse object that
+ * is appropriate to respond with
+ *
+ * @param uri the URI of the web request that was made
+ * @param httpMethod the HTTP Method that was used when making the request
+ * @param nodeResponses the responses received from the individual nodes
+ *
+ * @return a single NodeResponse that represents the response that should 
be returned to the user/client
+ */
+NodeResponse mapResponses(URI uri, String httpMethod, Set 
nodeResponses, boolean merge);
+
+/**
+ * Returns a subset (or equal set) of the given Node Responses, such that 
all of those returned are the responses
+ * that indicate that the node was unable to fulfill the request
+ *
+ * @param allResponses the responses to filter
+ *
+ * @return a subset (or equal set) of the given Node Responses, such that 
all of those returned are the responses
+ * that indicate that the node was unable to fulfill the request
+ */
+Set getProblematicNodeResponses(Set 
allResponses);
+
+/**
+ * Indicates whether

[13/20] nifi git commit: [NIFI-3154] display ellipsis when text is sufficiently long in connection details and connection configuration dialogs. This closes #1305

[jpercivall]

[NIFI-3154] display ellipsis when text is sufficiently long in connection 
details and connection configuration dialogs. This closes #1305


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

Branch: refs/heads/support/nifi-1.0.x
Commit: 7c213deb6ba001169c27b97a4f28608851582902
Parents: ed17df5
Author: Scott Aslan <scottyas...@gmail.com>
Authored: Thu Dec 8 10:46:26 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Dec 14 16:23:55 2016 -0500

--
 .../canvas/connection-configuration.jsp | 18 -
 .../WEB-INF/partials/connection-details.jsp |  4 +-
 .../src/main/webapp/css/common-ui.css   |  1 +
 .../webapp/css/connection-configuration.css |  2 -
 .../src/main/webapp/css/connection-details.css  |  2 -
 .../main/webapp/css/processor-configuration.css |  1 +
 .../js/nf/canvas/nf-connection-configuration.js | 14 +++
 .../main/webapp/js/nf/nf-connection-details.js  | 40 ++--
 8 files changed, 40 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7c213deb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
index a93bea0..9e65743 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
@@ -95,7 +95,7 @@
 
 From output
 
-
+
 
 
 
@@ -107,21 +107,21 @@
 
 From input
 
-
+
 
 
 
 From funnel
 
-funnel
+funnel
 
 
 
 From processor
 
 
-
-
+
+
 
 
 
@@ -149,21 +149,21 @@
 
 To output
 
-
+
 
 
 
 To funnel
 
-funnel
+funnel
 
 
 
 To processor
 
 
-
-
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/7c213deb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
index 2bbd480..f7637a2 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
@@

[12/20] nifi git commit: NIFI-3198: Refactored how PublishKafka and PublishKafka_0_10 work to improve throughput and resilience. Fixed bug in StreamDemarcator. Slight refactoring of consume processors

[jpercivall]

NIFI-3198: Refactored how PublishKafka and PublishKafka_0_10 work to improve 
throughput and resilience. Fixed bug in StreamDemarcator. Slight refactoring of 
consume processors to simplify code.


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

Branch: refs/heads/support/nifi-1.0.x
Commit: ed17df503b6d842a439e549615c2750df6752632
Parents: 1ba7f83
Author: Mark Payne <marka...@hotmail.com>
Authored: Wed Dec 14 14:23:21 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Dec 14 16:23:50 2016 -0500

--
 .../io/exception/TokenTooLargeException.java|  26 +
 .../nifi/stream/io/util/StreamDemarcator.java   |  39 +-
 .../stream/io/util/StreamDemarcatorTest.java|  84 ++-
 .../nifi/util/StandardProcessorTestRunner.java  |  31 +-
 .../java/org/apache/nifi/util/TestRunner.java   |  16 +-
 .../kafka/pubsub/ConsumeKafka_0_10.java | 315 +++--
 .../processors/kafka/pubsub/ConsumerLease.java  | 367 ++-
 .../processors/kafka/pubsub/ConsumerPool.java   | 287 
 .../kafka/pubsub/InFlightMessageTracker.java| 178 +
 .../kafka/pubsub/KafkaProcessorUtils.java   |  37 +-
 .../processors/kafka/pubsub/KafkaPublisher.java | 236 ---
 .../kafka/pubsub/PublishKafka_0_10.java | 646 +++
 .../processors/kafka/pubsub/PublishResult.java  |  56 ++
 .../processors/kafka/pubsub/PublisherLease.java | 132 
 .../processors/kafka/pubsub/PublisherPool.java  |  98 +++
 .../kafka/pubsub/PublishingContext.java | 124 
 .../kafka/pubsub/ConsumeKafkaTest.java  | 548 ++--
 .../kafka/pubsub/ConsumerPoolTest.java  | 172 +++--
 .../kafka/pubsub/KafkaPublisherTest.java| 306 -
 .../kafka/pubsub/PublishKafkaTest.java  | 375 ---
 .../kafka/pubsub/PublishingContextTest.java |  91 ---
 .../kafka/pubsub/StubPublishKafka.java  | 143 
 .../pubsub/TestInFlightMessageTracker.java  |  87 +++
 .../kafka/pubsub/TestPublishKafka.java  | 262 
 .../kafka/pubsub/TestPublisherLease.java| 194 ++
 .../kafka/pubsub/TestPublisherPool.java |  68 ++
 .../nifi/processors/kafka/KafkaPublisher.java   |   4 +-
 .../processors/kafka/pubsub/ConsumeKafka.java   | 313 +++--
 .../processors/kafka/pubsub/ConsumerLease.java  | 367 ++-
 .../processors/kafka/pubsub/ConsumerPool.java   | 288 -
 .../kafka/pubsub/InFlightMessageTracker.java| 178 +
 .../kafka/pubsub/KafkaProcessorUtils.java   |  37 +-
 .../processors/kafka/pubsub/KafkaPublisher.java | 236 ---
 .../processors/kafka/pubsub/PublishKafka.java   | 641 +++---
 .../processors/kafka/pubsub/PublishResult.java  |  56 ++
 .../processors/kafka/pubsub/PublisherLease.java | 132 
 .../processors/kafka/pubsub/PublisherPool.java  |  98 +++
 .../kafka/pubsub/PublishingContext.java | 124 
 .../kafka/pubsub/ConsumeKafkaTest.java  | 555 ++--
 .../kafka/pubsub/ConsumerPoolTest.java  | 172 +++--
 .../kafka/pubsub/KafkaPublisherTest.java| 306 -
 .../kafka/pubsub/PublishKafkaTest.java  | 375 ---
 .../kafka/pubsub/PublishingContextTest.java |  91 ---
 .../kafka/pubsub/StubPublishKafka.java  | 144 -
 .../pubsub/TestInFlightMessageTracker.java  |  87 +++
 .../kafka/pubsub/TestPublishKafka.java  | 262 
 .../kafka/pubsub/TestPublisherLease.java| 194 ++
 .../kafka/pubsub/TestPublisherPool.java |  68 ++
 48 files changed, 4338 insertions(+), 5308 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/ed17df50/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/exception/TokenTooLargeException.java
--
diff --git 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/exception/TokenTooLargeException.java
 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/exception/TokenTooLargeException.java
new file mode 100644
index 000..7024f34
--- /dev/null
+++ 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/exception/TokenTooLargeException.java
@@ -0,0 +1,26 @@
+/*
+ * 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 Licen

[07/20] nifi git commit: NIFI-3198: Refactored how PublishKafka and PublishKafka_0_10 work to improve throughput and resilience. Fixed bug in StreamDemarcator. Slight refactoring of consume processors

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/ed17df50/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
--
diff --git 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
index 7e4b12c..8e3fa3b 100644
--- 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
+++ 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
@@ -16,105 +16,36 @@
  */
 package org.apache.nifi.processors.kafka.pubsub;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.UUID;
-
+import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.OffsetAndMetadata;
-import org.apache.kafka.common.KafkaException;
-import org.apache.kafka.common.TopicPartition;
+
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.util.MockFlowFile;
+import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
 import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Before;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
 public class ConsumeKafkaTest {
 
-static class MockConsumerPool extends ConsumerPool {
-
-final int actualMaxLeases;
-final List actualTopics;
-final Map actualKafkaProperties;
-boolean throwKafkaExceptionOnPoll = false;
-boolean throwKafkaExceptionOnCommit = false;
-Queue> nextPlannedRecordsQueue = new 
ArrayDeque<>();
-Map nextExpectedCommitOffsets = 
null;
-Map actualCommitOffsets = null;
-boolean wasConsumerLeasePoisoned = false;
-boolean wasConsumerLeaseClosed = false;
-boolean wasPoolClosed = false;
-
-public MockConsumerPool(int maxLeases, List topics, 
Map kafkaProperties, ComponentLog logger) {
-super(maxLeases, topics, kafkaProperties, null);
-actualMaxLeases = maxLeases;
-actualTopics = topics;
-actualKafkaProperties = kafkaProperties;
-}
-
-@Override
-public ConsumerLease obtainConsumer() {
-return new ConsumerLease() {
-@Override
-public ConsumerRecords poll() {
-if (throwKafkaExceptionOnPoll) {
-throw new KafkaException("i planned to fail");
-}
-final ConsumerRecords records = 
nextPlannedRecordsQueue.poll();
-return (records == null) ? ConsumerRecords.empty() : 
records;
-}
-
-@Override
-public void commitOffsets(Map offsets) {
-if (throwKafkaExceptionOnCommit) {
-throw new KafkaException("i planned to fail");
-}
-actualCommitOffsets = offsets;
-}
-
-@Override
-public void poison() {
-wasConsumerLeasePoisoned = true;
-}
-
-@Override
-public void close() {
-wasConsumerLeaseClosed = true;
-}
-};
-}
-
-@Override
-public void close() {
-wasPoolClosed = true;
-}
-
-void resetState() {
-throwKafkaExceptionOnPoll = false;
-throwKafkaExceptionOnCommit 

[11/20] nifi git commit: NIFI-3198: Refactored how PublishKafka and PublishKafka_0_10 work to improve throughput and resilience. Fixed bug in StreamDemarcator. Slight refactoring of consume processors

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi/blob/ed17df50/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/InFlightMessageTracker.java
--
diff --git 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/InFlightMessageTracker.java
 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/InFlightMessageTracker.java
new file mode 100644
index 000..e7d5cb7
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/InFlightMessageTracker.java
@@ -0,0 +1,178 @@
+/*
+ * 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.kafka.pubsub;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.nifi.flowfile.FlowFile;
+
+public class InFlightMessageTracker {
+private final ConcurrentMap messageCountsByFlowFile = 
new ConcurrentHashMap<>();
+private final ConcurrentMap failures = new 
ConcurrentHashMap<>();
+private final Object progressMutex = new Object();
+
+public void incrementAcknowledgedCount(final FlowFile flowFile) {
+final Counts counter = 
messageCountsByFlowFile.computeIfAbsent(flowFile, ff -> new Counts());
+counter.incrementAcknowledgedCount();
+
+synchronized (progressMutex) {
+progressMutex.notify();
+}
+}
+
+public int getAcknowledgedCount(final FlowFile flowFile) {
+final Counts counter = messageCountsByFlowFile.get(flowFile);
+return (counter == null) ? 0 : counter.getAcknowledgedCount();
+}
+
+public void incrementSentCount(final FlowFile flowFile) {
+final Counts counter = 
messageCountsByFlowFile.computeIfAbsent(flowFile, ff -> new Counts());
+counter.incrementSentCount();
+}
+
+public int getSentCount(final FlowFile flowFile) {
+final Counts counter = messageCountsByFlowFile.get(flowFile);
+return (counter == null) ? 0 : counter.getSentCount();
+}
+
+public void fail(final FlowFile flowFile, final Exception exception) {
+failures.putIfAbsent(flowFile, exception);
+
+synchronized (progressMutex) {
+progressMutex.notify();
+}
+}
+
+public Exception getFailure(final FlowFile flowFile) {
+return failures.get(flowFile);
+}
+
+public boolean isFailed(final FlowFile flowFile) {
+return getFailure(flowFile) != null;
+}
+
+public void reset() {
+messageCountsByFlowFile.clear();
+failures.clear();
+}
+
+public PublishResult failOutstanding(final Exception exception) {
+messageCountsByFlowFile.keySet().stream()
+.filter(ff -> !isComplete(ff))
+.filter(ff -> !failures.containsKey(ff))
+.forEach(ff -> failures.put(ff, exception));
+
+return createPublishResult();
+}
+
+private boolean isComplete(final FlowFile flowFile) {
+final Counts counts = messageCountsByFlowFile.get(flowFile);
+if (counts.getAcknowledgedCount() == counts.getSentCount()) {
+// all messages received successfully.
+return true;
+}
+
+if (failures.containsKey(flowFile)) {
+// FlowFile failed so is complete
+return true;
+}
+
+return false;
+}
+
+private boolean isComplete() {
+return messageCountsByFlowFile.keySet().stream()
+.allMatch(flowFile -> isComplete(flowFile));
+}
+
+void awaitCompletion(final long millis) throws InterruptedException, 
TimeoutException {
+final long startTime = System.nanoTime();
+final long maxTime = startTime + 

[01/20] nifi git commit: NIFI-2687: RPG Port ID was used instead of RPG ID

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/support/nifi-1.0.x fc2941553 -> 5d81cabdc


NIFI-2687: RPG Port ID was used instead of RPG ID

It caused "Error: Unable to find remote process group with id ''" error 
with modifying the transmitting toggle switch of an Input or Output port.

This closes #962


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

Branch: refs/heads/support/nifi-1.0.x
Commit: d5f94c44305fa4b5d509074e0f2770eb784a4f1f
Parents: fc29415
Author: Koji Kawamura <ijokaruma...@apache.org>
Authored: Mon Aug 29 14:12:46 2016 +0900
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Dec 14 16:20:15 2016 -0500

--
 .../java/org/apache/nifi/web/api/RemoteProcessGroupResource.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/d5f94c44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
index 0f91aca..04f6d19 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
@@ -299,7 +299,7 @@ public class RemoteProcessGroupResource extends 
ApplicationResource {
 final RemoteProcessGroupPortDTO remoteProcessGroupPort = 
remoteProcessGroupPortEntity.getRemoteProcessGroupPort();
 
 // update the specified remote process group
-final RemoteProcessGroupPortEntity controllerResponse = 
serviceFacade.updateRemoteProcessGroupInputPort(revision, 
remoteProcessGroupPort.getId(), remoteProcessGroupPort);
+final RemoteProcessGroupPortEntity controllerResponse = 
serviceFacade.updateRemoteProcessGroupInputPort(revision, id, 
remoteProcessGroupPort);
 
 // get the updated revision
 final RevisionDTO updatedRevision = 
controllerResponse.getRevision();
@@ -401,7 +401,7 @@ public class RemoteProcessGroupResource extends 
ApplicationResource {
 final RemoteProcessGroupPortDTO remoteProcessGroupPort = 
remoteProcessGroupPortEntity.getRemoteProcessGroupPort();
 
 // update the specified remote process group
-final RemoteProcessGroupPortEntity controllerResponse = 
serviceFacade.updateRemoteProcessGroupOutputPort(revision, 
remoteProcessGroupPort.getId(), remoteProcessGroupPort);
+final RemoteProcessGroupPortEntity controllerResponse = 
serviceFacade.updateRemoteProcessGroupOutputPort(revision, id, 
remoteProcessGroupPort);
 
 // get the updated revision
 final RevisionDTO updatedRevision = 
controllerResponse.getRevision();

nifi git commit: NIFI-3173: When a template is created with multiple components in different groups all referencing the same controller service, ensure that controller service is added to the template

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 0f462a7c4 -> 5776c4b1f


NIFI-3173: When a template is created with multiple components in different 
groups all referencing the same controller service, ensure that controller 
service is added to the template at a high enough level that all components 
needing hte service can access it.

- Ensure that controller services are added to child process groups when 
creating snippet

- Addressed issue related to modifying higher-level process groups' controller 
services in snippet after having already visited the process group

This closes #1318

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 5776c4b1f99df4662dd878c8183a8c03e6861cd2
Parents: 0f462a7
Author: Mark Payne <marka...@hotmail.com>
Authored: Sun Dec 11 20:36:28 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Dec 14 14:10:59 2016 -0500

--
 .../org/apache/nifi/web/util/SnippetUtils.java  | 96 +---
 1 file changed, 85 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/5776c4b1/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
index c5baa8c..83a2861 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
@@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -109,10 +110,48 @@ public final class SnippetUtils {
 throw new IllegalStateException("The parent process group for this 
snippet could not be found.");
 }
 
-final Set controllerServices = new HashSet<>();
+// We need to ensure that the Controller Services that are added get 
added to the proper group.
+// This can potentially get a little bit tricky. Consider this 
scenario:
+// We have a Process Group G1. Within Process Group G1 is a Controller 
Service C1.
+// Also within G1 is a child Process Group, G2. Within G2 is a child 
Process Group, G3.
+// Within G3 are two child Process Groups: G4 and G5. Within each of 
these children,
+// we have a Processor (P1, P2) that references the Controller Service 
C1, defined 3 levels above.
+// Now, we create a template that encompasses only Process Groups G4 
and G5. We need to ensure
+// that the Controller Service C1 is included at the 'root' of the 
template so that those
+// Processors within G4 and G5 both have access to the same Controller 
Service. This can be drawn
+// out thus:
+//
+// G1 -- C1
+// |
+// |
+// G2
+// |
+// |
+// G3
+// |  \
+// |   \
+// G4   G5
+// ||
+// ||
+// P1   P2
+//
+// Both P1 and P2 reference C1.
+//
+// In order to accomplish this, we maintain two collections. First, we 
keep a Set of all Controller Services that have
+// been added. If we add a new Controller Service to the set, then we 
know it hasn't been added anywhere in the Snippet.
+// In that case, we determine the service's group ID. In the flow 
described above, if we template just groups G4 and G5,
+// then we need to include the Controller Service defined at G1. So we 
also keep a Map of Group ID to controller services
+// in that group. If the ParentGroupId of a Controller Service is not 
in our snippet, then we instead update the parent
+// ParentGroupId to be that of our highest-level process group (in 
this case G3, as that's where the template is created)
+// and then add the controller services to that group (NOTE: here, 
when we say we change the group ID and add to that group,
+   

[1/2] nifi-minifi git commit: MINIFI-153 - Adding proxy settings to remote process group

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master cbb2bdd8e -> 94869042f


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/94869042/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest-v2.yml
--
diff --git 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest-v2.yml
 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest-v2.yml
new file mode 100644
index 000..7981d12
--- /dev/null
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest-v2.yml
@@ -0,0 +1,297 @@
+# 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.
+
+MiNiFi Config Version: 2
+Flow Controller:
+  name: InvokeHttpMiNiFiTemplateTest2
+  comment: ''
+Core Properties:
+  flow controller graceful shutdown period: 10 sec
+  flow service write delay interval: 500 ms
+  administrative yield duration: 30 sec
+  bored yield duration: 10 millis
+  max concurrent threads: 1
+FlowFile Repository:
+  partitions: 256
+  checkpoint interval: 2 mins
+  always sync: false
+  Swap:
+threshold: 2
+in period: 5 sec
+in threads: 1
+out period: 5 sec
+out threads: 4
+Content Repository:
+  content claim max appendable size: 10 MB
+  content claim max flow files: 100
+  always sync: false
+Provenance Repository:
+  provenance rollover time: 1 min
+Component Status Repository:
+  buffer size: 1440
+  snapshot frequency: 1 min
+Security Properties:
+  keystore: ''
+  keystore type: ''
+  keystore password: ''
+  key password: ''
+  truststore: ''
+  truststore type: ''
+  truststore password: ''
+  ssl protocol: ''
+  Sensitive Props:
+key:
+algorithm: PBEWITHMD5AND256BITAES-CBC-OPENSSL
+provider: BC
+Processors:
+- name: LogAttribute
+  id: 0a73c5e4-7216-4cdf-9008-ace353478d55
+  class: org.apache.nifi.processors.standard.LogAttribute
+  max concurrent tasks: 1
+  scheduling strategy: TIMER_DRIVEN
+  scheduling period: 0 sec
+  penalization period: 30 sec
+  yield period: 1 sec
+  run duration nanos: 0
+  auto-terminated relationships list:
+  - success
+  Properties:
+Attributes to Ignore:
+Attributes to Log:
+Log Level: info
+Log Payload: 'false'
+Log prefix:
+- name: LogAttribute2
+  id: 0bda7282-7a4f-4d39-83e5-ea86aa63f1dc
+  class: org.apache.nifi.processors.standard.LogAttribute
+  max concurrent tasks: 1
+  scheduling strategy: TIMER_DRIVEN
+  scheduling period: 0 sec
+  penalization period: 30 sec
+  yield period: 1 sec
+  run duration nanos: 0
+  auto-terminated relationships list:
+  - success
+  Properties:
+Attributes to Ignore:
+Attributes to Log:
+Log Level: info
+Log Payload: 'false'
+Log prefix:
+- name: Route On Status Code
+  id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
+  class: org.apache.nifi.processors.standard.RouteOnAttribute
+  max concurrent tasks: 1
+  scheduling strategy: TIMER_DRIVEN
+  scheduling period: 0 sec
+  penalization period: 30 sec
+  yield period: 1 sec
+  run duration nanos: 0
+  auto-terminated relationships list: []
+  Properties:
+'200': ${invokehttp.status.code:equals(200)}
+Routing Strategy: Route to Property name
+- name: Search Google
+  id: 66649998-3b08-4b41-9f07-a51d999743f6
+  class: org.apache.nifi.processors.standard.InvokeHTTP
+  max concurrent tasks: 1
+  scheduling strategy: TIMER_DRIVEN
+  scheduling period: 0 sec
+  penalization period: 30 sec
+  yield period: 1 sec
+  run duration nanos: 0
+  auto-terminated relationships list: []
+  Properties:
+Add Response Headers to Request: 'false'
+Always Output Response: 'false'
+Attributes to Send:
+Basic Authentication Password:
+Basic Authentication Username:
+Connection Timeout: 5 secs
+Content-Type: ${mime.type}
+Digest Authentication: 'false'
+Follow Redirects: 'True'
+HTTP Method: GET
+Include Date Header: 'True'
+Max Length To Put In Attribute: '256'
+Penalize on "No Retry": 'false'
+Proxy Host:
+Proxy Port:
+Put Response Body In Attribute:
+Read Timeout: 15 secs
+Remote URL: http://www.google.com/search?q=${q}=j
+SSL 

[2/2] nifi-minifi git commit: MINIFI-153 - Adding proxy settings to remote process group

[jpercivall]

MINIFI-153 - Adding proxy settings to remote process group

This closes #64

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: 94869042fdfeec21d0fbcc4b4c18886464972b05
Parents: cbb2bdd
Author: Bryan Rosander 
Authored: Tue Dec 6 09:59:31 2016 -0500
Committer: Joseph Percivall 
Committed: Tue Dec 13 09:54:34 2016 -0500

--
 .../bootstrap/util/ConfigTransformer.java   |   9 +
 .../bootstrap/util/ConfigTransformerTest.java   |  22 +-
 ...okeHttpMiNiFiProxyNoPasswordTemplateTest.yml | 302 +++
 ...nvokeHttpMiNiFiProxyPasswordTemplateTest.yml | 302 +++
 .../minifi/commons/schema/ConfigSchema.java |  31 +-
 .../schema/RemoteProcessGroupSchema.java|  99 +-
 .../commons/schema/common/BaseSchema.java   |  21 +-
 .../schema/common/BaseSchemaWithIdAndName.java  |   2 +-
 .../schema/common/CollectionOverlap.java|  56 
 .../commons/schema/v1/ConfigSchemaV1.java   |   9 +-
 .../commons/schema/v2/ConfigSchemaV2.java   |  94 ++
 .../commons/schema/v2/ProcessGroupSchemaV2.java |  26 +-
 .../schema/v2/RemoteProcessGroupSchemaV2.java   | 101 +++
 .../schema/RemoteProcessGroupSchemaTest.java|  56 +++-
 .../v2/RemoteProcessGroupSchemaV2Test.java  |  82 +
 .../src/main/markdown/System_Admin_Guide.md |   7 +-
 .../dto/RemoteProcessGroupSchemaFunction.java   |   4 +
 .../toolkit/configuration/ConfigMainTest.java   |  32 +-
 .../InvokeHttpMiNiFiTemplateTest-v2.yml | 297 ++
 .../resources/InvokeHttpMiNiFiTemplateTest.xml  |   7 +-
 .../resources/InvokeHttpMiNiFiTemplateTest.yml  |   6 +-
 .../ProcessGroupsAndRemoteProcessGroups-v2.yml  | 287 ++
 .../ProcessGroupsAndRemoteProcessGroups.yml |   8 +
 .../test/resources/SimpleTailFileToRPG-v2.yml   | 113 +++
 .../src/test/resources/SimpleTailFileToRPG.yml  |   4 +
 25 files changed, 1816 insertions(+), 161 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/94869042/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
--
diff --git 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
index 55d3285..b724019 100644
--- 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
+++ 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
@@ -19,6 +19,7 @@ package org.apache.nifi.minifi.bootstrap.util;
 
 
 import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.commons.lang3.StringUtils;
 import 
org.apache.nifi.minifi.bootstrap.configuration.ConfigurationChangeException;
 import 
org.apache.nifi.minifi.bootstrap.exception.InvalidConfigurationException;
 import org.apache.nifi.minifi.commons.schema.ComponentStatusRepositorySchema;
@@ -569,6 +570,14 @@ public final class ConfigTransformer {
 addTextElement(element, "yieldPeriod", 
remoteProcessGroupProperties.getYieldPeriod());
 addTextElement(element, "transmitting", "true");
 addTextElement(element, "transportProtocol", 
remoteProcessGroupProperties.getTransportProtocol());
+addTextElement(element, "proxyHost", 
remoteProcessGroupProperties.getProxyHost());
+if (remoteProcessGroupProperties.getProxyPort() != null) {
+addTextElement(element, "proxyPort", 
Integer.toString(remoteProcessGroupProperties.getProxyPort()));
+}
+addTextElement(element, "proxyUser", 
remoteProcessGroupProperties.getProxyUser());
+if 
(!StringUtils.isEmpty(remoteProcessGroupProperties.getProxyPassword())) {
+addTextElement(element, "proxyPassword", 
remoteProcessGroupProperties.getProxyPassword());
+}
 
 List remoteInputPorts = 
remoteProcessGroupProperties.getInputPorts();
 for (RemoteInputPortSchema remoteInputPortSchema : 
remoteInputPorts) {

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/94869042/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java
--
diff --git 
a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java
 

nifi git commit: NIFI-3133: - Ensuring that Remote Group Ports are always authorized according to their Remote Process Group.

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master fc0d336f3 -> 2d6bba080


NIFI-3133: - Ensuring that Remote Group Ports are always authorized according 
to their Remote Process Group.

NIFI-3133:
- Using getSourceAuthorizable() when accessing flow files and content.

NIFI-3133:
- Decouple local and remote connectable's to avoid ambiguity with self 
referencing RPGs.

NIFI-3133:
- Addressing comments from the PR.

NIFI-3133:
- Fixed check verifying source/destination when creating a connection.

NIFI-3133:
- Only showing the go to link when the source component is not a remote port.

NIFI-3133:
- Removing unnecessary checking of remote group port authorization since it's 
handled by the parent RPG.

NIFI-3133:
- Fixing issue showing the connection details dialog when the source component 
is a RPG.

NIFI-3133:
- Ensuring the local connectable was found.

This closes #1297

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 2d6bba080f90a45a9f4149f6844f452150ed6bc1
Parents: fc0d336
Author: Matt Gilman <matt.c.gil...@gmail.com>
Authored: Mon Dec 5 11:15:29 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Mon Dec 5 19:45:45 2016 -0500

--
 .../nifi/provenance/ProvenanceEventRecord.java  |  11 ++
 .../ProvenanceAuthorizableFactory.java  |  11 +-
 .../org/apache/nifi/connectable/Connection.java |  12 ++-
 .../org/apache/nifi/groups/ProcessGroup.java|  12 ++-
 .../nifi/connectable/StandardConnection.java|  62 ---
 .../apache/nifi/controller/FlowController.java  |  19 +++-
 .../reporting/StandardReportingContext.java |  12 +--
 .../repository/StandardProcessSession.java  |  54 +-
 .../nifi/groups/StandardProcessGroup.java   |  27 +++--
 .../service/mock/MockProcessGroup.java  |   8 +-
 .../nifi/authorization/AuthorizableLookup.java  |  29 +-
 .../authorization/ConnectionAuthorizable.java   |  14 +++
 .../StandardAuthorizableLookup.java |  41 
 .../apache/nifi/web/api/ConnectionResource.java |  31 +-
 .../nifi/web/api/FlowFileQueueResource.java |  12 +--
 .../org/apache/nifi/web/api/FlowResource.java   |   2 +-
 .../nifi/web/api/ProcessGroupResource.java  |  43 +++-
 .../web/api/RemoteProcessGroupResource.java |   8 +-
 .../nifi/web/controller/ControllerFacade.java   |  71 -
 .../web/dao/impl/StandardConnectionDAO.java |  32 --
 .../web/dao/impl/StandardProcessGroupDAO.java   |   4 +-
 .../main/webapp/js/nf/nf-connection-details.js  |   2 +
 .../js/nf/provenance/nf-provenance-table.js |   3 +-
 .../PersistentProvenanceRepository.java | 103 ++-
 .../VolatileProvenanceRepository.java   |  13 ++-
 25 files changed, 417 insertions(+), 219 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/2d6bba08/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRecord.java
--
diff --git 
a/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRecord.java 
b/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRecord.java
index eaa3464..7ba1622 100644
--- 
a/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRecord.java
+++ 
b/nifi-api/src/main/java/org/apache/nifi/provenance/ProvenanceEventRecord.java
@@ -24,6 +24,9 @@ import java.util.Map;
  */
 public interface ProvenanceEventRecord {
 
+String REMOTE_INPUT_PORT_TYPE = "Remote Input Port";
+String REMOTE_OUTPUT_PORT_TYPE = "Remote Output Port";
+
 /**
  * @return a unique ID for this Provenance Event. Depending on the
  * implementation, the Event ID may be set to -1 until the event has been
@@ -101,6 +104,14 @@ public interface ProvenanceEventRecord {
 String getComponentType();
 
 /**
+ * @return whether this event originated from a remote group port
+ */
+default boolean isRemotePortType() {
+final String componentType = getComponentType();
+return REMOTE_INPUT_PORT_TYPE.equals(componentType) || 
REMOTE_OUTPUT_PORT_TYPE.equals(componentType);
+}
+
+/**
  * @return a URI that provides information about the System and Protocol
  * information over which the transfer occurred. The intent of this field 
is
  * such that both the sender and the receiver can publish the events to an

http://git-wip-us.apache.org/repos/asf/nifi/blob/2d6bba08/nifi-framework-api/src/main/java/org/apache/nifi/prov

nifi git commit: NIFI-3140: Restored optional type handling in FetchElasticsearchHttp

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 7c5bd876b -> 316cae16d


NIFI-3140: Restored optional type handling in FetchElasticsearchHttp

This closes #1288

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 316cae16d310f6131852e158f8ab274249f0ecc3
Parents: 7c5bd87
Author: Matt Burgess <mattyb...@apache.org>
Authored: Thu Dec 1 19:32:49 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Fri Dec 2 14:10:52 2016 -0500

--
 .../elasticsearch/FetchElasticsearchHttp.java   |  9 ++--
 .../TestFetchElasticsearchHttp.java | 43 
 2 files changed, 46 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/316cae16/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
index 8fd30dc..06be4d5 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
@@ -104,8 +104,7 @@ public class FetchElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
 public static final PropertyDescriptor INDEX = new 
PropertyDescriptor.Builder()
 .name("fetch-es-index")
 .displayName("Index")
-.description("The name of the index to read from. If the property 
is set "
-+ "to _all, the query will match across all indexes.")
+.description("The name of the index to read from.")
 .required(true)
 .expressionLanguageSupported(true)
 .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
@@ -310,10 +309,8 @@ public class FetchElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
 throw new MalformedURLException("Base URL cannot be null");
 }
 HttpUrl.Builder builder = HttpUrl.parse(baseUrl).newBuilder();
-builder.addPathSegment((StringUtils.isEmpty(index)) ? "_all" : index);
-if (!StringUtils.isEmpty(type)) {
-builder.addPathSegment(type);
-}
+builder.addPathSegment(index);
+builder.addPathSegment((StringUtils.isEmpty(type)) ? "_all" : type);
 builder.addPathSegment(docId);
 if (!StringUtils.isEmpty(fields)) {
 String trimmedFields = 
Stream.of(fields.split(",")).map(String::trim).collect(Collectors.joining(","));

http://git-wip-us.apache.org/repos/asf/nifi/blob/316cae16/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
index 28bc060..346ead4 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
@@ -21,6 +21,7 @@ import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import org.apache.nifi.processor.ProcessContext;
@@ -38,8 +39,10 @@ import org.mockito.stubbing.Answer;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.HashMap;
 
+import static org.junit.As

nifi git commit: NIFI-3095: Add EL support to Elasticsearch 2.x (and HTTP) processors

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 8da38acf3 -> 69b23adf1


NIFI-3095: Add EL support to Elasticsearch 2.x (and HTTP) processors

This closes #1276

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 69b23adf1b0fdfb7e1e344c833adfbeb1f4980e5
Parents: 8da38ac
Author: Matt Burgess <mattyb...@apache.org>
Authored: Tue Nov 29 11:29:47 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Fri Dec 2 11:16:23 2016 -0500

--
 .../AbstractElasticsearchHttpProcessor.java |  7 ++-
 .../AbstractElasticsearchProcessor.java | 17 +--
 ...ctElasticsearchTransportClientProcessor.java | 52 +++-
 .../elasticsearch/FetchElasticsearch.java   | 34 -
 .../elasticsearch/FetchElasticsearchHttp.java   | 44 +++--
 .../elasticsearch/PutElasticsearch.java | 44 ++---
 .../elasticsearch/PutElasticsearchHttp.java | 51 +++
 .../elasticsearch/QueryElasticsearchHttp.java   | 38 --
 .../elasticsearch/ScrollElasticsearchHttp.java  | 43 +---
 .../elasticsearch/TestFetchElasticsearch.java   | 31 
 .../TestFetchElasticsearchHttp.java | 29 +++
 .../elasticsearch/TestPutElasticsearch.java | 33 +
 .../elasticsearch/TestPutElasticsearchHttp.java | 27 ++
 .../TestQueryElasticsearchHttp.java | 23 +
 .../TestScrollElasticsearchHttp.java| 24 +
 15 files changed, 371 insertions(+), 126 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/69b23adf/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java
index c4121b5..d67ce6c 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java
@@ -56,6 +56,7 @@ public abstract class AbstractElasticsearchHttpProcessor 
extends AbstractElastic
 .description("Elasticsearch URL which will be connected to, 
including scheme (http, e.g.), host, and port. The default port for the REST 
API is 9200.")
 .required(true)
 .addValidator(StandardValidators.URL_VALIDATOR)
+.expressionLanguageSupported(true)
 .build();
 
 public static final PropertyDescriptor PROXY_HOST = new 
PropertyDescriptor.Builder()
@@ -81,6 +82,7 @@ public abstract class AbstractElasticsearchHttpProcessor 
extends AbstractElastic
 .required(true)
 .defaultValue("5 secs")
 .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+.expressionLanguageSupported(true)
 .build();
 
 public static final PropertyDescriptor RESPONSE_TIMEOUT = new 
PropertyDescriptor.Builder()
@@ -90,6 +92,7 @@ public abstract class AbstractElasticsearchHttpProcessor 
extends AbstractElastic
 .required(true)
 .defaultValue("15 secs")
 .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+.expressionLanguageSupported(true)
 .build();
 
 private final AtomicReference okHttpClientAtomicReference = 
new AtomicReference<>();
@@ -109,8 +112,8 @@ public abstract class AbstractElasticsearchHttpProcessor 
extends AbstractElastic
 }
 
 // Set timeouts
-
okHttpClient.connectTimeout((context.getProperty(CONNECT_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue()),
 TimeUnit.MILLISECONDS);
-
okHttpClient.readTimeout(context.getProperty(RESPONSE_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue(),
 TimeUnit.MILLISECONDS);
+
okHttpClient.connectTimeout((context.getProperty(CONNECT_TIMEOUT).evaluateAttributeExpressions().asTimePeriod(TimeUnit.MILLISECONDS).intValue()),
 TimeUnit.MILLISECONDS

[2/3] nifi-minifi git commit: MINIFI-142 Updating License and Notice information for NiFi 1.1.0 upgrade

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/967d4024/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE
--
diff --git 
a/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE
 
b/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE
index a38d06b..d645695 100644
--- 
a/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE
+++ 
b/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE
@@ -200,138 +200,3 @@
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 SUBCOMPONENTS:
-
-The Apache NiFi project contains subcomponents with separate copyright
-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 'Bouncy Castle JDK 1.5 
Provider'
-under an MIT style license.
-
-Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. 
(http://www.bouncycastle.org)
-
-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 bundes 'JCraft Jsch' which is available under a 3-Clause BSD 
-License.
-
-Copyright (c) 2002-2015 Atsuhiko Yamanaka, JCraft,Inc. 
-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. The names of the authors may not be used to endorse or promote 
products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE 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 'JCraft Jzlib' which is available under a 3-Clause BSD 
License.
-
-Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc. 
-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. The names of the authors may not be used to endorse or promote 
products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS 

[1/3] nifi-minifi git commit: MINIFI-142 Upgrading NiFi dependencies to 1.1.0 and adjusting NAR and ClassLoader code to reflect changes introduced in NiFi.

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master bcf6c6cb2 -> 967d40243


MINIFI-142 Upgrading NiFi dependencies to 1.1.0 and adjusting NAR and 
ClassLoader code to reflect changes introduced in NiFi.

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: 85d69eadae5bffb570a28fcb4a05649d58605ce6
Parents: bcf6c6c
Author: Aldrin Piri 
Authored: Tue Nov 29 16:36:46 2016 -0500
Committer: Joseph Percivall 
Committed: Wed Nov 30 17:13:13 2016 -0500

--
 .../org/apache/nifi/nar/ExtensionManager.java   | 103 ++--
 .../apache/nifi/nar/InstanceClassLoader.java| 160 +++
 .../java/org/apache/nifi/nar/NarCloseable.java  |  27 ++--
 .../nifi/nar/NarThreadContextClassLoader.java   |  22 ++-
 .../java/org/apache/nifi/nar/NarUnpacker.java   |  28 ++--
 .../java/org/apache/nifi/util/FileUtils.java| 105 
 .../pom.xml |   5 +
 .../MiNiFiPersistentProvenanceRepository.java   |  52 +++---
 ...estMiNiFiPersistentProvenanceRepository.java | 156 +++---
 pom.xml |   2 +-
 10 files changed, 385 insertions(+), 275 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/85d69ead/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
--
diff --git 
a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
 
b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
index 787fb3c..9fd9e66 100644
--- 
a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
+++ 
b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
@@ -16,14 +16,8 @@
  */
 package org.apache.nifi.nar;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
+import org.apache.nifi.annotation.behavior.RequiresInstanceClassLoading;
 import org.apache.nifi.authentication.LoginIdentityProvider;
-
 import org.apache.nifi.authorization.Authorizer;
 import org.apache.nifi.controller.ControllerService;
 import org.apache.nifi.controller.repository.ContentRepository;
@@ -34,10 +28,21 @@ import org.apache.nifi.flowfile.FlowFilePrioritizer;
 import org.apache.nifi.processor.Processor;
 import org.apache.nifi.provenance.ProvenanceRepository;
 import org.apache.nifi.reporting.ReportingTask;
-
+import org.apache.nifi.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * Scans through the classpath to load all FlowFileProcessors, 
FlowFileComparators, and ReportingTasks using the service provider API and 
running through all classloaders (root, NARs).
  *
@@ -53,6 +58,9 @@ public class ExtensionManager {
 
 private static final Map extensionClassloaderLookup = 
new HashMap<>();
 
+private static final Set requiresInstanceClassLoading = new 
HashSet<>();
+private static final Map instanceClassloaderLookup = 
new ConcurrentHashMap<>();
+
 static {
 definitionMap.put(Processor.class, new HashSet<>());
 definitionMap.put(FlowFilePrioritizer.class, new HashSet<>());
@@ -127,6 +135,12 @@ public class ExtensionManager {
 if (registeredClassLoader == null) {
 classloaderMap.put(className, classLoader);
 classes.add(type);
+
+// keep track of which classes require a class loader per 
component instance
+if (type.isAnnotationPresent(RequiresInstanceClassLoading.class)) {
+requiresInstanceClassLoading.add(className);
+}
+
 } else {
 boolean loadedFromAncestor = false;
 
@@ -159,6 +173,77 @@ public class ExtensionManager {
 return extensionClassloaderLookup.get(classType);
 }
 
+ 

[3/3] nifi-minifi git commit: MINIFI-142 Updating License and Notice information for NiFi 1.1.0 upgrade

[jpercivall]

MINIFI-142 Updating License and Notice information for NiFi 1.1.0 upgrade

This closes #60

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

Branch: refs/heads/master
Commit: 967d402434d448f08411c1933eea21a9dd4c53cb
Parents: 85d69ea
Author: Joseph Percivall 
Authored: Tue Nov 29 23:21:47 2016 -0500
Committer: Joseph Percivall 
Committed: Wed Nov 30 17:13:15 2016 -0500

--
 minifi-assembly/LICENSE |  43 +++-
 minifi-assembly/NOTICE  |  62 -
 .../src/main/resources/META-INF/LICENSE | 202 
 .../src/main/resources/META-INF/NOTICE  |  32 +++
 .../src/main/resources/META-INF/LICENSE | 202 
 .../src/main/resources/META-INF/NOTICE  |  28 +++
 .../src/main/resources/META-INF/LICENSE | 202 
 .../src/main/resources/META-INF/NOTICE  | 193 +---
 .../src/main/resources/META-INF/LICENSE | 135 ---
 .../src/main/resources/META-INF/NOTICE  | 174 +-
 .../src/main/resources/META-INF/LICENSE |  27 +--
 .../src/main/resources/META-INF/NOTICE  |  50 ++--
 .../src/main/resources/META-INF/LICENSE | 135 ---
 .../src/main/resources/META-INF/NOTICE  | 172 --
 .../src/main/resources/META-INF/LICENSE | 202 
 .../src/main/resources/META-INF/NOTICE  |  13 ++
 minifi-toolkit/minifi-toolkit-assembly/LICENSE  | 106 -
 minifi-toolkit/minifi-toolkit-assembly/NOTICE   | 229 ++-
 18 files changed, 1333 insertions(+), 874 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/967d4024/minifi-assembly/LICENSE
--
diff --git a/minifi-assembly/LICENSE b/minifi-assembly/LICENSE
index dda1222..af59c3f 100644
--- a/minifi-assembly/LICENSE
+++ b/minifi-assembly/LICENSE
@@ -202,9 +202,9 @@
limitations under the License.
 
 
-APACHE NIFI - MINIFI SUBCOMPONENTS:
+APACHE MINIFI SUBCOMPONENTS:
 
-The Apache NiFi - MiNiFi project contains subcomponents with separate copyright
+The Apache MiNiFi project contains subcomponents with separate copyright
 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.
@@ -483,4 +483,41 @@ For details see 
https://github.com/svenkubiak/jBCrypt/blob/0.4.1/LICENSE
 ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+The binary distribution of this product bundles 'JLine' under a BSD
+style license.
+
+Copyright (c) 2002-2006, Marc Prud'hommeaux 
+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 JLine 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 

nifi-minifi git commit: MINIFI-132 Adjusting default log configuration to reduce overall footprint of logs and to enable compression by default.

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master 98877d674 -> d623521b1


MINIFI-132 Adjusting default log configuration to reduce overall footprint of 
logs and to enable compression by default.

Upgrading logback dependencies to 1.1.7 and specifying size cap.

This closes #56

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: d623521b1a7a6a8fddfde919bfecb8274ffd3c83
Parents: 98877d6
Author: Aldrin Piri 
Authored: Wed Nov 16 17:17:16 2016 -0500
Committer: Joseph Percivall 
Committed: Tue Nov 29 14:16:52 2016 -0500

--
 minifi-assembly/NOTICE  |  4 +-
 .../src/main/resources/conf/logback.xml | 61 +---
 pom.xml | 16 +
 3 files changed, 18 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/d623521b/minifi-assembly/NOTICE
--
diff --git a/minifi-assembly/NOTICE b/minifi-assembly/NOTICE
index d343786..a193179 100644
--- a/minifi-assembly/NOTICE
+++ b/minifi-assembly/NOTICE
@@ -638,8 +638,8 @@ The following binary components are provided under the 
Eclipse Public License 1.
 
 (EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - 
http://www.aspectj.org)
 (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - 
http://www.h2database.com/html/license.html)
-(EPL 1.0)(LGPL 2.1) Logback Classic 
(ch.qos.logback:logback-classic:jar:1.1.3 - http://logback.qos.ch/)
-(EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.3 - 
http://logback.qos.ch/)
+(EPL 1.0)(LGPL 2.1) Logback Classic 
(ch.qos.logback:logback-classic:jar:1.1.7 - http://logback.qos.ch/)
+(EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.7 - 
http://logback.qos.ch/)
 
 *
 Mozilla Public License v2.0

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/d623521b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
--
diff --git 
a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
 
b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
index e071858..f7f6f26 100644
--- 
a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
+++ 
b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
@@ -21,41 +21,28 @@
 
 
 logs/minifi-app.log
-
+
 
-
./logs/minifi-app_%d{-MM-dd_HH}.%i.log
-
-100MB
-
-
-30
-
-
-%date %level [%thread] %logger{40} %msg%n
-true
-
-
-
-
-logs/minifi-user.log
-
+
./logs/minifi-app_%d{-MM-dd_HH}.%i.log.gz
+
+10
+
+1MB
 
-./logs/minifi-user_%d.log
-
-30
+10MB
 
 
 %date %level [%thread] %logger{40} %msg%n
+true
 
 
 
@@ -68,8 +55,8 @@
   To GZIP rolled files, replace '.log' with '.log.gz'.
   To ZIP rolled files, replace '.log' with '.log.zip'.
 -->
-./logs/minifi-bootstrap_%d.log
-
+
./logs/minifi-bootstrap_%d.log.gz
+
 5
 
 
@@ -88,9 +75,6 @@
 
 
 
-
-
-
 
 
 
@@ -103,25 +87,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/d623521b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 02adbb8..5678666 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,23 +95,13 @@ limitations under the License.
 
UTF-8
 2016
 1.7.12
-1.1.3
 1.0.0
-9.2.11.v20150529
+1.1.7
 9.3.9.v20160517
-4.10.4
-4.2.4.RELEASE
-4.0.3.RELEASE
 1.19
-2.6.2
-12.0.1
-4.2.5
 2.2.0
-0.6.0
-1.2.1

svn commit: r17191 - /release/nifi/1.0.0/

[jpercivall]

Author: jpercivall
Date: Tue Nov 29 14:33:32 2016
New Revision: 17191

Log:
Removing old version

Removed:
release/nifi/1.0.0/

[5/6] nifi-minifi git commit: MINIFI-115 - Changing YAML to use UUIDs

[jpercivall]

MINIFI-115 - Changing YAML to use UUIDs

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: 00d6ac03ce86152658d8d3f86b481e47e28b90fb
Parents: 5288850
Author: Bryan Rosander 
Authored: Tue Nov 15 15:16:18 2016 -0500
Committer: Joseph Percivall 
Committed: Sun Nov 27 12:53:38 2016 -0500

--
 .../src/test/resources/config-multiple-RPGs.yml |  4 +--
 .../resources/config-multiple-input-ports.yml   |  4 +--
 minifi-bootstrap/src/test/resources/config.yml  |  6 ++--
 .../commons/schema/ProcessGroupSchema.java  |  8 +
 .../commons/schema/common/BaseSchemaWithId.java | 18 ++
 .../commons/schema/v1/ConfigSchemaV1.java   | 36 
 .../minifi/commons/schema/ConfigSchemaTest.java | 13 ---
 .../commons/schema/ConnectionSchemaTest.java|  4 ++-
 .../commons/schema/v1/ConfigSchemaV1Test.java   | 29 +---
 .../schema/v1/ConnectionSchemaV1Test.java   | 10 +++---
 .../src/test/resources/config-minimal-v2.yml| 10 +++---
 .../minifi-standard-services-api-nar/pom.xml|  1 +
 minifi-nar-bundles/pom.xml  |  2 +-
 .../configuration/dto/BaseSchemaTester.java |  3 +-
 .../configuration/dto/ConnectionSchemaTest.java |  4 ++-
 .../dto/PortSchemaFunctionTest.java |  5 ++-
 .../configuration/dto/ProcessorSchemaTest.java  |  4 ++-
 .../dto/RemoteInputPortSchemaTest.java  |  4 ++-
 .../src/test/resources/config.yml   |  6 ++--
 19 files changed, 99 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/00d6ac03/minifi-bootstrap/src/test/resources/config-multiple-RPGs.yml
--
diff --git a/minifi-bootstrap/src/test/resources/config-multiple-RPGs.yml 
b/minifi-bootstrap/src/test/resources/config-multiple-RPGs.yml
index a779a42..a799097 100644
--- a/minifi-bootstrap/src/test/resources/config-multiple-RPGs.yml
+++ b/minifi-bootstrap/src/test/resources/config-multiple-RPGs.yml
@@ -77,7 +77,7 @@ Connections:
 - name: TailToS2S
   source name: TailAppLog
   source relationship name: success
-  destination name: dgs809qe-9qw7-q985-jl1u-y789ohi87g78
+  destination name: 37b4b78a-a5c9-3eac-bfb7-56fc4875aace
   max work queue size: 0
   max work queue data size: 1 MB
   flowfile expiration: 60 sec
@@ -109,7 +109,7 @@ Remote Processing Groups:
   timeout: 30 secs
   yield period: 10 sec
   Input Ports:
-  - id: dgs809qe-9qw7-q985-jl1u-y789ohi87g78
+  - id: 37b4b78a-a5c9-3eac-bfb7-56fc4875aace
 name: tailed log
 comments:
 max concurrent tasks: 1

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/00d6ac03/minifi-bootstrap/src/test/resources/config-multiple-input-ports.yml
--
diff --git 
a/minifi-bootstrap/src/test/resources/config-multiple-input-ports.yml 
b/minifi-bootstrap/src/test/resources/config-multiple-input-ports.yml
index 9654edf..1581163 100644
--- a/minifi-bootstrap/src/test/resources/config-multiple-input-ports.yml
+++ b/minifi-bootstrap/src/test/resources/config-multiple-input-ports.yml
@@ -77,7 +77,7 @@ Connections:
 - name: TailToS2S
   source name: TailAppLog
   source relationship name: success
-  destination name: dgs809qe-9qw7-q985-jl1u-y789ohi87g78
+  destination name: 37b4b78a-a5c9-3eac-bfb7-56fc4875aace
   max work queue size: 0
   max work queue data size: 1 MB
   flowfile expiration: 60 sec
@@ -103,7 +103,7 @@ Remote Processing Groups:
 comments:
 max concurrent tasks: 1
 use compression: false
-  - id: dgs809qe-9qw7-q985-jl1u-y789ohi87g78
+  - id: 37b4b78a-a5c9-3eac-bfb7-56fc4875aace
 name: tailed log2
 comments:
 max concurrent tasks: 1

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/00d6ac03/minifi-bootstrap/src/test/resources/config.yml
--
diff --git a/minifi-bootstrap/src/test/resources/config.yml 
b/minifi-bootstrap/src/test/resources/config.yml
index 64a28fe..dab1e8e 100644
--- a/minifi-bootstrap/src/test/resources/config.yml
+++ b/minifi-bootstrap/src/test/resources/config.yml
@@ -56,7 +56,7 @@ Security Properties:
 algorithm: PBEWITHMD5AND256BITAES-CBC-OPENSSL
 provider: BC
 Processors:
-- id: TailFile
+- id: 

[1/6] nifi-minifi git commit: MINIFI-115 Bump NiFi versions to 1.0.0

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master c999f0731 -> aeea72b71


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/52888507/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f44d6aa..d167191 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@ limitations under the License.
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi-minifi.git
 https://git-wip-us.apache.org/repos/asf?p=nifi-minifi.git
   HEAD
-  
+
 
 JIRA
 https://issues.apache.org/jira/browse/MINIFI
@@ -95,8 +95,23 @@ limitations under the License.
 
UTF-8
 2016
 1.7.12
-0.6.1
+1.1.3
+1.0.0
 9.2.11.v20150529
+9.3.9.v20160517
+4.10.4
+4.2.4.RELEASE
+4.0.3.RELEASE
+1.19
+2.6.2
+12.0.1
+4.2.5
+2.2.0
+0.6.0
+1.2.1
+2.6.2
+1.1.2
+1.0.1
 
 
 
@@ -168,12 +183,6 @@ limitations under the License.
 
 
 org.apache.nifi.minifi
-minifi-provenance-reporting-nar
-0.1.0-SNAPSHOT
-nar
-
-
-org.apache.nifi.minifi
 minifi-resources
 resources
 zip
@@ -186,18 +195,45 @@ limitations under the License.
 
 
 org.apache.nifi.minifi
+
minifi-persistent-provenance-repository
+0.1.0-SNAPSHOT
+
+
+org.apache.nifi.minifi
+minifi-framework-bundle
+0.1.0-SNAPSHOT
+
+
+org.apache.nifi.minifi
+minifi-framework-nar
+0.1.0-SNAPSHOT
+
+
+org.apache.nifi.minifi
 minifi-standard-nar
 0.1.0-SNAPSHOT
 nar
 
 
 org.apache.nifi.minifi
+minifi-standard-services-api-nar
+0.1.0-SNAPSHOT
+nar
+
+
+org.apache.nifi.minifi
 minifi-update-attribute-nar
 0.1.0-SNAPSHOT
 nar
 
 
 org.apache.nifi.minifi
+minifi-ssl-context-service-nar
+0.1.0-SNAPSHOT
+nar
+
+
+org.apache.nifi.minifi
 minifi-docs
 0.1.0-SNAPSHOT
 resources
@@ -208,12 +244,12 @@ limitations under the License.
 
 ch.qos.logback
 logback-classic
-1.1.3
+${logback.version}
 
 
 ch.qos.logback
 jcl-over-slf4j
-1.1.3
+${logback.version}
 provided
 
 
@@ -248,6 +284,12 @@ limitations under the License.
 
 
 org.eclipse.jetty
+jetty-util
+${jetty.version}
+provided
+
+
+org.eclipse.jetty
 jetty-server
 ${jetty.version}
 provided
@@ -315,6 +357,11 @@ limitations under the License.
 
 
 org.apache.nifi
+nifi-framework-api
+${org.apache.nifi.version}
+
+
+org.apache.nifi
 nifi-utils
 ${org.apache.nifi.version}
 
@@ -499,10 +546,41 @@ limitations under the License.
 ${org.apache.nifi.version}
 
 
+org.apache.nifi
+nifi-ssl-context-service
+${org.apache.nifi.version}
+
+
 commons-io
 commons-io
 2.5
 
+
+org.apache.nifi
+nifi-site-to-site-reporting-nar
+${org.apache.nifi.version}
+nar
+
+
+
+
+org.bouncycastle
+bcprov-jdk15on
+1.54
+provided
+
+
+org.bouncycastle
+bcpg-jdk15on
+1.54
+provided
+
+
+org.bouncycastle
+bcpkix-jdk15on
+1.54
+provided
+
 
 
 
@@ -526,6 +604,560 @@ limitations under the License.
 okhttp
 3.4.1
 
+
+
+org.apache.commons
+  

[3/6] nifi-minifi git commit: MINIFI-115 Bump NiFi versions to 1.0.0

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/52888507/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE
--
diff --git 
a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE
 
b/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index be55e59..000
--- 
a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,15 +0,0 @@
-minifi-provenance-reporting-task-nar
-Copyright 2015-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-Common Development and Distribution License 1.1
-
-
-The following binary components are provided under the Common Development and 
Distribution License 1.1. See project link for details.
-
-(CDDL 1.1) (GPL2 w/ CPE) JSON Processing API 
(javax.json:javax.json-api:jar:1.0 - http://json-processing-spec.java.net)
-(CDDL 1.1) (GPL2 w/ CPE) JSON Processing Default Provider 
(org.glassfish:javax.json:jar:1.0.4 - https://jsonp.java.net)
-

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/52888507/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-task/pom.xml
--
diff --git 
a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-task/pom.xml
 
b/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-task/pom.xml
deleted file mode 100644
index 837b94f..000
--- 
a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-task/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-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;>
-
-4.0.0
-
-org.apache.nifi.minifi
-minifi-provenance-reporting-bundle
-0.1.0-SNAPSHOT
-
-
-minifi-provenance-reporting-task
-Publishes MiNiFi metrics to NiFi via S2S
-0.1.0-SNAPSHOT
-
-
-
-org.apache.nifi
-nifi-api
-
-
-org.apache.nifi
-nifi-processor-utils
-
-
-org.apache.nifi
-nifi-utils
-
-
-org.apache.nifi
-nifi-ssl-context-service-api
-
-
-org.apache.nifi
-nifi-site-to-site-client
-
-
-org.glassfish
-javax.json
-1.0.4
-
-
-javax.json
-javax.json-api
-1.0
-
-
-
-org.mockito
-mockito-all
-test
-
-
-org.apache.nifi
-nifi-data-provenance-utils
-test
-
-
-org.apache.nifi
-nifi-mock
-test
-
-
-junit
-junit
-4.12
-test
-
-
-

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/52888507/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-task/src/main/java/org/apache/nifi/minifi/provenance/reporting/ProvenanceReportingTask.java
--
diff --git 
a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-task/src/main/java/org/apache/nifi/minifi/provenance/reporting/ProvenanceReportingTask.java
 
b/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-task/src/main/java/org/apache/nifi/minifi/provenance/reporting/ProvenanceReportingTask.java
deleted file mode 100644
index a0d1776..000
--- 
a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-task/src/main/java/org/apache/nifi/minifi/provenance/reporting/ProvenanceReportingTask.java
+++ /dev/null
@@ -1,462 +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 

[6/6] nifi-minifi git commit: MINIFI-115: Providing handling of ID for Remote Process Groups to use the generated approach created for other components and introducing a RemoteProcessingGroupSchemaV1.

[jpercivall]

MINIFI-115: Providing handling of ID for Remote Process Groups to use the 
generated approach created for other components and introducing a 
RemoteProcessingGroupSchemaV1. Corrected typos, adjusted 
ProvenanceReportingTask to be the bundled NiFi class, and updating specified 
NiFi version for the ConfigTransformer.

This closes #43

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: aeea72b712149d515d915de2ee617a81c15c4f90
Parents: 00d6ac0
Author: Aldrin Piri 
Authored: Fri Nov 18 14:02:31 2016 -0500
Committer: Joseph Percivall 
Committed: Sun Nov 27 12:53:45 2016 -0500

--
 minifi-assembly/pom.xml |  17 +++
 .../bootstrap/util/ConfigTransformer.java   |   9 +-
 .../bootstrap/util/ParentGroupIdResolver.java   |   2 +-
 .../bootstrap/util/ConfigTransformerTest.java   |   2 +-
 .../util/ParentGroupIdResolverTest.java |   7 +-
 minifi-bootstrap/src/test/resources/config.yml  |   3 +-
 .../schema/RemoteProcessingGroupSchema.java |  20 +---
 .../commons/schema/common/BaseSchemaWithId.java |   2 +-
 .../schema/common/BaseSchemaWithIdAndName.java  |   2 +-
 .../commons/schema/v1/ConfigSchemaV1.java   |  21 +++-
 .../v1/RemoteProcessingGroupSchemaV1.java   | 107 +++
 .../minifi-framework-nar/pom.xml|  20 
 .../minifi-provenance-reporting-nar/pom.xml |  84 +++
 .../minifi-provenance-reporting-bundle/pom.xml  |  31 ++
 .../minifi-ssl-context-service-nar/pom.xml  |  20 
 .../minifi-standard-services-api-nar/pom.xml|  15 +++
 minifi-nar-bundles/pom.xml  |   1 +
 .../toolkit/configuration/ConfigMain.java   |   3 -
 .../RemoteProcessingGroupSchemaFunction.java|   1 +
 .../toolkit/configuration/ConfigMainTest.java   |   2 +-
 .../dto/RemoteProcessingGroupSchemaTest.java|  13 ++-
 .../InvokeHttpMiNiFiTemplateTest-v1.yml |   2 +-
 .../resources/InvokeHttpMiNiFiTemplateTest.xml  |   6 +-
 .../resources/InvokeHttpMiNiFiTemplateTest.yml  |   3 +-
 .../ProcessGroupsAndRemoteProcessGroups.yml |   6 +-
 .../src/test/resources/config.yml   |   3 +-
 pom.xml |  25 +
 27 files changed, 384 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/aeea72b7/minifi-assembly/pom.xml
--
diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml
index 89ed9e4..6827110 100644
--- a/minifi-assembly/pom.xml
+++ b/minifi-assembly/pom.xml
@@ -135,6 +135,12 @@ limitations under the License.
 minifi-update-attribute-nar
 nar
 
+
+org.apache.nifi.minifi
+minifi-provenance-reporting-nar
+nar
+0.1.0-SNAPSHOT
+
 
 
 
@@ -181,6 +187,12 @@ limitations under the License.
 org.apache.nifi
 nifi-persistent-provenance-repository
 
+
+org.apache.nifi
+nifi-site-to-site-reporting-task
+1.0.0
+compile
+
 
 
 
@@ -189,6 +201,11 @@ limitations under the License.
 compile
 
 
+org.bouncycastle
+bcpkix-jdk15on
+compile
+
+
 org.eclipse.jetty
 jetty-util
 compile

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/aeea72b7/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
--
diff --git 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
index da707b9..98fccb5 100644
--- 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
+++ 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
@@ -78,8 +78,9 @@ import java.util.zip.GZIPOutputStream;
 
 public final class ConfigTransformer {
 // Underlying version of NIFI will be using
-public static final String NIFI_VERSION = "0.6.1";
+public static final String NIFI_VERSION = "1.0.0";
 public static final String ROOT_GROUP = "Root-Group";
+public static final String DEFAULT_PROV_REPORTING_TASK_CLASS = 

[2/6] nifi-minifi git commit: MINIFI-115 Bump NiFi versions to 1.0.0

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/52888507/minifi-nar-bundles/minifi-ssl-context-service-nar/src/main/resources/META-INF/LICENSE
--
diff --git 
a/minifi-nar-bundles/minifi-ssl-context-service-nar/src/main/resources/META-INF/LICENSE
 
b/minifi-nar-bundles/minifi-ssl-context-service-nar/src/main/resources/META-INF/LICENSE
new file mode 100644
index 000..a38d06b
--- /dev/null
+++ 
b/minifi-nar-bundles/minifi-ssl-context-service-nar/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,337 @@
+
+ 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 otherwise transfer the Work,
+  where such license applies only to those patent 

[4/6] nifi-minifi git commit: MINIFI-115 Bump NiFi versions to 1.0.0

[jpercivall]

MINIFI-115 Bump NiFi versions to 1.0.0

MINIFI-115 Remove provenance reporting bundle to use the NiFi equivalent.

Add dependency on nifi-framework-api and change AuthorityProvider to Authorizer.

work in progress

removing references to provenance reporting bundle.  this should default to the 
bundle introduced in NiFi

Adjust provenance repository to new API.

Adjusting ConfigMain to use ComponentDTO.

Adjusting handling of remote authorization failures for RPGs and updating 
status code.

Completed all code changes to support libraries.  Now issues at runtime with 
needed dependencies.

Provide nifi-framework-api to provide FlowFilePrioritizer interface.

Adjusting classloading and adjusting Persistent Prov repo.

Include httpclient as it is needed for Site to Site.

Creating a configexception to allow removal of ZooKeeper dependency.

Excluding lucene-analyzers-common.

Removing reliance on LuceneUtil.

Including lucene core needed for utility methods.  Removing extraneous logging 
message.

Adding site-to-site-reporting nar to assembly.

Removing unused imports causing contrib-check to fail.

Adding comment and SuppressWarning for unused QuorumPeerConfig

Removing remaining references to authorization issues in docs and associated 
status classes.

Revert "MINIFI-115 Remove provenance reporting bundle to use the NiFi 
equivalent."

This reverts commit a2ffa018d4b8c80d35f8cf18532843d63e19a7a9.

Reverting back to including a separate minifi-provenance-reporting nar that 
makes use of the nifi-site-to-site reporting jar.  Marking dependencies 
provided that are provided by lib.

Creating custom bundles to reuse libs already provided at the root instead of 
duplicates with each NAR.

Removing duplicated libraries and reusing bootstrap libraries where 
possible/compatible.

Migrating shared libraries out of bootstrap into lib.

Adjusting dependencies.

Converting NiFiComponentDTO to ComponentDTO as part of 1.0 API change.

Adjusting dependency management and assembly inclusions.

Removing extraneous provenance reporting files as we are using the
standard NiFi reporter.

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: 52888507f8ace399e6cfd0872a39f7b677cbfb9a
Parents: c999f07
Author: Aldrin Piri 
Authored: Wed Oct 5 16:47:14 2016 -0400
Committer: Joseph Percivall 
Committed: Sun Nov 27 12:53:32 2016 -0500

--
 minifi-api/pom.xml  |   4 +
 minifi-assembly/pom.xml |  46 +-
 .../src/main/assembly/dependencies.xml  |  26 +-
 .../status/rpg/RemoteProcessGroupHealth.java|  12 -
 .../rpg/RemoteProcessGroupStatusBean.java   |  15 +-
 .../status/util/StatusReportPopulator.java  |   6 +-
 .../minifi/commons/status/TestStatusReport.java |   4 +-
 .../src/main/markdown/System_Admin_Guide.md |   5 +-
 .../minifi-framework-nar/pom.xml|  60 +-
 .../minifi-framework-core/pom.xml   |  42 ++
 .../org/apache/nifi/minifi/MiNiFiServer.java|  56 +-
 .../nifi/minifi/status/StatusRequestParser.java |   5 -
 .../server/quorum/QuorumPeerConfig.java |  41 ++
 .../minifi/status/TestStatusConfigReporter.java |  36 +-
 .../minifi-framework/minifi-nar-utils/pom.xml   |   7 +-
 .../org/apache/nifi/nar/ExtensionManager.java   |  31 +-
 .../org/apache/nifi/nar/NarClassLoaders.java| 131 ++--
 .../java/org/apache/nifi/nar/NarCloseable.java  |  51 +-
 .../nifi/nar/NarThreadContextClassLoader.java   |  39 +-
 .../org/apache/nifi/nar/NarUnpackerTest.java|  56 +-
 .../src/main/resources/bin/minifi.sh|  11 +-
 .../java/org/apache/nifi/minifi/MiNiFi.java |   8 +-
 .../minifi-framework-bundle/pom.xml |   1 -
 .../minifi-provenance-reporting-nar/pom.xml |  40 --
 .../src/main/resources/META-INF/NOTICE  |  15 -
 .../minifi-provenance-reporting-task/pom.xml|  82 ---
 .../reporting/ProvenanceReportingTask.java  | 462 -
 .../org.apache.nifi.reporting.ReportingTask |  16 -
 .../reporting/TestProvenanceReportingTask.java  | 186 --
 .../minifi-provenance-reporting-bundle/pom.xml  |  46 --
 .../MiNiFiPersistentProvenanceRepository.java   | 123 ++--
 apache.nifi.provenance.ProvenanceRepository |  15 +
 ...estMiNiFiPersistentProvenanceRepository.java |  28 +-
 .../org/apache/nifi/provenance/TestUtil.java|  15 +-
 .../minifi-provenance-repository-nar/pom.xml|   2 -
 .../minifi-ssl-context-service-nar/pom.xml  |  61 ++
 .../src/main/resources/META-INF/LICENSE | 337 ++
 .../src/main/resources/META-INF/NOTICE

nifi git commit: NIFI-3091: Ensure that we set the appropriate size on FlowFiles when modifying them

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 91ff810db -> 7ff14f719


NIFI-3091: Ensure that we set the appropriate size on FlowFiles when modifying 
them

This closes #1267

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 7ff14f7191f8bbb1722340ccdd963d3e7d24b9e4
Parents: 91ff810
Author: Mark Payne <marka...@hotmail.com>
Authored: Wed Nov 23 11:09:42 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Nov 23 12:07:44 2016 -0500

--
 .../repository/StandardProcessSession.java  |  3 +-
 .../repository/TestStandardProcessSession.java  | 59 
 2 files changed, 61 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7ff14f71/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index 002bac9..80c917c 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -2580,7 +2580,8 @@ public final class StandardProcessSession implements 
ProcessSession, ProvenanceE
 cnfeThrown = true;
 throw cnfe;
 } finally {
-this.bytesWritten += countingOut.getBytesWritten();
+writtenToFlowFile = countingOut.getBytesWritten();
+this.bytesWritten += writtenToFlowFile;
 this.bytesRead += countingIn.getBytesRead();
 recursionSet.remove(source);
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/7ff14f71/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
index 8cc088d..6f94994 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
@@ -277,6 +277,65 @@ public class TestStandardProcessSession {
 }
 
 @Test
+public void testModifyContentWithStreamCallbackHasCorrectSize() throws 
IOException {
+final FlowFileRecord flowFileRecord = new 
StandardFlowFileRecord.Builder()
+.id(1000L)
+.addAttribute("uuid", "12345678-1234-1234-1234-123456789012")
+.entryDate(System.currentTimeMillis())
+.build();
+flowFileQueue.put(flowFileRecord);
+FlowFile original = session.get();
+assertNotNull(original);
+
+FlowFile child = session.write(original, (in, out) -> 
out.write("hello".getBytes()));
+session.transfer(child);
+session.commit();
+
+final FlowFileRecord onQueue = 
flowFileQueue.poll(Collections.emptySet());
+assertEquals(5, onQueue.getSize());
+}
+
+@Test
+public void testModifyContentWithOutputStreamCallbackHasCorrectSize() 
throws IOException {
+final FlowFileRecord flowFileRecord = new 
StandardFlowFileRecord.Builder()
+.id(1000L)
+.addAttribute("uuid", "12345678-1234-1234-1234-123456789012")
+.entryDate(System.currentTimeMillis())
+.build();
+flowFileQueue.put(flowFileRecord);
+FlowFile original = session.get();
+assertNotNull(original);
+
+F

nifi git commit: NIFI-3088: Ensure that on recovery of FlowFile Repository, if we find a FlowFile that maps to an unknown queue that we log a warning that the queue is missing and drop the FlowFile, r

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 22143e386 -> 91ff810db


NIFI-3088: Ensure that on recovery of FlowFile Repository, if we find a 
FlowFile that maps to an unknown queue that we log a warning that the queue is 
missing and drop the FlowFile, rather than throwing an NPE

This closes #1266

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 91ff810dbae71ac9d49bb5bcb0ef6b7c8dac8036
Parents: 22143e3
Author: Mark Payne <marka...@hotmail.com>
Authored: Wed Nov 23 10:33:06 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Nov 23 11:27:14 2016 -0500

--
 .../repository/SchemaRepositoryRecordSerde.java | 20 +++-
 .../WriteAheadFlowFileRepository.java   | 10 --
 .../schema/RepositoryRecordFieldMap.java|  2 +-
 .../schema/RepositoryRecordSchema.java  |  1 +
 4 files changed, 29 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/91ff810d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/SchemaRepositoryRecordSerde.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/SchemaRepositoryRecordSerde.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/SchemaRepositoryRecordSerde.java
index 916fd76..c0c9d18 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/SchemaRepositoryRecordSerde.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/SchemaRepositoryRecordSerde.java
@@ -38,10 +38,13 @@ import org.apache.nifi.repository.schema.Repetition;
 import org.apache.nifi.repository.schema.SchemaRecordReader;
 import org.apache.nifi.repository.schema.SchemaRecordWriter;
 import org.apache.nifi.repository.schema.SimpleRecordField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.wali.SerDe;
 import org.wali.UpdateType;
 
 public class SchemaRepositoryRecordSerde extends RepositoryRecordSerde 
implements SerDe {
+private static final Logger logger = 
LoggerFactory.getLogger(SchemaRepositoryRecordSerde.class);
 private static final int MAX_ENCODING_VERSION = 1;
 
 private final RecordSchema writeSchema = 
RepositoryRecordSchema.REPOSITORY_RECORD_SCHEMA_V1;
@@ -154,7 +157,19 @@ public class SchemaRepositoryRecordSerde extends 
RepositoryRecordSerde implement
 final String queueId = (String) 
record.getFieldValue(RepositoryRecordSchema.QUEUE_IDENTIFIER);
 final FlowFileQueue queue = getFlowFileQueue(queueId);
 
-return new StandardRepositoryRecord(queue, flowFileRecord);
+final StandardRepositoryRecord repoRecord = new 
StandardRepositoryRecord(queue, flowFileRecord);
+requireFlowFileQueue(repoRecord, queueId);
+return repoRecord;
+}
+
+private void requireFlowFileQueue(final StandardRepositoryRecord 
repoRecord, final String queueId) {
+if (queueId == null || queueId.trim().isEmpty()) {
+logger.warn("{} does not have a Queue associated with it; this 
record will be discarded", repoRecord.getCurrent());
+repoRecord.markForAbort();
+} else if (repoRecord.getOriginalQueue() == null) {
+logger.warn("{} maps to unknown Queue {}; this record will be 
discarded", repoRecord.getCurrent(), queueId);
+repoRecord.markForAbort();
+}
 }
 
 private void populateContentClaim(final StandardFlowFileRecord.Builder 
ffBuilder, final Record record) {
@@ -189,6 +204,9 @@ public class SchemaRepositoryRecordSerde extends 
RepositoryRecordSerde implement
 final StandardRepositoryRecord repoRecord = createRecord(record);
 final String swapLocation = (String) record.getFieldValue(new 
SimpleRecordField(RepositoryRecordSchema.SWAP_LOCATION, FieldType.STRING, 
Repetition.EXACTLY_ONE));
 repoRecord.setSwapLocation(swapLocation);
+
+final String queueId = (String) 
record.getFieldValue(RepositoryRecordSchema.QUEUE_IDENTIFIER);
+requireFlowFileQueue(repoRecord, queueId);
 return repoRecord;
 }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/91ff810d/nifi-nar-bundles/nifi-frame

nifi git commit: NIFI-3086 Updated TailFile.java to deal with windows paths that were breaking the regex parsing Fixed documentation misspelling in TailFile.java Fixed assertions in several tests in T

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 50667ed22 -> 066accc27


NIFI-3086 Updated TailFile.java to deal with windows paths that were breaking 
the regex parsing Fixed documentation misspelling in TailFile.java Fixed 
assertions in several tests in TestTailFile that were dependent on the received 
order of flowfiles, this was differing between Windows and MacOS/Linux

This closes #1264

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 066accc274540bb2bfd392cffd1e86bb9ff48bb0
Parents: 50667ed
Author: Jeff Storck <jtsw...@gmail.com>
Authored: Tue Nov 22 22:01:22 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Wed Nov 23 00:01:12 2016 -0500

--
 .../nifi/processors/standard/TailFile.java  | 12 ++-
 .../nifi/processors/standard/TestTailFile.java  | 82 +---
 2 files changed, 63 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/066accc2/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java
index 3b71609..3553ce8 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java
@@ -136,7 +136,7 @@ public class TailFile extends AbstractProcessor {
 static final PropertyDescriptor MODE = new PropertyDescriptor.Builder()
 .name("tail-mode")
 .displayName("Tailing mode")
-.description("Mode to use: single file will tail only one gile, 
multiple file will look for a list of file. In Multiple mode"
+.description("Mode to use: single file will tail only one file, 
multiple file will look for a list of file. In Multiple mode"
 + " the Base directory is required.")
 .expressionLanguageSupported(false)
 .required(true)
@@ -415,7 +415,15 @@ public class TailFile extends AbstractProcessor {
 Collection files = FileUtils.listFiles(new File(baseDir), null, 
isRecursive);
 List result = new ArrayList();
 
-String fullRegex = baseDir.endsWith(File.separator) ? baseDir + 
fileRegex : baseDir + File.separator + fileRegex;
+String baseDirNoTrailingSeparator = baseDir.endsWith(File.separator) ? 
baseDir.substring(0, baseDir.length() -1) : baseDir;
+final String fullRegex;
+if (File.separator.equals("/")) {
+// handle unix-style paths
+fullRegex = baseDirNoTrailingSeparator + File.separator + 
fileRegex;
+} else {
+// handle windows-style paths, need to quote backslash characters
+fullRegex = baseDirNoTrailingSeparator + 
Pattern.quote(File.separator) + fileRegex;
+}
 Pattern p = Pattern.compile(fullRegex);
 
 for(File file : files) {

http://git-wip-us.apache.org/repos/asf/nifi/blob/066accc2/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTailFile.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTailFile.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTailFile.java
index 5e49a75..0cda3f0 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTailFile.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTailFile.java
@@ -24,6 +24,8 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.util.Optional;
+import java.util.regex.Pattern;
 
 import org.apache.nifi.processors.standard.TailFile.TailFileState;
 import org.apache.nifi.util.MockFlowFile;
@@ -547,7 +549,13 @@ public class TestTailFil

nifi git commit: Added posix guard to ignore tests on windows

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 78fed3ed5 -> 913ae9161


Added posix guard to ignore tests on windows

This closes #1259

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 913ae91614b25dfd3fd668c475acd712d00de5a2
Parents: 78fed3e
Author: Oleg Zhurakousky <o...@suitcase.io>
Authored: Tue Nov 22 16:31:52 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Tue Nov 22 17:11:25 2016 -0500

--
 .../apache/nifi/processors/standard/TestGetFile.java  | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/913ae916/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
index daf807a..baa8919 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.PosixFilePermission;
@@ -34,6 +35,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+
 import org.apache.nifi.flowfile.attributes.CoreAttributes;
 import org.apache.nifi.util.MockFlowFile;
 import org.apache.nifi.util.TestRunner;
@@ -44,6 +46,10 @@ public class TestGetFile {
 
 @Test
 public void testWithInaccessibleDir() throws IOException {
+// Some systems don't support POSIX (Windows) and will fail if run. 
Should ignore the test in that event
+if 
(!FileSystems.getDefault().supportedFileAttributeViews().contains("posix")) {
+return;
+}
 File inaccessibleDir = new File("target/inaccessible");
 inaccessibleDir.deleteOnExit();
 inaccessibleDir.mkdir();
@@ -62,6 +68,10 @@ public class TestGetFile {
 
 @Test
 public void testWithUnreadableDir() throws IOException {
+// Some systems don't support POSIX (Windows) and will fail if run. 
Should ignore the test in that event
+if 
(!FileSystems.getDefault().supportedFileAttributeViews().contains("posix")) {
+return;
+}
 File unreadableDir = new File("target/unreadable");
 unreadableDir.deleteOnExit();
 unreadableDir.mkdir();
@@ -86,6 +96,10 @@ public class TestGetFile {
 
 @Test
 public void testWithUnwritableDir() throws IOException {
+// Some systems don't support POSIX (Windows) and will fail if run. 
Should ignore the test in that event
+if 
(!FileSystems.getDefault().supportedFileAttributeViews().contains("posix")) {
+return;
+}
 File unwritableDir = new File("target/unwritable");
 unwritableDir.deleteOnExit();
 unwritableDir.mkdir();

[2/2] nifi git commit: NIFI-3011: Added Elasticsearch5 processors

[jpercivall]

NIFI-3011: Added Elasticsearch5 processors

This closes #1233

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: dba9d5924a29d42f9f914320f6215a1849bbb54f
Parents: 7f5eabd
Author: Matt Burgess <mattyb...@apache.org>
Authored: Wed Nov 16 12:26:26 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Mon Nov 21 15:58:40 2016 -0500

--
 nifi-assembly/LICENSE   |  29 +
 nifi-assembly/NOTICE| 119 +
 nifi-assembly/pom.xml   |   5 +
 .../nifi-elasticsearch-5-nar/pom.xml|  41 ++
 .../src/main/resources/META-INF/LICENSE | 285 ++
 .../src/main/resources/META-INF/NOTICE  | 406 ++
 .../nifi-elasticsearch-5-processors/pom.xml |  92 
 .../AbstractElasticsearch5Processor.java|  97 
 ...tElasticsearch5TransportClientProcessor.java | 306 +++
 .../elasticsearch/FetchElasticsearch5.java  | 225 
 .../elasticsearch/PutElasticsearch5.java| 292 +++
 .../org.apache.nifi.processor.Processor |  16 +
 .../elasticsearch/TestFetchElasticsearch5.java  | 461 
 .../elasticsearch/TestPutElasticsearch5.java| 524 +++
 .../src/test/resources/DocumentExample.json |  21 +
 .../src/test/resources/log4j.properties |  22 +
 .../nifi-elasticsearch-nar/pom.xml  |   1 +
 .../nifi-elasticsearch-processors/pom.xml   |   1 +
 .../nifi-elasticsearch-bundle/pom.xml   |  11 +-
 pom.xml |  10 +-
 20 files changed, 2958 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/dba9d592/nifi-assembly/LICENSE
--
diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE
index 93073cd..6780aef 100644
--- a/nifi-assembly/LICENSE
+++ b/nifi-assembly/LICENSE
@@ -1725,3 +1725,32 @@ This product bundles 'jbzip2' which is available under 
an MIT license.
 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.
+
+The binary distribution of this product bundles 'HdrHistogram' which is 
available under a 2-Clause BSD style license:
+
+Copyright (c) 2012, 2013, 2014 Gil Tene
+Copyright (c) 2014 Michael Barker
+Copyright (c) 2014 Matt Warren
+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.
+
+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 HOLDER 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.

http://git-wip-us.apache.org/repos/asf/nifi/blob/dba9d592/nifi-assembly/NOTICE
--
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index d785dab..4a93017 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -1031,6 +1031,125 @@ The following binary components are provided under the 
Apache Software License v
   ParCEFone
   Copyright 2016 Fluenda
 
+  (ASLv2) The Netty Project
+  The following NOTICE information applies:
+
+The Netty Project
+=
+
+Please visit the Netty web site for more information:
+
+  * http://netty.io/
+
+

[1/2] nifi git commit: NIFI-3011: Added Elasticsearch5 processors

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 7f5eabd60 -> dba9d5924


http://git-wip-us.apache.org/repos/asf/nifi/blob/dba9d592/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch5.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch5.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch5.java
new file mode 100644
index 000..ef70bf0
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch5.java
@@ -0,0 +1,292 @@
+/*
+ * 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.elasticsearch;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.nifi.annotation.behavior.EventDriven;
+import org.apache.nifi.annotation.behavior.InputRequirement;
+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.annotation.lifecycle.OnStopped;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.Validator;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.logging.ComponentLog;
+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;
+import org.apache.nifi.processor.io.InputStreamCallback;
+import org.apache.nifi.processor.util.StandardValidators;
+import org.elasticsearch.ElasticsearchTimeoutException;
+import org.elasticsearch.action.bulk.BulkItemResponse;
+import org.elasticsearch.action.bulk.BulkRequestBuilder;
+import org.elasticsearch.action.bulk.BulkResponse;
+
+import org.elasticsearch.client.transport.NoNodeAvailableException;
+import org.elasticsearch.node.NodeClosedException;
+import org.elasticsearch.transport.ReceiveTimeoutTransportException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+
+@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
+@EventDriven
+@SupportsBatching
+@Tags({"elasticsearch", "elasticsearch 5","insert", "update", "write", "put"})
+@CapabilityDescription("Writes the contents of a FlowFile to Elasticsearch, 
using the specified parameters such as "
++ "the index to insert into and the type of the document. If the 
cluster has been configured for authorization "
++ "and/or secure transport (SSL/TLS), and the X-Pack plugin is 
available, secure connections can be made. This processor "
++ "supports Elasticsearch 5.x clusters.")
+public class PutElasticsearch5 extends 
AbstractElasticsearch5TransportClientProcessor {
+
+private static final Validator NON_EMPTY_EL_VALIDATOR = (subject, value, 
context) -> {
+if (context.isExpressionLanguageSupported(subject) && 
context.isExpressionLanguagePresent(value)) {
+return new 
ValidationResult.Builder().subject(subject).input(value).explanation("Expression
 Language Present").valid(true).build();
+}
+return new 
ValidationResult.Builder().subject(subject).input(value).valid(value != null && 
!value.isEmpty()).explanation(subject + " cannot be empty").build();
+};
+
+static final Relationship REL_SUCCESS = new 
Relationship.Builder().name("success")
+.description("All FlowFiles that are written to Elasticsearch are 
routed to this relationship").build();
+
+static final Relationship REL_FAILURE = new 
Relationship.Builder().name("failure")
+

[2/3] nifi git commit: Revert "NIFI-1893 Add processor for validating JSON"

[jpercivall]

Revert "NIFI-1893 Add processor for validating JSON"

This reverts commit f11682202b57edab585967e033839800d4159f4e.

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 6696529c99b5b564b076e4012abff3a54755370b
Parents: 1c90773
Author: joewitt <joew...@apache.org>
Authored: Tue Nov 15 15:52:17 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Tue Nov 15 18:09:14 2016 -0500

--
 .../nifi-standard-processors/pom.xml|   8 -
 .../nifi/processors/standard/ValidateJson.java  | 202 ---
 .../org.apache.nifi.processor.Processor |   1 -
 .../additionalDetails.html  |  34 
 .../processors/standard/TestValidateJson.java   | 105 --
 .../TestJson/json-object-sample-schema.json |  41 
 .../resources/TestJson/json-object-sample.json  |  59 --
 .../resources/TestJson/json-sample-schema.json  |  42 
 8 files changed, 492 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 77cf950..f6786c6 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -250,11 +250,6 @@ language governing permissions and limitations under the 
License. -->
 2.4.0
 
 
-org.everit.json
-org.everit.json.schema
-1.4.0
-
-
 com.fluenda
 ParCEFone
 1.2.0
@@ -290,9 +285,6 @@ language governing permissions and limitations under the 
License. -->
 
src/test/resources/TestIdentifyMimeType/1.txt
 
src/test/resources/TestIdentifyMimeType/1.csv
 
src/test/resources/TestJson/json-sample.json
-
src/test/resources/TestJson/json-sample-schema.json
-
src/test/resources/TestJson/json-object-sample.json
-
src/test/resources/TestJson/json-object-sample-schema.json
 
src/test/resources/TestJson/control-characters.json
 
src/test/resources/TestMergeContent/demarcate
 
src/test/resources/TestMergeContent/foot

http://git-wip-us.apache.org/repos/asf/nifi/blob/6696529c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
deleted file mode 100644
index a5a0975..000
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
+++ /dev/null
@@ -1,202 +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 java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.Map;
-imp

[1/3] nifi git commit: NIFI-2991 removed usage of json lib and components still using it

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 721964b7d -> b026f0beb


NIFI-2991 removed usage of json lib and components still using it

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 1c9077334f8672e10d765b5346b0282fec06126c
Parents: 721964b
Author: joewitt <joew...@apache.org>
Authored: Tue Nov 15 15:48:36 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Tue Nov 15 18:09:09 2016 -0500

--
 nifi-assembly/pom.xml   |  2 ++
 .../nifi-flume-bundle/nifi-flume-processors/pom.xml |  5 -
 .../nifi-social-media-nar/pom.xml   | 12 +++-
 .../nifi-standard-processors/pom.xml|  8 
 4 files changed, 17 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/1c907733/nifi-assembly/pom.xml
--
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 5eef82f..aa12f85 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -243,11 +243,13 @@ language governing permissions and limitations under the 
License. -->
 nifi-solr-nar
 nar
 
+
 
 org.apache.nifi
 nifi-hl7-nar

http://git-wip-us.apache.org/repos/asf/nifi/blob/1c907733/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml 
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
index 1a49f51..c069eb5 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
@@ -78,11 +78,6 @@
 flume-scribe-source
 ${flume.version}
 
-
-org.apache.flume.flume-ng-sources
-flume-twitter-source
-${flume.version}
-
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/1c907733/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml 
b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
index ad4f1d2..add42d4 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
@@ -36,5 +36,15 @@
 1.1.0-SNAPSHOT
 
 
-
+
+
+
+org.apache.maven.plugins
+maven-deploy-plugin
+
+true
+
+
+
+
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/1c907733/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index cce9c57..77cf950 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -169,10 +169,10 @@ language governing permissions and limitations under the 
License. -->
 org.apache.nifi
 nifi-dbcp-service-api
 
-   
-   org.codehaus.jackson
-   jackson-mapper-asl
-   
+
+org.codehaus.jackson
+jackson-mapper-asl
+
 
 com.squareup.okhttp
 okhttp

[3/3] nifi git commit: NIFI-2991 removed json.org references as appropriate for build. Twitter proc no longer deployed but reference kept in notice just in case someone uses it

[jpercivall]

NIFI-2991 removed json.org references as appropriate for build. Twitter proc no 
longer deployed but reference kept in notice just in case someone uses it

This closes #1230

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: b026f0bebe737aa62ab7de48a776d851807b1350
Parents: 6696529
Author: joewitt <joew...@apache.org>
Authored: Tue Nov 15 16:17:48 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Tue Nov 15 18:09:27 2016 -0500

--
 nifi-assembly/NOTICE  | 7 ---
 .../nifi-aws-nar/src/main/resources/META-INF/NOTICE   | 1 -
 .../nifi-flume-nar/src/main/resources/META-INF/NOTICE | 6 --
 .../nifi-social-media-bundle/nifi-social-media-nar/pom.xml| 4 
 4 files changed, 4 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-assembly/NOTICE
--
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index e920ff6..d785dab 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -780,12 +780,6 @@ The following binary components are provided under the 
Apache Software License v
   Apache License Version 2.0 http://www.apache.org/licenses/.
   (c) Daniel Lemire, http://lemire.me/en/
 
-  (ASLv2) Twitter4J
-The following NOTICE information applies:
-  Copyright 2007 Yusuke Yamamoto
-  
-  Twitter4J includes software from JSON.org to parse JSON response from 
the Twitter API. You can see the license term at 
http://www.JSON.org/license.html
-  
   (ASLv2) JOAuth
 The following NOTICE information applies:
   JOAuth
@@ -821,7 +815,6 @@ The following binary components are provided under the 
Apache Software License v
   **
   This software includes third party software subject to the following 
copyrights:
   - XML parsing and utility functions from JetS3t - Copyright 2006-2009 
James Murty.
-  - JSON parsing and utility functions from JSON.org - Copyright 2002 
JSON.org.
   - PKCS#1 PEM encoded private key parsing and utility functions from 
oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
 
(ASLv2) Apache Commons DBCP

http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
index 38cb6eb..5ae7a45 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
@@ -68,7 +68,6 @@ The following binary components are provided under the Apache 
Software License v
   **
   This software includes third party software subject to the following 
copyrights:
   - XML parsing and utility functions from JetS3t - Copyright 2006-2009 
James Murty.
-  - JSON parsing and utility functions from JSON.org - Copyright 2002 
JSON.org.
   - PKCS#1 PEM encoded private key parsing and utility functions from 
oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
--
diff --git 
a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
index 7d73ff9..a154d24 100644
--- 
a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
+++ 
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
@@ -175,12 +175,6 @@ The following binary components are provided under the 
Apache Software License v
Jetty Web Container
Copyright 1995-2015 Mort Bay Consulting Pty Ltd.
 
-  (ASLv2) Twitter4J
-The following NOTICE information applies:
-  Copyright 2007 Yusuke Yamamoto
-  
-  Twitter4J includes software from JSON.org to parse JSON response from 
the Twitter API. You can see the license term at 
http://www.JSON.org/license.html
-
   (ASLv2) Apache Velocity
 The following NOTICE information applies:
   Apache Velocity

http://git-wip-u

nifi git commit: NIFI-3036: When we replay a FlowFile, ensure that we are using the 'golden copy' of the associated Resource Claim, if the claim is still writable. Ensure that StandardResourceClaimMan

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 81357d445 -> 721964b7d


NIFI-3036: When we replay a FlowFile, ensure that we are using the 'golden 
copy' of the associated Resource Claim, if the claim is still writable. Ensure 
that StandardResourceClaimManager retains the 'golden copy' of a Resource Claim 
until it is no longer writable and has a claim count of 0

This closes #1223

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 721964b7d87c696f293f7c769b274fc6364ff034
Parents: 81357d4
Author: Mark Payne <marka...@hotmail.com>
Authored: Tue Nov 15 09:15:37 2016 -0500
Committer: jpercivall <jperciv...@apache.org>
Committed: Tue Nov 15 16:51:34 2016 -0500

--
 .../org/apache/nifi/controller/FlowController.java | 17 ++---
 .../repository/FileSystemRepository.java   | 10 +-
 .../claim/StandardResourceClaimManager.java| 11 ++-
 3 files changed, 33 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/721964b7/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 6927944..faa4230 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -3795,9 +3795,20 @@ public class FlowController implements EventAccess, 
ControllerServiceProvider, R
 throw new IllegalStateException("Cannot replay data from 
Provenance Event because the Source FlowFile Queue with ID " + 
event.getSourceQueueIdentifier() + " no longer exists");
 }
 
-// Create the ContentClaim
-final ResourceClaim resourceClaim = 
resourceClaimManager.newResourceClaim(event.getPreviousContentClaimContainer(),
-event.getPreviousContentClaimSection(), 
event.getPreviousContentClaimIdentifier(), false, false);
+// Create the ContentClaim. To do so, we first need the appropriate 
Resource Claim. Because we don't know whether or
+// not the Resource Claim is still active, we first call 
ResourceClaimManager.getResourceClaim. If this returns
+// null, then we know that the Resource Claim is no longer active and 
can just create a new one that is not writable.
+// It's critical though that we first call getResourceClaim because 
otherwise, if the Resource Claim is active and we
+// create a new one that is not writable, we could end up archiving or 
destroying the Resource Claim while it's still
+// being written to by the Content Repository. This is important only 
because we are creating a FlowFile with this Resource
+// Claim. If, for instance, we are simply creating the claim to 
request its content, as in #getContentAvailability, etc.
+// then this is not necessary.
+ResourceClaim resourceClaim = 
resourceClaimManager.getResourceClaim(event.getPreviousContentClaimContainer(),
+event.getPreviousContentClaimSection(), 
event.getPreviousContentClaimIdentifier());
+if (resourceClaim == null) {
+resourceClaim = 
resourceClaimManager.newResourceClaim(event.getPreviousContentClaimContainer(),
+event.getPreviousContentClaimSection(), 
event.getPreviousContentClaimIdentifier(), false, false);
+}
 
 // Increment Claimant Count, since we will now be referencing the 
Content Claim
 resourceClaimManager.incrementClaimantCount(resourceClaim);

http://git-wip-us.apache.org/repos/asf/nifi/blob/721964b7/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/j

nifi-minifi git commit: MINIFI-136 - Fixing ordering issue in ConfigTransformer

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master 12a58a869 -> 7954d36e9


MINIFI-136 - Fixing ordering issue in ConfigTransformer

This closes #55

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: 7954d36e90d6c53828ad042f33c3347fc11fea79
Parents: 12a58a8
Author: Bryan Rosander 
Authored: Wed Nov 9 21:11:33 2016 -0500
Committer: Joseph Percivall 
Committed: Thu Nov 10 15:03:47 2016 -0500

--
 .../bootstrap/util/ConfigTransformer.java   |  16 +-
 .../bootstrap/util/ConfigTransformerTest.java   |  40 -
 .../test/resources/config-funnel-and-rpg.yml| 170 +++
 3 files changed, 217 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7954d36e/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
--
diff --git 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
index 19d3268..09776de 100644
--- 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
+++ 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
@@ -366,14 +366,6 @@ public final class ConfigTransformer {
 addProcessor(element, processorConfig);
 }
 
-for (RemoteProcessingGroupSchema remoteProcessingGroupSchema : 
processGroupSchema.getRemoteProcessingGroups()) {
-addRemoteProcessGroup(element, remoteProcessingGroupSchema);
-}
-
-for (FunnelSchema funnelSchema : processGroupSchema.getFunnels()) {
-addFunnel(element, funnelSchema);
-}
-
 for (PortSchema portSchema : 
processGroupSchema.getInputPortSchemas()) {
 addPort(doc, element, portSchema, "inputPort");
 }
@@ -382,12 +374,20 @@ public final class ConfigTransformer {
 addPort(doc, element, portSchema, "outputPort");
 }
 
+for (FunnelSchema funnelSchema : processGroupSchema.getFunnels()) {
+addFunnel(element, funnelSchema);
+}
+
 for (ProcessGroupSchema child : 
processGroupSchema.getProcessGroupSchemas()) {
 Element processGroups = doc.createElement("processGroup");
 element.appendChild(processGroups);
 addProcessGroup(doc, processGroups, child, 
parentGroupIdResolver);
 }
 
+for (RemoteProcessingGroupSchema remoteProcessingGroupSchema : 
processGroupSchema.getRemoteProcessingGroups()) {
+addRemoteProcessGroup(element, remoteProcessingGroupSchema);
+}
+
 for (ConnectionSchema connectionConfig : 
processGroupSchema.getConnections()) {
 addConnection(element, connectionConfig, 
parentGroupIdResolver);
 }

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7954d36e/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java
--
diff --git 
a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java
 
b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java
index b41dc90..05f2abf 100644
--- 
a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java
+++ 
b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java
@@ -44,18 +44,23 @@ import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
 
 public class ConfigTransformerTest {
-
+public static final Map PG_ELEMENT_ORDER_MAP = 
generateOrderMap(
+Arrays.asList("processor", "inputPort", "outputPort", "funnel", 
"processGroup", 

[2/2] nifi-minifi git commit: MINIFI-47 - Funnel support

[jpercivall]

MINIFI-47 - Funnel support

This closes #52

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: 12a58a8698c3f661d14156c83c8ea0de2f7a74dd
Parents: 31855bb
Author: Bryan Rosander 
Authored: Thu Nov 3 11:14:56 2016 -0400
Committer: Joseph Percivall 
Committed: Wed Nov 9 16:48:48 2016 -0500

--
 .../bootstrap/util/ConfigTransformer.java   |  25 +-
 .../bootstrap/util/ParentGroupIdResolver.java   |  12 +-
 .../bootstrap/util/ConfigTransformerTest.java   |  22 +-
 .../util/ParentGroupIdResolverTest.java |  31 ++
 .../resources/stress-test-framework-funnel.yml  | 211 
 .../minifi/commons/schema/ConfigSchema.java |   6 +-
 .../minifi/commons/schema/FunnelSchema.java |  30 ++
 .../commons/schema/ProcessGroupSchema.java  |  14 +
 .../commons/schema/common/BaseSchemaWithId.java |  73 +++
 .../schema/common/BaseSchemaWithIdAndName.java  |  41 +-
 .../schema/common/CommonPropertyKeys.java   |   1 +
 .../src/main/markdown/System_Admin_Guide.md |   9 +
 .../src/main/resources/conf/config.yml  |   1 +
 .../toolkit/configuration/ConfigMain.java   |  18 +-
 .../configuration/dto/ConfigSchemaFunction.java |  19 +-
 .../configuration/dto/FunnelSchemaFunction.java |  38 ++
 .../toolkit/configuration/ConfigMainTest.java   |  14 +-
 .../src/test/resources/CsvToJson.yml|   1 +
 .../resources/DecompressionCircularFlow.yml |   1 +
 .../resources/InvokeHttpMiNiFiTemplateTest.yml  |   1 +
 .../test/resources/MultipleRelationships.yml|   1 +
 .../ProcessGroupsAndRemoteProcessGroups.yml |   3 +
 ...aceTextExpressionLanguageCSVReformatting.yml |   1 +
 .../src/test/resources/StressTestFramework.yml  |   1 +
 .../resources/StressTestFrameworkFunnel.xml | 540 +++
 .../resources/StressTestFrameworkFunnel.yml | 211 
 26 files changed, 1259 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/12a58a86/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
--
diff --git 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
index 9fa7f05..19d3268 100644
--- 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
+++ 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
@@ -27,6 +27,7 @@ import 
org.apache.nifi.minifi.commons.schema.ContentRepositorySchema;
 import org.apache.nifi.minifi.commons.schema.CorePropertiesSchema;
 import org.apache.nifi.minifi.commons.schema.FlowControllerSchema;
 import org.apache.nifi.minifi.commons.schema.FlowFileRepositorySchema;
+import org.apache.nifi.minifi.commons.schema.FunnelSchema;
 import org.apache.nifi.minifi.commons.schema.PortSchema;
 import org.apache.nifi.minifi.commons.schema.ProcessGroupSchema;
 import org.apache.nifi.minifi.commons.schema.ProcessorSchema;
@@ -369,6 +370,10 @@ public final class ConfigTransformer {
 addRemoteProcessGroup(element, remoteProcessingGroupSchema);
 }
 
+for (FunnelSchema funnelSchema : processGroupSchema.getFunnels()) {
+addFunnel(element, funnelSchema);
+}
+
 for (PortSchema portSchema : 
processGroupSchema.getInputPortSchemas()) {
 addPort(doc, element, portSchema, "inputPort");
 }
@@ -448,6 +453,17 @@ public final class ConfigTransformer {
 }
 }
 
+
+protected static void addFunnel(final Element parentElement, FunnelSchema 
funnelSchema) {
+Document document = parentElement.getOwnerDocument();
+Element element = document.createElement("funnel");
+parentElement.appendChild(element);
+
+addTextElement(element, "id", funnelSchema.getId());
+
+addPosition(element);
+}
+
 protected static void addProvenanceReportingTask(final Element element, 
ConfigSchema configSchema) throws ConfigurationChangeException {
 try {
 ProvenanceReportingSchema provenanceProperties = 
configSchema.getProvenanceReportingProperties();
@@ -605,8 +621,13 @@ public final class ConfigTransformer {
 if (parentId != null) {
 type = "OUTPUT_PORT";
 } else {
-parentId = 

[1/2] nifi-minifi git commit: MINIFI-47 - Funnel support

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master 31855bbc7 -> 12a58a869


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/12a58a86/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.xml
--
diff --git 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.xml
 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.xml
new file mode 100644
index 000..a126452
--- /dev/null
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.xml
@@ -0,0 +1,540 @@
+
+
+
+
+7cba7223-0157-1000-0571-63471fdb84c9
+StressTestFramework
+
+
+4ad21393-16a4-1794--
+7cba7223-0157-1000--
+1 GB
+1
+
+7cba7223-0157-1000--
+4ad21392-16a4-1794--
+FUNNEL
+
+0 sec
+1
+
+success
+
+7cba7223-0157-1000--
+16a47794-5391-4ad2--
+PROCESSOR
+
+0
+
+
+4ad21394-16a4-1794--
+7cba7223-0157-1000--
+1 GB
+1
+
+7cba7223-0157-1000--
+4ad21392-16a4-1794--
+FUNNEL
+
+0 sec
+1
+
+success
+
+7cba7223-0157-1000--
+53914ad2-7794-16a4--
+PROCESSOR
+
+0
+
+
+4ad21395-16a4-1794--
+7cba7223-0157-1000--
+1 GB
+1
+
+7cba7223-0157-1000--
+4ad21392-16a4-1794--
+FUNNEL
+
+0 sec
+1
+
+success
+
+7cba7223-0157-1000--
+779416a4-4ad2-1391--
+PROCESSOR
+
+0
+
+
+4ad21396-16a4-1794--
+7cba7223-0157-1000--
+1 GB
+1
+
+7cba7223-0157-1000--
+4ad21392-16a4-1794--
+FUNNEL
+
+0 sec
+1
+
+success
+
+7cba7223-0157-1000--
+4ad21391-16a4-1794--
+PROCESSOR
+
+0
+
+
+4ad21397-16a4-1794--
+7cba7223-0157-1000--
+1 GB
+1
+
+7cba7223-0157-1000--
+92557c76-f251-45a4--
+PROCESSOR
+
+0 sec
+1
+
+
+7cba7223-0157-1000--
+4ad21392-16a4-1794--
+FUNNEL
+
+0
+
+
+4c53556e-eb46-458c--
+7cba7223-0157-1000--
+0 MB
+2000
+
+7cba7223-0157-1000--
+397a4910-cc01-4c6b--
+PROCESSOR
+
+0 sec
+1
+
+
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
+success
+
+7cba7223-0157-1000--
+92557c76-f251-45a4--
+PROCESSOR
+
+0
+
+
+4ad21392-16a4-1794--
+7cba7223-0157-1000--
+
+593.8762672567133
+246.40484683047555
+
+
+
+92557c76-f251-45a4--
+7cba7223-0157-1000--
+
+442.8776092529297
+345.48790588378904
+
+
+WARN
+
+
2
+
+
+Delete Attributes Expression
+
+Delete Attributes Expression
+
+
+
+property 

[1/2] nifi git commit: NIFI-401

[jpercivall]

Repository: nifi
Updated Branches:
  refs/heads/master 4b4e099f2 -> bff89f17b


NIFI-401

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: 7eca2037bd602ecd2b26281d91ac3af9bc72a3f5
Parents: 4b4e099
Author: Brian Eugley <brian.eug...@capitalone.com>
Authored: Thu Jun 9 11:32:15 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Tue Nov 8 17:06:36 2016 -0500

--
 .../apache/nifi/scheduling/ExecutionNode.java   | 22 +++
 .../nifi/scheduling/SchedulingStrategy.java |  4 ++
 .../nifi/web/api/dto/ProcessorConfigDTO.java| 17 ++
 .../apache/nifi/controller/ProcessorNode.java   |  5 ++
 .../apache/nifi/controller/FlowController.java  |  7 +++
 .../controller/StandardFlowSynchronizer.java|  5 ++
 .../nifi/controller/StandardProcessorNode.java  | 15 +
 .../serialization/FlowFromDOMFactory.java   |  9 +++
 .../serialization/StandardFlowSerializer.java   |  1 +
 .../nifi/fingerprint/FingerprintFactory.java|  1 +
 .../src/main/resources/FlowConfiguration.xsd| 11 +++-
 .../org/apache/nifi/audit/ProcessorAuditor.java |  4 ++
 .../org/apache/nifi/web/api/dto/DtoFactory.java |  2 +
 .../nifi/web/controller/ControllerFacade.java   |  7 +++
 .../nifi/web/dao/impl/StandardProcessorDAO.java | 13 +
 .../partials/canvas/processor-configuration.jsp | 14 -
 .../WEB-INF/partials/processor-details.jsp  | 14 -
 .../main/webapp/css/processor-configuration.css |  8 ++-
 .../src/main/webapp/css/processor-details.css   |  4 +-
 .../js/nf/canvas/nf-processor-configuration.js  | 60 +---
 .../main/webapp/js/nf/nf-processor-details.js   | 25 +++-
 21 files changed, 220 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7eca2037/nifi-api/src/main/java/org/apache/nifi/scheduling/ExecutionNode.java
--
diff --git 
a/nifi-api/src/main/java/org/apache/nifi/scheduling/ExecutionNode.java 
b/nifi-api/src/main/java/org/apache/nifi/scheduling/ExecutionNode.java
new file mode 100644
index 000..f479732
--- /dev/null
+++ b/nifi-api/src/main/java/org/apache/nifi/scheduling/ExecutionNode.java
@@ -0,0 +1,22 @@
+/*
+ * 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.scheduling;
+
+public enum ExecutionNode {
+ALL,
+PRIMARY;
+}

http://git-wip-us.apache.org/repos/asf/nifi/blob/7eca2037/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
--
diff --git 
a/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java 
b/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
index ccf4281..21bf130 100644
--- a/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
+++ b/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
@@ -56,6 +56,10 @@ public enum SchedulingStrategy {
  */
 TIMER_DRIVEN(1, "0 sec"),
 /**
+ * NOTE: This option has been deprecated with the addition of the
+ * execution-node combo box.  It still exists for backward compatibility
+ * with existing flows that still have this value for schedulingStrategy.
+ **
  * Indicates that the component will be scheduled via timer only on the
  * Primary Node. If the instance is not part of a cluster and this
  * Scheduling Strategy is used, the component will be scheduled in the same

http://git-wip-us.apache.org/repos/asf/nifi/blob/7eca2037/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
--
diff --git 
a/nifi-na

[2/2] nifi git commit: NIFI-401: - Minor tweaks to PR #1117. - Ensuring existing configuraiton is retained and shown until the user explicits changes it. - Retaining, but disabling, deprecated options

[jpercivall]

NIFI-401: - Minor tweaks to PR #1117. - Ensuring existing configuraiton is 
retained and shown until the user explicits changes it. - Retaining, but 
disabling, deprecated options.

This closes #1185
This closes #1117
This closes #512

Signed-off-by: jpercivall <jperciv...@apache.org>


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

Branch: refs/heads/master
Commit: bff89f17b3bf84e802532e2649bd1424855987b5
Parents: 7eca203
Author: Matt Gilman <matt.c.gil...@gmail.com>
Authored: Fri Nov 4 11:03:35 2016 -0400
Committer: jpercivall <jperciv...@apache.org>
Committed: Tue Nov 8 17:06:43 2016 -0500

--
 .../apache/nifi/scheduling/ExecutionNode.java   |  9 +++
 .../nifi/scheduling/SchedulingStrategy.java |  1 +
 nifi-docs/src/main/asciidoc/user-guide.adoc |  4 ++
 .../apache/nifi/controller/FlowController.java  | 63 -
 .../nifi/controller/StandardProcessorNode.java  | 20 +-
 .../org/apache/nifi/audit/ProcessorAuditor.java |  2 +-
 .../partials/canvas/processor-configuration.jsp | 24 +++
 .../WEB-INF/partials/processor-details.jsp  | 24 +++
 .../main/webapp/css/processor-configuration.css |  6 --
 .../js/nf/canvas/nf-processor-configuration.js  | 72 
 .../src/main/webapp/js/nf/nf-common.js  |  4 +-
 .../main/webapp/js/nf/nf-processor-details.js   | 33 +
 12 files changed, 131 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/bff89f17/nifi-api/src/main/java/org/apache/nifi/scheduling/ExecutionNode.java
--
diff --git 
a/nifi-api/src/main/java/org/apache/nifi/scheduling/ExecutionNode.java 
b/nifi-api/src/main/java/org/apache/nifi/scheduling/ExecutionNode.java
index f479732..e41f703 100644
--- a/nifi-api/src/main/java/org/apache/nifi/scheduling/ExecutionNode.java
+++ b/nifi-api/src/main/java/org/apache/nifi/scheduling/ExecutionNode.java
@@ -16,7 +16,16 @@
  */
 package org.apache.nifi.scheduling;
 
+/**
+ * Defines the Nodes where a given Component will be scheduled to run.
+ */
 public enum ExecutionNode {
+/**
+ * A Component will be scheduled to run on all nodes.
+ */
 ALL,
+/**
+ * A Component will be scheduled to run on the primary node only.
+ */
 PRIMARY;
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/bff89f17/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
--
diff --git 
a/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java 
b/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
index 21bf130..332cc45 100644
--- a/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
+++ b/nifi-api/src/main/java/org/apache/nifi/scheduling/SchedulingStrategy.java
@@ -65,6 +65,7 @@ public enum SchedulingStrategy {
  * Scheduling Strategy is used, the component will be scheduled in the same
  * manner as if {@link TIMER_DRIVEN} were used.
  */
+@Deprecated
 PRIMARY_NODE_ONLY(1, "0 sec"),
 /**
  * Indicates that the component will be scheduled to run according to a

http://git-wip-us.apache.org/repos/asf/nifi/blob/bff89f17/nifi-docs/src/main/asciidoc/user-guide.adoc
--
diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc 
b/nifi-docs/src/main/asciidoc/user-guide.adoc
index e5f71a5..844793c 100644
--- a/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -529,6 +529,10 @@ The default value of `0 sec` means that the Processor 
should run as often as pos
 for any time duration of 0, regardless of the time unit (i.e., `0 sec`, `0 
mins`, `0 days`). For an explanation of values that are
 applicable for the CRON driven Scheduling Strategy, see the description of the 
CRON driven Scheduling Strategy itself.
 
+When configured for clustering, an Execution setting will be available. This 
setting is used determine which node(s) the Processor will be
+scheduled to execute. Selecting 'All Nodes' will result in this Processor 
being scheduled on every node in the cluster. Selecting
+'Primary Node' will result in this Processor being scheduled on the Primary 
Node only.
+
 The right-hand side of the tab contains a slider for choosing the `Run 
duration.' This controls how long the Processor should be scheduled
 to run each time that it is triggered. On the left-hand side of the slider, it 
is marked `Lower latency' while the right-hand side
 is marked `Higher t

[3/3] nifi-minifi git commit: MINIFI-107 - Process group support

[jpercivall]

MINIFI-107 - Process group support

This closes #50

Signed-off-by: Joseph Percivall 


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

Branch: refs/heads/master
Commit: 31855bbc7ee7016b460226d24790760523e07885
Parents: 1bbeedf
Author: Bryan Rosander 
Authored: Tue Nov 1 12:54:17 2016 -0400
Committer: Joseph Percivall 
Committed: Tue Nov 8 15:06:47 2016 -0500

--
 .../bootstrap/util/ConfigTransformer.java   | 183 --
 .../bootstrap/util/ParentGroupIdResolver.java   |  87 +++
 .../bootstrap/util/ConfigTransformerTest.java   | 166 -
 .../util/ParentGroupIdResolverTest.java | 129 
 .../bootstrap/util/TestConfigTransformer.java   |   3 -
 .../test/resources/config-process-groups.yml| 276 
 .../minifi/commons/schema/ConfigSchema.java | 124 ++--
 .../minifi/commons/schema/ConnectionSchema.java |  41 +-
 .../nifi/minifi/commons/schema/PortSchema.java  |  31 +
 .../commons/schema/ProcessGroupSchema.java  | 153 +
 .../minifi/commons/schema/ProcessorSchema.java  |  26 +-
 .../commons/schema/RemoteInputPortSchema.java   |  13 +-
 .../schema/RemoteProcessingGroupSchema.java |  15 +-
 .../commons/schema/common/BaseSchema.java   |  52 +-
 .../schema/common/BaseSchemaWithIdAndName.java  |  20 +-
 .../commons/schema/common/CollectionUtil.java   |  39 ++
 .../schema/common/CommonPropertyKeys.java   |   1 +
 .../commons/schema/common/StringUtil.java   |  34 +-
 .../exception/SchemaInstantiatonException.java  |  30 +
 .../commons/schema/ProcessGroupSchemaTest.java  |  64 ++
 .../schema/serialization/SchemaLoaderTest.java  |   4 +-
 .../commons/schema/v1/ConfigSchemaV1Test.java   |   6 +-
 .../schema/v1/ConnectionSchemaV1Test.java   |   2 +-
 .../src/main/markdown/System_Admin_Guide.md |  35 +-
 .../src/main/resources/conf/config.yml  |   3 +
 .../toolkit/configuration/ConfigMain.java   | 135 ++--
 .../configuration/dto/ConfigSchemaFunction.java |  67 +-
 .../dto/ConnectionSchemaFunction.java   |   6 +-
 .../configuration/dto/PortSchemaFunction.java   |  46 ++
 .../dto/ProcessorSchemaFunction.java|   6 +-
 .../toolkit/configuration/ConfigMainTest.java   |  30 +-
 .../dto/PortSchemaFunctionTest.java |  74 +++
 .../src/test/resources/CsvToJson.yml|   3 +
 .../resources/DecompressionCircularFlow.yml |   3 +
 .../resources/InvokeHttpMiNiFiTemplateTest.yml  |   3 +
 .../test/resources/MultipleRelationships.yml|   3 +
 .../ProcessGroupsAndRemoteProcessGroups.xml | 648 +++
 .../ProcessGroupsAndRemoteProcessGroups.yml | 276 
 ...aceTextExpressionLanguageCSVReformatting.yml |   3 +
 .../src/test/resources/StressTestFramework.yml  |   3 +
 40 files changed, 2532 insertions(+), 311 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/31855bbc/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
--
diff --git 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
index 9794415..9fa7f05 100644
--- 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
+++ 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
@@ -27,11 +27,15 @@ import 
org.apache.nifi.minifi.commons.schema.ContentRepositorySchema;
 import org.apache.nifi.minifi.commons.schema.CorePropertiesSchema;
 import org.apache.nifi.minifi.commons.schema.FlowControllerSchema;
 import org.apache.nifi.minifi.commons.schema.FlowFileRepositorySchema;
+import org.apache.nifi.minifi.commons.schema.PortSchema;
+import org.apache.nifi.minifi.commons.schema.ProcessGroupSchema;
 import org.apache.nifi.minifi.commons.schema.ProcessorSchema;
 import org.apache.nifi.minifi.commons.schema.ProvenanceReportingSchema;
 import org.apache.nifi.minifi.commons.schema.ProvenanceRepositorySchema;
 import org.apache.nifi.minifi.commons.schema.RemoteInputPortSchema;
 import org.apache.nifi.minifi.commons.schema.RemoteProcessingGroupSchema;
+import org.apache.nifi.minifi.commons.schema.common.ConvertableSchema;
+import org.apache.nifi.minifi.commons.schema.common.Schema;
 import org.apache.nifi.minifi.commons.schema.common.StringUtil;
 import org.apache.nifi.minifi.commons.schema.serialization.SchemaLoader;
 import 

[2/3] nifi-minifi git commit: MINIFI-107 - Process group support

[jpercivall]

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/31855bbc/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ProcessorSchema.java
--
diff --git 
a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ProcessorSchema.java
 
b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ProcessorSchema.java
index 048027c..6f2ff8e 100644
--- 
a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ProcessorSchema.java
+++ 
b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ProcessorSchema.java
@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import static 
org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys.MAX_CONCURRENT_TASKS_KEY;
-import static 
org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys.PROCESSORS_KEY;
 import static 
org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys.SCHEDULING_PERIOD_KEY;
 import static 
org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys.SCHEDULING_STRATEGY_KEY;
 import static 
org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys.YIELD_PERIOD_KEY;
@@ -59,22 +58,23 @@ public class ProcessorSchema extends 
BaseSchemaWithIdAndName {
 private String annotationData = "";
 
 public ProcessorSchema(Map map) {
-super(map, PROCESSORS_KEY);
-processorClass = getRequiredKeyAsType(map, CLASS_KEY, String.class, 
PROCESSORS_KEY);
-schedulingStrategy = getRequiredKeyAsType(map, 
SCHEDULING_STRATEGY_KEY, String.class, PROCESSORS_KEY);
+super(map, "Processor(id: {id}, name: {name})");
+String wrapperName = getWrapperName();
+processorClass = getRequiredKeyAsType(map, CLASS_KEY, String.class, 
wrapperName);
+schedulingStrategy = getRequiredKeyAsType(map, 
SCHEDULING_STRATEGY_KEY, String.class, wrapperName);
 if (schedulingStrategy != null && 
!isSchedulingStrategy(schedulingStrategy)) {
-addValidationIssue(SCHEDULING_STRATEGY_KEY, PROCESSORS_KEY, 
IT_IS_NOT_A_VALID_SCHEDULING_STRATEGY);
+addValidationIssue(SCHEDULING_STRATEGY_KEY, wrapperName, 
IT_IS_NOT_A_VALID_SCHEDULING_STRATEGY);
 }
-schedulingPeriod = getRequiredKeyAsType(map, SCHEDULING_PERIOD_KEY, 
String.class, PROCESSORS_KEY);
+schedulingPeriod = getRequiredKeyAsType(map, SCHEDULING_PERIOD_KEY, 
String.class, wrapperName);
 
-maxConcurrentTasks = getOptionalKeyAsType(map, 
MAX_CONCURRENT_TASKS_KEY, Number.class, PROCESSORS_KEY, 
DEFAULT_MAX_CONCURRENT_TASKS);
-penalizationPeriod = getOptionalKeyAsType(map, 
PENALIZATION_PERIOD_KEY, String.class, PROCESSORS_KEY, 
DEFAULT_PENALIZATION_PERIOD);
-yieldPeriod = getOptionalKeyAsType(map, YIELD_PERIOD_KEY, 
String.class, PROCESSORS_KEY, DEFAULT_YIELD_DURATION);
-runDurationNanos = getOptionalKeyAsType(map, RUN_DURATION_NANOS_KEY, 
Number.class, PROCESSORS_KEY, DEFAULT_RUN_DURATION_NANOS);
-autoTerminatedRelationshipsList = getOptionalKeyAsType(map, 
AUTO_TERMINATED_RELATIONSHIPS_LIST_KEY, List.class, PROCESSORS_KEY, 
DEFAULT_AUTO_TERMINATED_RELATIONSHIPS_LIST);
-properties = getOptionalKeyAsType(map, PROCESSOR_PROPS_KEY, Map.class, 
PROCESSORS_KEY, DEFAULT_PROPERTIES);
+maxConcurrentTasks = getOptionalKeyAsType(map, 
MAX_CONCURRENT_TASKS_KEY, Number.class, wrapperName, 
DEFAULT_MAX_CONCURRENT_TASKS);
+penalizationPeriod = getOptionalKeyAsType(map, 
PENALIZATION_PERIOD_KEY, String.class, wrapperName, 
DEFAULT_PENALIZATION_PERIOD);
+yieldPeriod = getOptionalKeyAsType(map, YIELD_PERIOD_KEY, 
String.class, wrapperName, DEFAULT_YIELD_DURATION);
+runDurationNanos = getOptionalKeyAsType(map, RUN_DURATION_NANOS_KEY, 
Number.class, wrapperName, DEFAULT_RUN_DURATION_NANOS);
+autoTerminatedRelationshipsList = getOptionalKeyAsType(map, 
AUTO_TERMINATED_RELATIONSHIPS_LIST_KEY, List.class, wrapperName, 
DEFAULT_AUTO_TERMINATED_RELATIONSHIPS_LIST);
+properties = getOptionalKeyAsType(map, PROCESSOR_PROPS_KEY, Map.class, 
wrapperName, DEFAULT_PROPERTIES);
 
-annotationData = getOptionalKeyAsType(map, ANNOTATION_DATA_KEY, 
String.class, PROCESSORS_KEY, "");
+annotationData = getOptionalKeyAsType(map, ANNOTATION_DATA_KEY, 
String.class, wrapperName, "");
 }
 
 public static boolean isSchedulingStrategy(String string) {

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/31855bbc/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/RemoteInputPortSchema.java
--
diff --git 
a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/RemoteInputPortSchema.java
 

[1/3] nifi-minifi git commit: MINIFI-107 - Process group support

[jpercivall]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master 1bbeedf6f -> 31855bbc7


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/31855bbc/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.xml
--
diff --git 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.xml
 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.xml
new file mode 100644
index 000..8cd6f1b
--- /dev/null
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.xml
@@ -0,0 +1,648 @@
+
+
+
+  
+  21a36442-0158-1000-dec0-d25353fe677c
+  ProcessGroupsAndRemoteProcessGroups
+  
+
+  2077bf8f-0158-1000--
+  21a36442-0158-1000--
+  1 GB
+  1
+  
+21a36442-0158-1000--
+2077ab1e-0158-1000--
+PROCESSOR
+  
+  0 sec
+  1
+  
+  success
+  
+21a36442-0158-1000--
+207748d1-0158-1000--
+PROCESSOR
+  
+  0
+
+
+  2079cf6f-0158-1000--
+  21a36442-0158-1000--
+  1 GB
+  1
+  
+207888b1-0158-1000--
+2078c936-0158-1000--
+INPUT_PORT
+  
+  0 sec
+  1
+  
+  success
+  
+21a36442-0158-1000--
+2077ab1e-0158-1000--
+PROCESSOR
+  
+  0
+
+
+  2079faa0-0158-1000--
+  21a36442-0158-1000--
+  1 GB
+  1
+  
+21a36442-0158-1000--
+2079e8bd-0158-1000--
+PROCESSOR
+  
+  0 sec
+  1
+  
+  
+207888b1-0158-1000--
+2079b327-0158-1000--
+OUTPUT_PORT
+  
+  0
+
+
+  207888b1-0158-1000--
+  21a36442-0158-1000--
+  
+0.0
+447.0719299316406
+  
+  
+  
+
+  20792ec2-0158-1000--
+  207888b1-0158-1000--
+  1 GB
+  1
+  
+207888b1-0158-1000--
+2078f34e-0158-1000--
+PROCESSOR
+  
+  0 sec
+  1
+  
+  
+207888b1-0158-1000--
+2078c936-0158-1000--
+INPUT_PORT
+  
+  0
+
+
+  207b0eb1-0158-1000--
+  207888b1-0158-1000--
+  1 GB
+  1
+  
+20794cd4-0158-1000--
+207a5f50-0158-1000--
+INPUT_PORT
+  
+  0 sec
+  1
+  
+  success
+  
+207888b1-0158-1000--
+2078f34e-0158-1000--
+PROCESSOR
+  
+  0
+
+
+  207b1880-0158-1000--
+  207888b1-0158-1000--
+  1 GB
+  1
+  
+207888b1-0158-1000--
+2079b327-0158-1000--
+OUTPUT_PORT
+  
+  0 sec
+  1
+  
+  
+20794cd4-0158-1000--
+207a6d92-0158-1000--
+OUTPUT_PORT
+  
+  0
+
+
+  21a5b1f1-0158-1000--
+  207888b1-0158-1000--
+  1 GB
+  1
+  
+21a4e2f0-0158-1000--
+21a2fb5e-0158-1000-3b5e-5a7d3aaee01b
+REMOTE_INPUT_PORT
+  
+  0 sec
+  1
+  
+  success
+  
+207888b1-0158-1000--
+2078f34e-0158-1000--
+PROCESSOR
+  
+  0
+
+
+  2078c936-0158-1000--
+  207888b1-0158-1000--
+  
+433.001775595
+46.9825784364
+  
+  
1
+  input
+  STOPPED
+  INPUT_PORT
+
+
+  2079b327-0158-1000--
+  207888b1-0158-1000--
+  
+445.68731178433825
+666.1011812611806
+  
+  
1
+  output
+  STOPPED
+  OUTPUT_PORT
+
+
+  20794cd4-0158-1000--
+  207888b1-0158-1000--
+  
+