nifi git commit: NIFI-1709 - Introduce logic to probe Linux version using /etc/os-release to nifi.sh

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 39ad7a369 -> 4d78052dd


NIFI-1709 - Introduce logic to probe Linux version using /etc/os-release to 
nifi.sh

Add explicit paths to support SLES 11 SP4 / OpenSUSE init.d layout

This closes #1794


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

Branch: refs/heads/master
Commit: 4d78052dd4f19372161391e93cde688f2fa8b864
Parents: 39ad7a3
Author: Andre F de Miranda 
Authored: Sun May 14 22:14:33 2017 +1000
Committer: Andre F de Miranda 
Committed: Sat Jun 3 08:12:52 2017 +1000

--
 .../src/main/resources/bin/nifi.sh  | 29 
 1 file changed, 24 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/4d78052d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
index dd6e568..35fdfa1 100755
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
@@ -81,6 +81,12 @@ detectOS() {
  export LDR_CNTRL=MAXDATA=0xB000@DSA
  echo ${LDR_CNTRL}
 fi
+# In addition to those, go around the linux space and query the widely
+# adopted /etc/os-release to detect linux variants
+if [ -f /etc/os-release ]
+then
+source /etc/os-release
+fi
 }
 
 unlimitFD() {
@@ -174,6 +180,8 @@ install() {
 SVC_NAME=$2
 fi
 
+# since systemd seems to honour /etc/init.d we don't still create native 
systemd services
+# yet...
 initd_dir='/etc/init.d'
 SVC_FILE="${initd_dir}/${SVC_NAME}"
 
@@ -222,11 +230,22 @@ SERVICEDESCRIPTOR
 # Provide the user execute access on the file
 chmod u+x ${SVC_FILE}
 
-rm -f "/etc/rc2.d/S65${SVC_NAME}"
-ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc2.d/S65${SVC_NAME}" || { echo 
"Could not create link /etc/rc2.d/S65${SVC_NAME}"; exit 1; }
-rm -f "/etc/rc2.d/K65${SVC_NAME}"
-ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc2.d/K65${SVC_NAME}" || { echo 
"Could not create link /etc/rc2.d/K65${SVC_NAME}"; exit 1; }
-echo "Service ${SVC_NAME} installed"
+
+# If SLES or OpenSuse...
+if [ "${ID}" = "opensuse" ] || [ "${ID}" = "sles" ]; then
+rm -f "/etc/rc.d/rc2.d/S65${SVC_NAME}"
+ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc.d/rc2.d/S65${SVC_NAME}" || { 
echo "Could not create link /etc/rc.d/rc2.d/S65${SVC_NAME}"; exit 1; }
+rm -f "/etc/rc.d/rc2.d/K65${SVC_NAME}"
+ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc.d/rc2.d/K65${SVC_NAME}" || { 
echo "Could not create link /etc/rc.d/rc2.d/K65${SVC_NAME}"; exit 1; }
+echo "Service ${SVC_NAME} installed"
+# Anything other fallback to the old approach
+else
+rm -f "/etc/rc2.d/S65${SVC_NAME}"
+ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc2.d/S65${SVC_NAME}" || { echo 
"Could not create link /etc/rc2.d/S65${SVC_NAME}"; exit 1; }
+rm -f "/etc/rc2.d/K65${SVC_NAME}"
+ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc2.d/K65${SVC_NAME}" || { echo 
"Could not create link /etc/rc2.d/K65${SVC_NAME}"; exit 1; }
+echo "Service ${SVC_NAME} installed"
+fi
 }
 
 run() {

nifi git commit: ExtractGrok - Include exception message when compile fails

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 3966f5ce8 -> 80dfe0257


ExtractGrok - Include exception message when compile fails

This closes: #1845

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 80dfe0257ffbafe45e6d49433405f5be1214401e
Parents: 3966f5c
Author: Pierre Villard 
Authored: Tue May 23 20:27:22 2017 +0200
Committer: Andre F de Miranda 
Committed: Sat May 27 00:56:25 2017 +1000

--
 .../org/apache/nifi/processors/standard/ExtractGrok.java | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/80dfe025/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
index 2790dc9..6b56638 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
@@ -255,19 +255,12 @@ public class ExtractGrok extends AbstractProcessor {
 Grok grok = new Grok();
 try {
 grok.compile(input);
-} catch (GrokException e) {
+} catch (GrokException | 
java.util.regex.PatternSyntaxException e) {
 return new ValidationResult.Builder()
 .subject(subject)
 .input(input)
 .valid(false)
-.explanation("Not a valid Grok Expression")
-.build();
-} catch (java.util.regex.PatternSyntaxException e) {
-return new ValidationResult.Builder()
-.subject(subject)
-.input(input)
-.valid(false)
-.explanation("Not a valid Grok Expression")
+.explanation("Not a valid Grok Expression - " + 
e.getMessage())
 .build();
 }
 

nifi git commit: This closes #420 (superseded)

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master e717fb3f7 -> 0af799a63


This closes #420 (superseded)


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

Branch: refs/heads/master
Commit: 0af799a633c2b9d88335a2ad97f8a7b7e8227d2e
Parents: e717fb3
Author: Andre F de Miranda 
Authored: Sun May 14 22:34:51 2017 +1000
Committer: Andre F de Miranda 
Committed: Sun May 14 22:34:51 2017 +1000

--

--

nifi git commit: NIFI-3771 Move HL7 test docs into class members to avoid git rewriting CRs

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 09f6a7040 -> e717fb3f7


NIFI-3771 Move HL7 test docs into class members to avoid git rewriting CRs

This closes: #1731

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: e717fb3f79a77ff591ae5aa1cbaafd8797b95ddc
Parents: 09f6a70
Author: Joey Frazee 
Authored: Tue May 2 10:48:10 2017 -0500
Committer: Andre F de Miranda 
Committed: Sun May 14 22:29:37 2017 +1000

--
 nifi-commons/nifi-hl7-query-language/pom.xml|  14 +--
 .../org/apache/nifi/hl7/query/TestHL7Query.java | 100 +++
 .../src/test/resources/hyperglycemia|   5 -
 .../src/test/resources/hypoglycemia |   5 -
 4 files changed, 62 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/e717fb3f/nifi-commons/nifi-hl7-query-language/pom.xml
--
diff --git a/nifi-commons/nifi-hl7-query-language/pom.xml 
b/nifi-commons/nifi-hl7-query-language/pom.xml
index 90b1ead..0b4a981 100644
--- a/nifi-commons/nifi-hl7-query-language/pom.xml
+++ b/nifi-commons/nifi-hl7-query-language/pom.xml
@@ -45,22 +45,12 @@
 
 
 
-org.apache.rat
-apache-rat-plugin
-
-
-src/test/resources/hypoglycemia
-src/test/resources/hyperglycemia
-
-
-
-
 org.apache.maven.plugins
 maven-checkstyle-plugin
 
 
**/HL7QueryParser.java,**/HL7QueryLexer.java
 
-
+
 
 
 
@@ -69,7 +59,7 @@
 org.antlr
 antlr-runtime
 
-   
+
 
 
 ca.uhn.hapi

http://git-wip-us.apache.org/repos/asf/nifi/blob/e717fb3f/nifi-commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java
--
diff --git 
a/nifi-commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java
 
b/nifi-commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java
index d1f0e47..0e875c0 100644
--- 
a/nifi-commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java
+++ 
b/nifi-commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java
@@ -20,9 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -31,6 +29,7 @@ import java.util.Map;
 import org.apache.nifi.hl7.hapi.HapiMessage;
 import org.apache.nifi.hl7.model.HL7Field;
 import org.apache.nifi.hl7.model.HL7Message;
+import org.junit.Before;
 import org.junit.Test;
 
 import ca.uhn.hl7v2.DefaultHapiContext;
@@ -43,6 +42,30 @@ import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
 @SuppressWarnings("resource")
 public class TestHL7Query {
 
+public static final String HYPERGLYCEMIA =
+
"MSH|^~\\&|XX||HealthOrg01ORU^R01|Q111|P|2.3|\r\n" +
+
"PID|||1||SMITH^JOHN||19700101|M|||123456789|\r\n" +
+"PD11234567890^LAST^FIRST^M^NPI|\r\n" +
+"OBR|1|341856649^HNAM_ORDERID|00|648088^Basic 
Metabolic 
Panel|||20150101000100|1620^Johnson^John^R||20150101000100|||M|||20150101000100|\r\n"
 +
+"OBX|1|NM|GLU^Glucose 
Lvl|159|mg/dL|65-99^65^99|H|||F|||20150101000100|";
+
+public static final String HYPOGLYCEMIA =
+
"MSH|^~\\&|XX||HealthOrg01ORU^R01|Q111|P|2.3|\r\n" +
+
"PID|||1||SMITH^JOHN||19700101|M|||123456789|\r\n" +
+"PD11234567890^LAST^FIRST^M^NPI|\r\n" +
+"OBR|1|341856649^HNAM_ORDERID|00|648088^Basic 
Metabolic 
Panel|||20150101000100|1620^Johnson^John^R||20150101000100|||M|||20150101000100|\r\n"
 +
+"OBX|1|NM|GLU^Glucose 
Lvl|59|mg/dL|65-99^65^99|L|||F|||20150101000100|";
+
+private HL7Message hyperglycemia;
+
+private HL7Message hypoglycemia;
+
+@Before
+public void init() throws IOException, HL7Exception {
+this.hyperglycemia = createMessag

nifi git commit: NIFI-3802 Add link to ASF HipChat NiFi room in README.

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master cf497c9cf -> 0f693e944


NIFI-3802 Add link to ASF HipChat NiFi room in README.

This closes: #1767

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 0f693e94480c4090a66bf3044fe79dae65338a71
Parents: cf497c9
Author: Aldrin Piri 
Authored: Mon May 8 11:09:54 2017 -0400
Committer: Andre F de Miranda 
Committed: Thu May 11 09:04:04 2017 +1000

--
 README.md | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/0f693e94/README.md
--
diff --git a/README.md b/README.md
index bfbf6a4..7ecd080 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 
 #  [![Build 
Status](https://travis-ci.org/apache/nifi.svg?branch=master)](https://travis-ci.org/apache/nifi)
 
-[Apache NiFi](https://nifi.apache.org/) is an easy to use, powerful, and 
+[Apache NiFi](https://nifi.apache.org/) is an easy to use, powerful, and
 reliable system to process and distribute data.
 
 ## Table of Contents
@@ -123,8 +123,8 @@ To run NiFi:
 ## Getting Help
 If you have questions, you can reach out to our mailing list: 
d...@nifi.apache.org
 ([archive](http://mail-archives.apache.org/mod_mbox/nifi-dev)).
-We're also often available in IRC: #nifi on
-[irc.freenode.net](http://webchat.freenode.net/?channels=#nifi).
+For more interactive conversations and chat, we're also often available in 
IRC: #nifi on
+[irc.freenode.net](http://webchat.freenode.net/?channels=#nifi) and in #NiFi 
on [ASF HipChat](https://www.hipchat.com/gzh2m5YML). 
 
 ## Documentation
 
@@ -149,28 +149,28 @@ limitations under the License.
 
 ## Export Control
 
-This distribution includes cryptographic software. The country in which you 
+This distribution includes cryptographic software. The country in which you
 currently reside may have restrictions on the import, possession, use, and/or
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check your country's laws, regulations and 
+re-export to another country, of encryption software. BEFORE using any
+encryption software, please check your country's laws, regulations and
 policies concerning the import, possession, or use, and re-export of encryption
 software, to see if this is permitted. See  for more
 information.
 
-The U.S. Government Department of Commerce, Bureau of Industry and Security 
-(BIS), has classified this software as Export Commodity Control Number (ECCN) 
-5D002.C.1, which includes information security software using or performing 
+The U.S. Government Department of Commerce, Bureau of Industry and Security
+(BIS), has classified this software as Export Commodity Control Number (ECCN)
+5D002.C.1, which includes information security software using or performing
 cryptographic functions with asymmetric algorithms. The form and manner of this
-Apache Software Foundation distribution makes it eligible for export under the 
+Apache Software Foundation distribution makes it eligible for export under the
 License Exception ENC Technology Software Unrestricted (TSU) exception (see the
 BIS Export Administration Regulations, Section 740.13) for both object code and
 source code.
 
-The following provides more details on the included cryptographic software: 
+The following provides more details on the included cryptographic software:
 
-Apache NiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in 
+Apache NiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in
 java cryptography libraries for SSL, SSH, and the protection
-of sensitive configuration parameters. See 
+of sensitive configuration parameters. See
 http://bouncycastle.org/about.html
 http://www.jasypt.org/faq.html
 http://jcraft.com/c-info.html
@@ -178,4 +178,4 @@ 
http://www.oracle.com/us/products/export/export-regulations-345813.html
 for more details on each of these libraries cryptography features.
 
 [nifi]: https://nifi.apache.org/
-[logo]: https://nifi.apache.org/assets/images/apache-nifi-logo.svg
\ No newline at end of file
+[logo]: https://nifi.apache.org/assets/images/apache-nifi-logo.svg

nifi-site git commit: NIFI-3802 Convert mailing lists to mailing list and chat.

[afucs]

Repository: nifi-site
Updated Branches:
  refs/heads/master d2422dc14 -> b01c529f7


NIFI-3802 Convert mailing lists to mailing list and chat.

Provide details on IRC and ASF HipChat

This closes: #18

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: b01c529f71e84ba00c62b1ba4dcc792c1da5180b
Parents: d2422dc
Author: Aldrin Piri 
Authored: Mon May 8 11:25:07 2017 -0400
Committer: Andre F de Miranda 
Committed: Thu May 11 08:59:43 2017 +1000

--
 src/includes/minifi/minifi-topbar.hbs |  2 +-
 src/includes/topbar.hbs   |  2 +-
 src/pages/html/mailing_lists.hbs  | 26 +-
 3 files changed, 27 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/b01c529f/src/includes/minifi/minifi-topbar.hbs
--
diff --git a/src/includes/minifi/minifi-topbar.hbs 
b/src/includes/minifi/minifi-topbar.hbs
index 7dcc98b..3e4bd1a 100644
--- a/src/includes/minifi/minifi-topbar.hbs
+++ b/src/includes/minifi/minifi-topbar.hbs
@@ -44,7 +44,7 @@
 Community
 
 https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide";>Contributor Guide
-Mailing 
Lists
+Mailing Lists 
& Chat
 People
 
 

http://git-wip-us.apache.org/repos/asf/nifi-site/blob/b01c529f/src/includes/topbar.hbs
--
diff --git a/src/includes/topbar.hbs b/src/includes/topbar.hbs
index 016d781..724b5ed 100644
--- a/src/includes/topbar.hbs
+++ b/src/includes/topbar.hbs
@@ -44,7 +44,7 @@
 Community
 
 https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide";>Contributor Guide
-Mailing Lists
+Mailing Lists & 
Chat
 People
 Powered by 
NiFi
 

http://git-wip-us.apache.org/repos/asf/nifi-site/blob/b01c529f/src/pages/html/mailing_lists.hbs
--
diff --git a/src/pages/html/mailing_lists.hbs b/src/pages/html/mailing_lists.hbs
index b558bd6..64180b2 100644
--- a/src/pages/html/mailing_lists.hbs
+++ b/src/pages/html/mailing_lists.hbs
@@ -1,5 +1,5 @@
 ---
-title: Apache NiFi Mailing Lists
+title: Apache NiFi Mailing Lists & Chat
 ---
 
 
@@ -104,3 +104,27 @@ title: Apache NiFi Mailing Lists
 
 
 
+
+
+
+
+Apache nifi 
Chat
+
+
+
+
+
+
+
+For more interactive discussions, community members can often be 
found in the following locations:
+
+
+
+IRC:  #nifi on http://webchat.freenode.net/?channels=#nifi";>irc.freenode.net
+
+
+Apache Software Foundation HipChat: https://www.hipchat.com/gzh2m5YML";>#nifi
+
+
+
+

nifi git commit: This closes #584 (stalled) This closes #399 (superseded)

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 016ae3191 -> be9e31700


This closes #584 (stalled)
This closes #399 (superseded)


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

Branch: refs/heads/master
Commit: be9e317000fadc9746f89fd12a0a45a418091f12
Parents: 016ae31
Author: Andre F de Miranda 
Authored: Tue May 2 18:48:48 2017 +1000
Committer: Andre F de Miranda 
Committed: Tue May 2 18:48:48 2017 +1000

--

--

nifi git commit: NIFI-2616 - Remove 2 unused classes in IdentifyMimeType identified during PR

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 25295cdb4 -> a9a9b6743


NIFI-2616 - Remove 2 unused classes in IdentifyMimeType identified during PR


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

Branch: refs/heads/master
Commit: a9a9b67430b33944b5eefa17cb85b5dd42c8d1fc
Parents: 25295cd
Author: Andre F de Miranda 
Authored: Tue May 2 00:25:05 2017 +1000
Committer: Andre F de Miranda 
Committed: Tue May 2 00:25:42 2017 +1000

--
 .../org/apache/nifi/processors/standard/IdentifyMimeType.java | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a9a9b674/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
index 5965cfd..8c2bdf9 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java
@@ -52,8 +52,8 @@ import org.apache.tika.mime.MimeTypeException;
 
 /**
  * 
- * Attempts to detect the MIME Type of a FlowFile by examining its contents. 
If the MIME Type is determined, it is added to an attribute with the name 
mime.type. In addition, mime.extension is set if
- * a common file extension is known.
+ * Attempts to detect the MIME Type of a FlowFile by examining its contents. 
If the MIME Type is determined, it is added
+ * to an attribute with the name mime.type. In addition, mime.extension is set 
if a common file extension is known.
  * 
  *
  * 
@@ -83,9 +83,6 @@ public class IdentifyMimeType extends AbstractProcessor {
 .description("All FlowFiles are routed to success")
 .build();
 
-public static final MediaType FLOWFILE_V1 = new MediaType("application", 
"flowfile-v1");
-public static final MediaType FLOWFILE_V3 = new MediaType("application", 
"flowfile-v3");
-
 private Set relationships;
 
 private final TikaConfig config;

nifi git commit: NIFI-2616 Remove reference to non-existent setting in IdentifyMimeType Additional Details

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 9ad780228 -> 25295cdb4


NIFI-2616 Remove reference to non-existent setting in IdentifyMimeType 
Additional Details

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 25295cdb4d4653303e9b3ba7bd2c518b8d81295c
Parents: 9ad7802
Author: Jon Anderson III 
Authored: Tue May 2 00:15:48 2017 +1000
Committer: Andre F de Miranda 
Committed: Tue May 2 00:20:04 2017 +1000

--
 .../additionalDetails.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/25295cdb/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
index 20cf84f..48497cb 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
@@ -28,7 +28,7 @@
 application/gzip
 application/bzip2
 application/flowfile-v3
-application/flowfile-v1 (requires Identify TAR be set to 
true)
+application/flowfile-v1
 application/xml
 video/mp4
 video/x-m4v

nifi git commit: NIFI-3607 Allow multi files mode with fixed names

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 0054a9e35 -> 7df5c2dc8


NIFI-3607 Allow multi files mode with fixed names

This closes: #1608

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 7df5c2dc891a57f382075d868244f843de6fd960
Parents: 0054a9e
Author: Pierre Villard 
Authored: Mon Mar 20 15:28:27 2017 +0100
Committer: Andre F de Miranda 
Committed: Mon May 1 09:31:24 2017 +1000

--
 .../nifi/util/StandardProcessorTestRunner.java  | 18 +--
 .../java/org/apache/nifi/util/TestRunner.java   |  8 
 .../nifi/processors/standard/TailFile.java  |  8 ++--
 .../nifi/processors/standard/TestTailFile.java  | 50 +++-
 4 files changed, 75 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7df5c2dc/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
--
diff --git 
a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java 
b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
index 6c35643..6fe5195 100644
--- 
a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
+++ 
b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
@@ -36,9 +36,9 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
@@ -87,6 +87,7 @@ public class StandardProcessorTestRunner implements 
TestRunner {
 
 private int numThreads = 1;
 private MockSessionFactory sessionFactory;
+private long runSchedule = 0;
 private final AtomicInteger invocations = new AtomicInteger(0);
 
 private final Map controllerServiceLoggers = new 
HashMap<>();
@@ -177,11 +178,11 @@ public class StandardProcessorTestRunner implements 
TestRunner {
 }
 }
 
-final ExecutorService executorService = 
Executors.newFixedThreadPool(numThreads);
+final ScheduledExecutorService executorService = 
Executors.newScheduledThreadPool(numThreads);
 @SuppressWarnings("unchecked")
 final Future[] futures = new Future[iterations];
 for (int i = 0; i < iterations; i++) {
-final Future future = executorService.submit(new 
RunProcessor());
+final Future future = executorService.schedule(new 
RunProcessor(), i * runSchedule, TimeUnit.MILLISECONDS);
 futures[i] = future;
 }
 
@@ -907,4 +908,15 @@ public class StandardProcessorTestRunner implements 
TestRunner {
 }
 }
 }
+
+/**
+ * Set the Run Schedule parameter (in milliseconds). If set, this will be 
the duration
+ * between two calls of the onTrigger method.
+ *
+ * @param runSchedule Run schedule duration in milliseconds.
+ */
+@Override
+public void setRunSchedule(long runSchedule) {
+this.runSchedule = runSchedule;
+}
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/7df5c2dc/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
--
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java 
b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
index 9a1a10d..85ef72c 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
@@ -965,4 +965,12 @@ public interface TestRunner {
  */
 void enforceReadStreamsClosed(boolean enforce);
 
+/**
+ * Set the Run Schedule parameter (in milliseconds). If set, this will be 
the duration
+ * between two calls of the onTrigger method.
+ *
+ * @param runSchedule Run schedule duration in milliseconds.
+ */
+ void setRunSchedule(long runSchedule);
+
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/7df5c2dc/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/Tail

nifi git commit: NIFI-3561: Fix WS port forwarding

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 776a00b0b -> 7c19796eb


NIFI-3561: Fix WS port forwarding

Fixed service instance lookup to use local port so that it works when
it is accessed through port forwarding.

This fixes: #1568

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 7c19796eb22ced9aba703e52e76e58450e34d018
Parents: 776a00b
Author: Koji Kawamura 
Authored: Tue Mar 7 17:08:47 2017 +0900
Committer: Andre F de Miranda 
Committed: Tue Apr 11 21:27:53 2017 +1000

--
 .../java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7c19796e/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java
--
diff --git 
a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java
 
b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java
index 267e7d1..71e60a9 100644
--- 
a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java
+++ 
b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java
@@ -127,7 +127,7 @@ public class JettyWebSocketServer extends 
AbstractJettyWebSocketService implemen
 @Override
 public Object createWebSocket(ServletUpgradeRequest 
servletUpgradeRequest, ServletUpgradeResponse servletUpgradeResponse) {
 final URI requestURI = servletUpgradeRequest.getRequestURI();
-final int port = requestURI.getPort();
+final int port = servletUpgradeRequest.getLocalPort();
 final JettyWebSocketServer service = 
portToControllerService.get(port);
 
 if (service == null) {

nifi git commit: NIFI-2860 Use different properties for JVM Heap Max and Min values

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 5419891fe -> 776a00b0b


NIFI-2860 Use different properties for JVM Heap Max and Min values

This closes: #1382

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 776a00b0be4cc9160e0596b714ff7613cc248e14
Parents: 5419891
Author: Pierre Villard 
Authored: Tue Jan 3 15:35:00 2017 +0100
Committer: Andre F de Miranda 
Committed: Tue Apr 11 21:18:49 2017 +1000

--
 .../nifi-framework/nifi-resources/pom.xml  | 4 ++--
 .../nifi-resources/src/main/resources/conf/bootstrap.conf  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/776a00b0/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
index b8d3ad9..d6b1aaf 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
@@ -25,8 +25,8 @@
 holds common resources used to build installers
 
 
-512
-128
+512m
+512m
 
 
 
true

http://git-wip-us.apache.org/repos/asf/nifi/blob/776a00b0/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
index 09126b2..e936780 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
@@ -32,8 +32,8 @@ graceful.shutdown.seconds=20
 java.arg.1=-Dorg.apache.jasper.compiler.disablejsr199=true
 
 # JVM memory settings
-java.arg.2=-Xms${nifi.jvm.heap.mb}m
-java.arg.3=-Xmx${nifi.jvm.heap.mb}m
+java.arg.2=-Xms${nifi.jvm.heap.init}
+java.arg.3=-Xmx${nifi.jvm.heap.max}
 
 # Enable Remote Debugging
 
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
@@ -74,4 +74,4 @@ notification.max.attempts=5
 #nifi.stop.notification.services=email-notification
 
 # Comma-separated list of identifiers that are present in the 
notification.services.file; which services should be used to notify when NiFi 
dies?
-#nifi.dead.notification.services=email-notification
\ No newline at end of file
+#nifi.dead.notification.services=email-notification

nifi git commit: Blank commit to close stalled github PRs

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 2589df80a -> c614a7443


Blank commit to close stalled github PRs

This closes #254
This closes #293
This closes #626
This closes #969


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

Branch: refs/heads/master
Commit: c614a744377d2f26883d79aaf06862e832e99755
Parents: 2589df8
Author: Andre F de Miranda 
Authored: Tue Apr 11 02:08:14 2017 +1000
Committer: Andre F de Miranda 
Committed: Tue Apr 11 02:08:14 2017 +1000

--

--

nifi git commit: NIFI-3304 removed unneeded Java 8 codecache info from Admin Guide

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 02d38b55b -> 2589df80a


NIFI-3304 removed unneeded Java 8 codecache info from Admin Guide

This closes #1621

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 2589df80ab1eb70327c6ed836f269967caee35fe
Parents: 02d38b5
Author: Mike Moser 
Authored: Fri Mar 24 21:44:07 2017 +
Committer: Andre F de Miranda 
Committed: Tue Apr 11 02:05:20 2017 +1000

--
 nifi-docs/src/main/asciidoc/administration-guide.adoc | 11 ---
 1 file changed, 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/2589df80/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 d3abd3a..2de8387 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -1777,17 +1777,6 @@ take effect only after NiFi has been stopped and 
restarted.
  configured recipients if the bootstrap 
determines that NiFi has unexpectedly died.
 |
 
-*Java 8 handling of codecache*
-It has been observed in Java 8 runtime environments that performance can 
suddenly drop by more than an order of magnitude after days or weeks of 
otherwise ideal
-behavior.  This has only been observed under extremely high load and in cases 
where considerable Just in Time (JIT) compilation occurs.  The core problem is 
the CodeCache becomes
-full and is seemingly not properly garbage collected or grown.  When this 
occurs JIT seems to no longer occur or involve considerable delays and 
performance drops.
-This is easily overcome by ensuring the following lines are available in the 
_boostrap.conf_.  By default they are there but commented.  Uncomment them for 
maximum sustained throughput.
-
-#java.arg.7=-XX:ReservedCodeCacheSize=256m
-#java.arg.8=-XX:CodeCacheFlushingMinimumFreeSpace=10m
-#java.arg.9=-XX:+UseCodeCacheFlushing
-
-
 [[notification_services]]
 Notification Services
 -

nifi git commit: NIFI-2952 Fixed search value validation in ReplaceText

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 61c799d88 -> 02d38b55b


NIFI-2952 Fixed search value validation in ReplaceText

This closes: #1378

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 02d38b55bf43e8becf62029c994eba4535cae8f8
Parents: 61c799d
Author: Pierre Villard 
Authored: Fri Dec 30 17:45:14 2016 +0100
Committer: Andre F de Miranda 
Committed: Tue Apr 11 00:00:07 2017 +1000

--
 .../nifi/processors/standard/ReplaceText.java   | 31 +++-
 .../processors/standard/TestReplaceText.java| 28 ++
 2 files changed, 58 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/02d38b55/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
index 59721f0..ffd7a03 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
@@ -24,6 +24,7 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -44,6 +45,8 @@ import 
org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.Tags;
 import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
 import org.apache.nifi.components.Validator;
 import org.apache.nifi.expression.AttributeValueDecorator;
 import org.apache.nifi.flowfile.FlowFile;
@@ -110,7 +113,7 @@ public class ReplaceText extends AbstractProcessor {
 .displayName("Search Value")
 .description("The Search Value to search for in the FlowFile content. 
Only used for 'Literal Replace' and 'Regex Replace' matching strategies")
 .required(true)
-.addValidator(StandardValidators.createRegexValidator(0, 
Integer.MAX_VALUE, true))
+.addValidator(Validator.VALID)
 .expressionLanguageSupported(true)
 .defaultValue(DEFAULT_REGEX)
 .build();
@@ -202,6 +205,32 @@ public class ReplaceText extends AbstractProcessor {
 }
 
 @Override
+protected Collection customValidate(ValidationContext 
validationContext) {
+final List errors = new 
ArrayList<>(super.customValidate(validationContext));
+
+switch 
(validationContext.getProperty(REPLACEMENT_STRATEGY).getValue()) {
+case literalReplaceValue:
+errors.add(StandardValidators.NON_EMPTY_VALIDATOR
+.validate(SEARCH_VALUE.getName(), 
validationContext.getProperty(SEARCH_VALUE).getValue(), validationContext));
+break;
+
+case regexReplaceValue:
+errors.add(StandardValidators.createRegexValidator(0, 
Integer.MAX_VALUE, true)
+.validate(SEARCH_VALUE.getName(), 
validationContext.getProperty(SEARCH_VALUE).getValue(), validationContext));
+break;
+
+case appendValue:
+case prependValue:
+case alwaysReplace:
+default:
+// nothing to check, search value is not used
+break;
+}
+
+return errors;
+}
+
+@Override
 public void onTrigger(final ProcessContext context, final ProcessSession 
session) throws ProcessException {
 final List flowFiles = 
session.get(FlowFileFilters.newSizeBasedFilter(1, DataUnit.MB, 100));
 if (flowFiles.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/nifi/blob/02d38b55/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.

nifi git commit: NIFI-2481 improved content repo archive description in Admin Guide

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master a298f1a70 -> 2dd61125d


NIFI-2481 improved content repo archive description in Admin Guide

This closes: #1603

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 2dd61125d13dd04798663cc8f1ef06436cf7bb16
Parents: a298f1a
Author: Mike Moser 
Authored: Fri Mar 17 20:53:52 2017 +
Committer: Andre F de Miranda 
Committed: Fri Mar 24 22:49:01 2017 +1100

--
 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/2dd61125/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 fff0bdd..ca8f6a0 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -2053,8 +2053,8 @@ 
nifi.content.repository.directory.content2=/repos/content2 +
 Providing three total locations, including  
_nifi.content.repository.directory.default_.
 |nifi.content.repository.archive.max.retention.period|If archiving is enabled 
(see nifi.content.repository.archive.enabled below), then
 this property specifies the maximum amount of time to keep the archived data. 
It is 12 hours by default.
-|nifi.content.repository.archive.max.usage.percentage|If archiving is enabled 
(see nifi.content.repository.archive.enabled below), then this property also 
must have a value to indicate the maximum percentage of disk space that may be 
used before archive data is removed. If this value is already met even before 
archiving then arhival will not be of much use. It is 50% by default.
-|nifi.content.repository.archive.enabled|To enable archiving, set this to 
_true_ and specify a value for the 
nifi.content.repository.archive.max.usage.percentage property above. By 
default, archiving is enabled.
+|nifi.content.repository.archive.max.usage.percentage|If archiving is enabled 
(see nifi.content.repository.archive.enabled below), then this property must 
have a value that indicates the content repository disk usage percentage at 
which archived data begins to be removed. If the archive is empty and content 
repository disk usage is above this percentage, then archiving is temporarily 
disabled. Archiving will resume when disk usage is below this percentage. It is 
50% by default.
+|nifi.content.repository.archive.enabled|To enable content archiving, set this 
to _true_ and specify a value for the 
nifi.content.repository.archive.max.usage.percentage property above. Content 
archiving enables the provenance UI to view or replay content that is no longer 
in a dataflow queue. By default, archiving is enabled.
 |nifi.content.repository.always.sync|If set to _true_, any change to the 
repository will be synchronized to the disk, meaning that NiFi will ask the 
operating system not to cache the information. This is very expensive and can 
significantly reduce NiFi performance. However, if it is _false_, there could 
be the potential for data loss if either there is a sudden power loss or the 
operating system crashes. The default value is _false_.
 |nifi.content.viewer.url|The URL for a web-based content viewer if one is 
available. It is blank by default.
 |

nifi git commit: NIFI-3554 - Fixing the jBCrypt dependency name from nifi-standard-processors/pom.xml file, so it uses the expected naming format from the maven repository

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/0.x 9a5487cde -> 32a93be54


NIFI-3554 - Fixing the jBCrypt dependency name from
 nifi-standard-processors/pom.xml file, so it uses the expected naming format
 from the maven repository

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/0.x
Commit: 32a93be546fd026db54b0cfc188e6971a40b70a4
Parents: 9a5487c
Author: Pere Urbon-Bayes 
Authored: Sun Mar 5 10:48:15 2017 +1100
Committer: Andre F de Miranda 
Committed: Sun Mar 5 10:49:46 2017 +1100

--
 .../nifi-standard-bundle/nifi-standard-processors/pom.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/32a93be5/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 9a3d200..cf36974 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
@@ -186,7 +186,7 @@ language governing permissions and limitations under the 
License. -->
 
 
 de.svenkubiak
-jBcrypt
+jBCrypt
 0.4.1
 
 

nifi git commit: NIFI-3554 Fixing the jBCrypt dependency name from nifi-standard-processors/pom.xml file, so it uses the expected naming format from the maven repository

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master f8cad0f8c -> 33a702500


NIFI-3554 Fixing the jBCrypt dependency name from 
nifi-standard-processors/pom.xml file, so it uses the expected naming format 
from the maven repository

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 33a702500c30e585bf5b59e6a25b99daa9b492df
Parents: f8cad0f
Author: Pere Urbon-Bayes 
Authored: Sat Mar 4 08:01:18 2017 +0100
Committer: Andre F de Miranda 
Committed: Sun Mar 5 10:15:06 2017 +1100

--
 .../nifi-standard-bundle/nifi-standard-processors/pom.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/33a70250/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 5fd9ae2..95d2445 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
@@ -186,7 +186,7 @@ language governing permissions and limitations under the 
License. -->
 
 
 de.svenkubiak
-jBcrypt
+jBCrypt
 0.4.1
 
 

nifi git commit: NIFI-1797 - CreateHadoopSequenceFile processor (including Pierre's forced push)

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master dcdfd3dad -> 0d66b6dcd


NIFI-1797 - CreateHadoopSequenceFile processor (including Pierre's forced push)

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 0d66b6dcdafdc07c3ef517f55d8ebaa4ea5d67bd
Parents: dcdfd3d
Author: Pierre Villard 
Authored: Tue Jan 3 20:47:56 2017 +0100
Committer: Andre F de Miranda 
Committed: Thu Mar 2 22:52:10 2017 +1100

--
 .../apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/0d66b6dc/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
--
diff --git 
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
 
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
index 20da921..dc7af65 100644
--- 
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
+++ 
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
@@ -92,7 +92,8 @@ public class CreateHadoopSequenceFile extends 
AbstractHadoopProcessor {
 }
 // Optional Properties.
 static final PropertyDescriptor COMPRESSION_TYPE = new 
PropertyDescriptor.Builder()
-.name("Compression type")
+.displayName("Compression type")
+.name("compression type")
 .description("Type of compression to use when creating Sequence 
File")
 .allowableValues(SequenceFile.CompressionType.values())
 .build();

nifi git commit: NIFI-1797 - Added compression codec property to CreateHadoopSequenceFile processor

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master a32e1509b -> dcdfd3dad


NIFI-1797 - Added compression codec property to CreateHadoopSequenceFile 
processor

This closes: #1387

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: dcdfd3dad9f02ec8d85a3e1da2f82c30e20b6dae
Parents: a32e150
Author: Pierre Villard 
Authored: Tue Jan 3 20:47:56 2017 +0100
Committer: Andre F de Miranda 
Committed: Thu Mar 2 22:19:34 2017 +1100

--
 .../hadoop/CreateHadoopSequenceFile.java|  28 +++-
 .../hadoop/SequenceFileWriterImpl.java  |   8 +-
 .../hadoop/util/SequenceFileWriter.java |   4 +-
 .../hadoop/TestCreateHadoopSequenceFile.java| 149 ++-
 4 files changed, 176 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/dcdfd3da/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
--
diff --git 
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
 
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
index 7770152..20da921 100644
--- 
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
+++ 
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
@@ -16,7 +16,9 @@
  */
 package org.apache.nifi.processors.hadoop;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.SequenceFile;
+import org.apache.hadoop.io.compress.CompressionCodec;
 import org.apache.nifi.annotation.behavior.InputRequirement;
 import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
 import org.apache.nifi.annotation.behavior.SideEffectFree;
@@ -31,12 +33,14 @@ import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processors.hadoop.util.SequenceFileWriter;
+import org.apache.nifi.util.StopWatch;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 
@@ -88,7 +92,7 @@ public class CreateHadoopSequenceFile extends 
AbstractHadoopProcessor {
 }
 // Optional Properties.
 static final PropertyDescriptor COMPRESSION_TYPE = new 
PropertyDescriptor.Builder()
-.name("compression type")
+.name("Compression type")
 .description("Type of compression to use when creating Sequence 
File")
 .allowableValues(SequenceFile.CompressionType.values())
 .build();
@@ -105,6 +109,7 @@ public class CreateHadoopSequenceFile extends 
AbstractHadoopProcessor {
 public List getSupportedPropertyDescriptors() {
 List someProps = new ArrayList<>(properties);
 someProps.add(COMPRESSION_TYPE);
+someProps.add(COMPRESSION_CODEC);
 return  someProps;
 }
 
@@ -149,13 +154,28 @@ public class CreateHadoopSequenceFile extends 
AbstractHadoopProcessor {
 default:
 sequenceFileWriter = new SequenceFileWriterImpl();
 }
-String value = context.getProperty(COMPRESSION_TYPE).getValue();
-SequenceFile.CompressionType compressionType = value == null
+
+final Configuration configuration = getConfiguration();
+if (configuration == null) {
+getLogger().error("HDFS not configured properly");
+session.transfer(flowFile, RELATIONSHIP_FAILURE);
+context.yield();
+return;
+}
+
+final CompressionCodec codec = getCompressionCodec(context, 
configuration);
+
+final String value = context.getProperty(COMPRESSION_TYPE).getValue();
+final SequenceFile.CompressionType compressionType = value == null
 ? SequenceFile.CompressionType.valueOf(DEFAULT_COMPRESSION_TYPE) : 
SequenceFile.CompressionType.valueOf(value);
+
 final String fileName = 
flowFile.getAttribute(CoreAttributes.FILENAME.key()) + ".sf";
 flowFile = session.putAttribute(flowFile, 
CoreAttributes.FILENAME.key(), fileName);
+
 try {
-flowFile = sequenceFileWriter.writeSequenceFile(flowFile, session, 
getCo

nifi git commit: Close stalled pull requests:

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master f9c4d3ce3 -> 5df6622d2


Close stalled pull requests:

This closes: #349
This closes: #1126
This closes: #1423

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 5df6622d2aad8ba2cbdff53a16dbe15a66fd5c93
Parents: f9c4d3c
Author: Andre F de Miranda 
Authored: Wed Feb 22 00:53:12 2017 +1100
Committer: Andre F de Miranda 
Committed: Wed Feb 22 00:58:13 2017 +1100

--

--

nifi git commit: NIFI-2914 Fixed message error in AbstractMongoProcessor

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 19302263c -> a8b8f1530


NIFI-2914 Fixed message error in AbstractMongoProcessor

This closes: #1380

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: a8b8f1530bad45f8d6372ef4046b87e92f9e9633
Parents: 1930226
Author: Pierre Villard 
Authored: Tue Jan 3 10:17:15 2017 +0100
Committer: Andre F de Miranda 
Committed: Sun Feb 19 21:25:08 2017 +1100

--
 .../org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a8b8f153/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
 
b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
index 7e3a196..486a077 100644
--- 
a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
+++ 
b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
@@ -131,7 +131,7 @@ public abstract class AbstractMongoProcessor extends 
AbstractProcessor {
 mongoClient = new MongoClient(new MongoClientURI(uri, 
getClientOptions(sslContext)));
 }
 } catch (Exception e) {
-getLogger().error("Failed to schedule PutMongo due to {}", new 
Object[] { e }, e);
+getLogger().error("Failed to schedule {} due to {}", new Object[] 
{ this.getClass().getName(), e }, e);
 throw e;
 }
 }

nifi git commit: NIFI-3213: ListFile do not skip obviously old files

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master e4eda188b -> 095c04eda


NIFI-3213: ListFile do not skip obviously old files

Before this fix, files with the latest timestamp within a listing
iteration are always be held back one cycle no matter how old it is.

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 095c04eda0c604a02c51df085ba67847448224c0
Parents: e4eda18
Author: Koji Kawamura 
Authored: Fri Dec 16 17:48:06 2016 +0900
Committer: Andre F de Miranda 
Committed: Sat Feb 18 00:56:46 2017 +1100

--
 .../standard/AbstractListProcessor.java |   4 +-
 .../standard/TestAbstractListProcessor.java |  78 +++---
 .../nifi/processors/standard/TestListFile.java  | 254 ++-
 3 files changed, 110 insertions(+), 226 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/095c04ed/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractListProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractListProcessor.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractListProcessor.java
index 9e1e1aa..eceee1d 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractListProcessor.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractListProcessor.java
@@ -336,6 +336,7 @@ public abstract class AbstractListProcessor extends Ab
 }
 
 final List entityList;
+final long currentListingTimestamp = System.nanoTime();
 try {
 // track of when this last executed for consideration of the lag 
nanos
 entityList = performListing(context, minTimestamp);
@@ -385,7 +386,8 @@ public abstract class AbstractListProcessor extends Ab
 context.yield();
 return;
 }
-} else {
+
+} else if (latestListingTimestamp >= currentListingTimestamp - 
LISTING_LAG_NANOS) {
 // Otherwise, newest entries are held back one cycle to avoid 
issues in writes occurring exactly when the listing is being performed to avoid 
missing data
 orderedEntries.remove(latestListingTimestamp);
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/095c04ed/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAbstractListProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAbstractListProcessor.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAbstractListProcessor.java
index f8b59f5..9896396 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAbstractListProcessor.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAbstractListProcessor.java
@@ -57,6 +57,30 @@ public class TestAbstractListProcessor {
 public final TemporaryFolder testFolder = new TemporaryFolder();
 
 @Test
+public void testAllExistingEntriesEmittedOnFirstIteration() throws 
Exception {
+final long oldTimestamp = System.nanoTime() - 
(AbstractListProcessor.LISTING_LAG_NANOS * 2);
+
+// These entries have existed before the processor runs at the first 
time.
+final ConcreteListProcessor proc = new ConcreteListProcessor();
+proc.addEntity("name", "id", oldTimestamp);
+proc.addEntity("name", "id2", oldTimestamp);
+
+// First run, the above listed entries should be emitted since it has 
existed.
+final TestRunner runner = TestRunners.newTestRunner(proc);
+
+runner.run();
+
runner.assertAllFlowFilesTransferred(ConcreteListProcessor.REL_SUCCESS, 2);
+runner.clearTransferState();
+
+// Ensure we have covered the necessary lag period to avoid issues 
where the processor was immediately scheduled to run again
+Thread.sleep(DEFAULT_SLEEP_MILLIS);
+
+// Run again without intro

nifi git commit: NIFI-2779 - Add processor to GetEmail Supporting Exchange Web Services

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 86fb67d55 -> b7cdc6b38


NIFI-2779 - Add processor to GetEmail Supporting Exchange Web Services

This closes: #1326

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: b7cdc6b382b09d601b1e9ecf81ef16b9246309b3
Parents: 86fb67d
Author: patricker 
Authored: Tue Oct 18 14:45:26 2016 -0600
Committer: Andre F de Miranda 
Committed: Wed Feb 15 23:48:34 2017 +1100

--
 nifi-assembly/LICENSE   |  25 +-
 nifi-assembly/NOTICE|   8 +
 .../src/main/resources/META-INF/LICENSE |  25 +-
 .../src/main/resources/META-INF/NOTICE  |  30 ++
 .../nifi-email-processors/pom.xml   |  17 +-
 .../nifi/processors/email/ConsumeEWS.java   | 519 +++
 .../org.apache.nifi.processor.Processor |   1 +
 7 files changed, 619 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/b7cdc6b3/nifi-assembly/LICENSE
--
diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE
index 7669f9c..256add6 100644
--- a/nifi-assembly/LICENSE
+++ b/nifi-assembly/LICENSE
@@ -1792,4 +1792,27 @@ under a 3-Clause BSD style license:
   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The binary distribution of this product bundles 'EWS JAVA API' which is 
available
+under an MIT style license.  For details see 
https://github.com/OfficeDev/ews-java-api.
+
+Copyright (c) 2012 Microsoft Corporation
+
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/b7cdc6b3/nifi-assembly/NOTICE
--
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 4a87d15..a43d56b 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -1285,6 +1285,14 @@ The following binary components are provided under the 
Eclipse Public License 1.
 (EPL 1.0) JaCoCo Java Code Coverage Library ( org.jacoco ) 
http://www.eclemma.org/jacoco
 (EPLv1.0) Clojure (org.clojure:clojure:1.8.0 - http://clojure.org)
 
+
+The MIT License
+
+
+The following binary components are provided under the MIT License.  See 
project link for details.
+
+  (MIT License) EWS Java API (com.microsoft.ews-java-api:ews-java-api:2.0 - 
https://github.com/OfficeDev/ews-java-api)
+
 *
 Mozilla Public License v2.0
 *

http://git-wip-us.apache.org/repos/asf/nifi/blob/b7cdc6b3/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/LICENSE
--
diff --git 
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/LICENSE
 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/LICENSE
index a3f4841..1b39d77 100644
--- 
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/LICENSE
+++ 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/LICENSE
@@ -253,4 +253,27 @@
  NONINFRINGE

nifi git commit: NIFI-3288: Add Clojure support for ExecuteScript

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 690130b06 -> 7963df89e


NIFI-3288: Add Clojure support for ExecuteScript

This closes: #1402.

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 7963df89ebf190a48ccacb118d5bf6c2c9bd2f3a
Parents: 690130b
Author: Matt Burgess 
Authored: Fri Jan 6 15:06:48 2017 -0500
Committer: Andre F de Miranda 
Committed: Wed Feb 15 02:52:11 2017 +1100

--
 nifi-assembly/NOTICE|   1 +
 .../src/main/resources/META-INF/LICENSE |  12 +-
 .../src/main/resources/META-INF/NOTICE  |   4 +-
 .../nifi-scripting-processors/pom.xml   |   5 +
 .../nifi/processors/script/ExecuteScript.java   |   2 +-
 .../script/engine/ClojureScriptEngine.java  | 107 
 .../engine/ClojureScriptEngineFactory.java  | 108 
 .../impl/ClojureScriptEngineConfigurator.java   |  70 ++
 .../services/javax.script.ScriptEngineFactory   |  15 +++
 ...i.processors.script.ScriptEngineConfigurator |   1 +
 .../processors/script/TestExecuteClojure.java   | 128 +++
 .../clojure/test_dynamicProperties.clj  |  25 
 .../test/resources/clojure/test_onTrigger.clj   |  18 +++
 .../clojure/test_onTrigger_newFlowFile.clj  |  53 
 14 files changed, 546 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7963df89/nifi-assembly/NOTICE
--
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 55ba706..4a87d15 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -1283,6 +1283,7 @@ The following binary components are provided under the 
Eclipse Public License 1.
 (EPL 1.0) Common Service Data Objects 
(org.eclipse.persistence:commonj.sdo:2.1.1 - 
http://www.eclipse.org/eclipselink/)
 (EPL 1.0) Java Persistence API 
(org.eclipse.persistence:javax.persistence:2.1.0 - 
http://www.eclipse.org/eclipselink/)
 (EPL 1.0) JaCoCo Java Code Coverage Library ( org.jacoco ) 
http://www.eclemma.org/jacoco
+(EPLv1.0) Clojure (org.clojure:clojure:1.8.0 - http://clojure.org)
 
 *
 Mozilla Public License v2.0

http://git-wip-us.apache.org/repos/asf/nifi/blob/7963df89/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/LICENSE
--
diff --git 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/LICENSE
 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/LICENSE
index 671d529..ac9134c 100644
--- 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/LICENSE
+++ 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/LICENSE
@@ -271,4 +271,14 @@ licenses.
 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.
\ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+  The binary distribution of this produce bundles 'clojure' under a EPL 1.0 
license.
+
+ *   Copyright (c) Rich Hickey. All rights reserved.
+ *   The use and distribution terms for this software are covered by the
+ *   Eclipse Public License 1.0 
(http://opensource.org/licenses/eclipse-1.0.php)
+ *   which can be found in the file epl-v10.html at the root of this 
distribution.
+ *   By using this software in any fashion, you are agreeing to be bound by
+ *  the terms of this license.
+ *   You must not remove this notice, or any other, from this software.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/7963df89/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
--
diff --git 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
index 769df95..d4bb0da 100644
--- 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
+++ 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
@@ -58,4 +58,6 @@ 

nifi git commit: NIFI-2440 - Add 'file.lastModifiedTime' attribute to ListSFTP processor

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 1e4369414 -> 93ea34815


NIFI-2440 - Add 'file.lastModifiedTime' attribute to ListSFTP processor

This commit closes a stalled PR that has been merged but not closed

This closes: #913.


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

Branch: refs/heads/master
Commit: 93ea348159e02887d05a138acc489b4dc0ffcf1f
Parents: 1e43694
Author: Andre F de Miranda 
Authored: Wed Feb 15 01:57:22 2017 +1100
Committer: Andre F de Miranda 
Committed: Wed Feb 15 01:57:22 2017 +1100

--

--

nifi git commit: NIFI-3057 Added provenance events to PutElasticsearch and FetchElasticsearch

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 2ef7c15b5 -> 1e4369414


NIFI-3057 Added provenance events to PutElasticsearch and FetchElasticsearch

This closes: #1370.

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 1e4369414568f61172f99ec9676ac0c7568934ee
Parents: 2ef7c15
Author: Pierre Villard 
Authored: Thu Dec 29 17:42:24 2016 +0100
Committer: Andre F de Miranda 
Committed: Wed Feb 15 01:37:14 2017 +1100

--
 .../nifi/processors/elasticsearch/FetchElasticsearch.java   | 9 +
 .../nifi/processors/elasticsearch/PutElasticsearch.java | 8 +++-
 .../processors/elasticsearch/TestFetchElasticsearch.java| 5 +
 .../nifi/processors/elasticsearch/TestPutElasticsearch.java | 5 +
 4 files changed, 26 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/1e436941/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
index 643edbb..84f31b7 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
@@ -49,6 +49,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 
 @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
@@ -143,6 +144,7 @@ public class FetchElasticsearch extends 
AbstractElasticsearchTransportClientProc
 return propertyDescriptors;
 }
 
+@Override
 @OnScheduled
 public void setup(ProcessContext context) {
 super.setup(context);
@@ -165,6 +167,8 @@ public class FetchElasticsearch extends 
AbstractElasticsearchTransportClientProc
 try {
 
 logger.debug("Fetching {}/{}/{} from Elasticsearch", new 
Object[]{index, docType, docId});
+final long startNanos = System.nanoTime();
+
 GetRequestBuilder getRequestBuilder = 
esClient.get().prepareGet(index, docType, docId);
 if (authToken != null) {
 getRequestBuilder.putHeader("Authorization", authToken);
@@ -189,6 +193,10 @@ public class FetchElasticsearch extends 
AbstractElasticsearchTransportClientProc
 }
 });
 logger.debug("Elasticsearch document " + docId + " fetched, 
routing to success");
+
+final long millis = 
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
+final String uri = 
context.getProperty(HOSTS).evaluateAttributeExpressions().getValue() + "/" + 
index + "/" + docType + "/" + docId;
+session.getProvenanceReporter().fetch(flowFile, uri, millis);
 session.transfer(flowFile, REL_SUCCESS);
 }
 } catch (NoNodeAvailableException
@@ -211,6 +219,7 @@ public class FetchElasticsearch extends 
AbstractElasticsearchTransportClientProc
 /**
  * Dispose of ElasticSearch client
  */
+@Override
 @OnStopped
 public void closeClient() {
 super.closeClient();

http://git-wip-us.apache.org/repos/asf/nifi/blob/1e436941/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
--
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
index ab61f67..1f68c22 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutE

nifi git commit: Revert "NIFI-3352 - Address issue where ListenLumberjack was sending long numbers back to clients - instead of int"

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 5b69c97f4 -> 8c7539b20


Revert "NIFI-3352 - Address issue where ListenLumberjack was sending long 
numbers back to clients - instead of int"

This reverts commit 9609dafc34f40178d30480a41288fe4a89c2eb79.


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

Branch: refs/heads/master
Commit: 8c7539b20a08ae39345ee1cf73dccea792b2bd8a
Parents: 5b69c97
Author: Andre F de Miranda 
Authored: Tue Jan 17 01:48:49 2017 +1100
Committer: Andre F de Miranda 
Committed: Tue Jan 17 01:53:18 2017 +1100

--
 .../apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java | 2 +-
 .../nifi/processors/lumberjack/response/LumberjackResponse.java| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/8c7539b2/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
--
diff --git 
a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
 
b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
index 9bc9468..eec9022 100644
--- 
a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
+++ 
b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
@@ -161,7 +161,7 @@ public class LumberjackDecoder {
 
 // Lumberjack has a weird approach to frames, where compressed frames 
embed D(ata) or J(SON) frames.
 // inside a compressed input.
-//  Or as stated in the documentation:
+//  Or astated in the documentation:
 //
 // "As an example, you could have 3 data frames compressed into a 
single
 // 'compressed' frame type: 1D{k,v}{k,v}1D{k,v}{k,v}1D{k,v}{k,v}"

http://git-wip-us.apache.org/repos/asf/nifi/blob/8c7539b2/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
--
diff --git 
a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
 
b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
index 850bba4..2ace367 100644
--- 
a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
+++ 
b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
@@ -51,7 +51,7 @@ public class LumberjackResponse {
 return new LumberjackFrame.Builder()
 .version(version)
 .frameType(frameType)
-.payload(ByteBuffer.allocate(4).putInt((int) 
seqNumber).array())
+.payload(ByteBuffer.allocate(8).putLong(seqNumber).array())
 .build();
 }
 

[2/2] nifi git commit: NIFI-2761 Fixed error message in bootstrap

[afucs]

NIFI-2761 Fixed error message in bootstrap

This closes #1385

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 5b69c97f4157736c39b9d33e3beb43872979e2dc
Parents: 9609daf
Author: Pierre Villard 
Authored: Tue Jan 3 18:09:53 2017 +0100
Committer: Andre F de Miranda 
Committed: Tue Jan 17 01:43:15 2017 +1100

--
 .../src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/5b69c97f/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
--
diff --git 
a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java 
b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
index d925fa3..e53a4c4 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
@@ -57,7 +57,7 @@ public class BootstrapCodec {
 try {
 processRequest(cmd, args);
 } catch (final InvalidCommandException ice) {
-throw new IOException("Received invalid command from NiFi: " + 
line + " : " + ice.getMessage() == null ? "" : "Details: " + ice.toString());
+throw new IOException("Received invalid command from NiFi: " + 
line + (ice.getMessage() == null ? "" : " - Details: " + ice.toString()));
 }
 }
 

[1/2] nifi git commit: NIFI-3352 - Address issue where ListenLumberjack was sending long numbers back to clients - instead of int

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master def4918af -> 5b69c97f4


NIFI-3352 - Address issue where ListenLumberjack was sending long numbers back 
to clients - instead of int


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

Branch: refs/heads/master
Commit: 9609dafc34f40178d30480a41288fe4a89c2eb79
Parents: def4918
Author: afucs 
Authored: Sat Jan 14 22:57:33 2017 +1100
Committer: afucs 
Committed: Sat Jan 14 22:57:33 2017 +1100

--
 .../apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java | 2 +-
 .../nifi/processors/lumberjack/response/LumberjackResponse.java| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/9609dafc/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
--
diff --git 
a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
 
b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
index eec9022..9bc9468 100644
--- 
a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
+++ 
b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/frame/LumberjackDecoder.java
@@ -161,7 +161,7 @@ public class LumberjackDecoder {
 
 // Lumberjack has a weird approach to frames, where compressed frames 
embed D(ata) or J(SON) frames.
 // inside a compressed input.
-//  Or astated in the documentation:
+//  Or as stated in the documentation:
 //
 // "As an example, you could have 3 data frames compressed into a 
single
 // 'compressed' frame type: 1D{k,v}{k,v}1D{k,v}{k,v}1D{k,v}{k,v}"

http://git-wip-us.apache.org/repos/asf/nifi/blob/9609dafc/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
--
diff --git 
a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
 
b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
index 2ace367..850bba4 100644
--- 
a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
+++ 
b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/main/java/org/apache/nifi/processors/lumberjack/response/LumberjackResponse.java
@@ -51,7 +51,7 @@ public class LumberjackResponse {
 return new LumberjackFrame.Builder()
 .version(version)
 .frameType(frameType)
-.payload(ByteBuffer.allocate(8).putLong(seqNumber).array())
+.payload(ByteBuffer.allocate(4).putInt((int) 
seqNumber).array())
 .build();
 }
 

nifi-site git commit: Move myself from commiters to pmc and indent matt record

[afucs]

Repository: nifi-site
Updated Branches:
  refs/heads/master 35d281d05 -> f94c6e7d0


Move myself from commiters to pmc and indent matt record


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

Branch: refs/heads/master
Commit: f94c6e7d034369986a97ea1b7434372bbe1edaea
Parents: 35d281d
Author: Andre F de Miranda 
Authored: Sat Nov 5 11:11:51 2016 +1100
Committer: Andre F de Miranda 
Committed: Sat Nov 5 11:12:45 2016 +1100

--
 src/pages/html/people.hbs | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/f94c6e7d/src/pages/html/people.hbs
--
diff --git a/src/pages/html/people.hbs b/src/pages/html/people.hbs
index 1681372..24ea37d 100644
--- a/src/pages/html/people.hbs
+++ b/src/pages/html/people.hbs
@@ -105,9 +105,14 @@ title: Apache NiFi Team

 
 
-mattyb149
-Matt Burgess
-
+mattyb149
+Matt Burgess
+
+
+
+    afucs
+Andre F de Miranda
+
 
 
 
@@ -169,11 +174,6 @@ title: Apache NiFi Team
 
 
 
-    afucs
-Andre F de Miranda
-
-
-
 brosander
 Bryan Rosander
 

nifi git commit: This closes #1047

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 511f2a0c8 -> 4acc9ad28


This closes #1047


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

Branch: refs/heads/master
Commit: 4acc9ad288cc005127d1709adbb1134f6dab94c6
Parents: 511f2a0
Author: Andre F de Miranda 
Authored: Thu Nov 3 02:29:11 2016 +1100
Committer: Andre F de Miranda 
Committed: Thu Nov 3 02:29:11 2016 +1100

--

--

nifi git commit: [NIFI-2812] Fix creating NiFi RPM

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 56da2b51e -> 511f2a0c8


[NIFI-2812] Fix creating NiFi RPM

This closes: PR 1047
This resolves: NIFI-2812

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 511f2a0c8bcae5a588073cfb34dbdafb5ee478c3
Parents: 56da2b5
Author: Artem Ermakov 
Authored: Thu Sep 22 18:15:21 2016 +0300
Committer: Andre F de Miranda 
Committed: Thu Nov 3 02:26:20 2016 +1100

--
 nifi-assembly/pom.xml | 23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/511f2a0c/nifi-assembly/pom.xml
--
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 5a7fc9d..036926f 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -486,6 +486,11 @@ language governing permissions and limitations under the 
License. -->
 
nifi.sh
 true
 
+
+
${project.build.directory}/generated-resources/bin/nifi-env.sh
+
nifi-env.sh
+true
+
 
 
 
@@ -505,11 +510,18 @@ language governing permissions and limitations under the 
License. -->
 
/opt/nifi/nifi-${project.version}/lib
 
 
+
net.minidev:asm
+asm:asm
+
org.bouncycastle:bcpkix-jdk15on
+
com.fasterxml.jackson.core:jackson-annotations
+
com.fasterxml.jackson.core:jackson-core
+
com.fasterxml.jackson.core:jackson-databind
+
com.jayway.jsonpath:json-path
+
net.minidev:json-smart
 
org.apache.nifi:nifi-bootstrap
 
org.apache.nifi:nifi-resources
 
org.apache.nifi:nifi-docs
 
commons-io:commons-io
-
org.apache.commons:commons-lang3
 
org.antlr:antlr-runtime
 
javax.activation:activation
 
javax.mail:mail
@@ -524,6 +536,15 @@ language governing permissions and limitations under the 
License. -->
 
/opt/nifi/nifi-${project.version}/lib/bootstrap
 
 
+
net.minidev:asm
+asm:asm
+
org.bouncycastle:bcpkix-jdk15on
+
org.bouncycastle:bcprov-jdk15on
+
com.fasterxml.jackson.core:jackson-annotations
+
com.fasterxml.jackson.core:jackson-core
+
com.fasterxml.jackson.core:jackson-databind
+
com.jayway.jsonpath:json-path
+
net.minidev:json-smart
 
commons-io:commons-io
 
org.apache.commons:commons-lang3
 
org.antlr:antlr-runtime

nifi-site git commit: NIFI-2910 - Added Pony Mail archive links to mailing lists page.

[afucs]

Repository: nifi-site
Updated Branches:
  refs/heads/master 8fe1b039c -> 3a78493b6


NIFI-2910 - Added Pony Mail archive links to mailing lists page.

This closes: #6

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 3a78493b6a4c4d1729bcabd3d133bd8fe9d6f501
Parents: 8fe1b03
Author: Joe Skora 
Authored: Mon Oct 17 21:14:45 2016 -0400
Committer: Andre F de Miranda 
Committed: Sat Oct 22 21:27:39 2016 +1100

--
 src/pages/html/mailing_lists.hbs | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/3a78493b/src/pages/html/mailing_lists.hbs
--
diff --git a/src/pages/html/mailing_lists.hbs b/src/pages/html/mailing_lists.hbs
index d437f26..833c7b7 100644
--- a/src/pages/html/mailing_lists.hbs
+++ b/src/pages/html/mailing_lists.hbs
@@ -27,7 +27,8 @@ title: Apache NiFi Mailing Lists
 Subscribe
 Unsubscribe
 Post
-Archive
+Pony Mail Archive
+Legacy Archive
Purpose
 
 
@@ -35,6 +36,7 @@ title: Apache NiFi Mailing Lists
 mailto:users-subscr...@nifi.apache.org";>Subscribe
 mailto:users-unsubscr...@nifi.apache.org";>Unsubscribe
 mailto:us...@nifi.apache.org";>Post
+http://lists.apache.org/list.html?us...@nifi.apache.org";>us...@nifi.apache.org
 http://mail-archives.apache.org/mod_mbox/nifi-users/";>mail-archives.apache.org
For nifi users to get help, ask questions, report bugs
 
@@ -43,6 +45,7 @@ title: Apache NiFi Mailing Lists
 mailto:dev-subscr...@nifi.apache.org";>Subscribe
 mailto:dev-unsubscr...@nifi.apache.org";>Unsubscribe
 mailto:d...@nifi.apache.org";>Post
+http://lists.apache.org/list.html?d...@nifi.apache.org";>d...@nifi.apache.org
 http://mail-archives.apache.org/mod_mbox/nifi-dev/";>mail-archives.apache.org
For developers to discuss features, bugs, share ideas
 
@@ -51,6 +54,7 @@ title: Apache NiFi Mailing Lists
 mailto:commits-subscr...@nifi.apache.org";>Subscribe
 mailto:commits-unsubscr...@nifi.apache.org";>Unsubscribe
 mailto:commits@nifi.apache.org";>Post
+http://lists.apache.org/list.html?commits@nifi.apache.org";>commits@nifi.apache.org
 http://mail-archives.apache.org/mod_mbox/nifi-commits/";>mail-archives.apache.org
Automated e-mails each time code commits occur
 
@@ -59,6 +63,7 @@ title: Apache NiFi Mailing Lists
 mailto:issues-subscr...@nifi.apache.org";>Subscribe
 mailto:issues-unsubscr...@nifi.apache.org";>Unsubscribe
 mailto:iss...@nifi.apache.org";>Post
+http://lists.apache.org/list.html?iss...@nifi.apache.org";>iss...@nifi.apache.org
 http://mail-archives.apache.org/mod_mbox/nifi-issues/";>mail-archives.apache.org
 Automated e-mails each time comments are made in JIRA or 
Github
 

nifi git commit: Dummy commit to clean stalled gh PRs

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master b864d49f6 -> 220b76803


Dummy commit to clean stalled gh PRs

This closes: #513 (superseded)


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

Branch: refs/heads/master
Commit: 220b76803b2f70ddd6dcc366478d722599349983
Parents: b864d49
Author: Andre F de Miranda 
Authored: Thu Oct 20 23:58:39 2016 +1100
Committer: Andre F de Miranda 
Committed: Fri Oct 21 23:17:44 2016 +1100

--

--

nifi git commit: NIFI-1069 - improve init script exit codes so that results are LSB compliant

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 231f5143a -> 99d3c3974


NIFI-1069 - improve init script exit codes so that results are LSB compliant

This closes: #1093

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 99d3c397481a98a5b3d2d4e44b84516fc0e3675e
Parents: 231f514
Author: Michal Klempa 
Authored: Tue Oct 4 14:25:49 2016 +0200
Committer: Andre F de Miranda 
Committed: Thu Oct 20 23:12:23 2016 +1100

--
 .../main/java/org/apache/nifi/bootstrap/RunNiFi.java | 15 ++-
 .../nifi-resources/src/main/resources/bin/nifi.sh|  2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/99d3c397/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
--
diff --git 
a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java 
b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
index 04e7ba3..8d92c44 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
@@ -204,6 +204,7 @@ public class RunNiFi {
 final File configFile = getBootstrapConfFile();
 final RunNiFi runNiFi = new RunNiFi(configFile, verbose);
 
+Integer exitStatus = null;
 switch (cmd.toLowerCase()) {
 case "start":
 runNiFi.start();
@@ -215,7 +216,7 @@ public class RunNiFi {
 runNiFi.stop();
 break;
 case "status":
-runNiFi.status();
+exitStatus = runNiFi.status();
 break;
 case "restart":
 runNiFi.stop();
@@ -228,6 +229,9 @@ public class RunNiFi {
 runNiFi.env();
 break;
 }
+if (exitStatus != null) {
+System.exit(exitStatus);
+}
 }
 
 private static File getBootstrapConfFile() {
@@ -581,23 +585,23 @@ public class RunNiFi {
 return new Status(port, pid, pingSuccess, alive);
 }
 
-public void status() throws IOException {
+public int status() throws IOException {
 final Logger logger = cmdLogger;
 final Status status = getStatus(logger);
 if (status.isRespondingToPing()) {
 logger.info("Apache NiFi is currently running, listening to 
Bootstrap on port {}, PID={}",
 new Object[]{status.getPort(), status.getPid() == null ? 
"unknown" : status.getPid()});
-return;
+return 0;
 }
 
 if (status.isProcessRunning()) {
 logger.info("Apache NiFi is running at PID {} but is not 
responding to ping requests", status.getPid());
-return;
+return 4;
 }
 
 if (status.getPort() == null) {
 logger.info("Apache NiFi is not running");
-return;
+return 3;
 }
 
 if (status.getPid() == null) {
@@ -605,6 +609,7 @@ public class RunNiFi {
 } else {
 logger.info("Apache NiFi is not running");
 }
+return 3;
 }
 
 public void env() {

http://git-wip-us.apache.org/repos/asf/nifi/blob/99d3c397/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
index ff8addd..7b471d7 100755
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
@@ -295,12 +295,14 @@ run() {
 else
 (eval $RUN_NIFI_CMD $@)
 fi
+EXIT_STATUS=$?
 
 # Wait just a bit (3 secs) to wait for the logging to finish and then echo 
a new-line.
 # We do this to avoid having logs spewed on the console after running the 
command and then not giving
 # control back to the user
 sleep 3
 echo
+exit $EXIT_STATUS
 }
 
 main() {

nifi git commit: Dummy commit to clean stalled gh PRs

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master ae503f5d4 -> 231f5143a


Dummy commit to clean stalled gh PRs

This closes: #315 (superseded)
This closes: #1024 (superseded)


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

Branch: refs/heads/master
Commit: 231f5143ab8100d6a5d4543a5476694378fdcf6d
Parents: ae503f5
Author: Andre F de Miranda 
Authored: Thu Oct 20 23:02:33 2016 +1100
Committer: Andre F de Miranda 
Committed: Thu Oct 20 23:02:33 2016 +1100

--

--

nifi git commit: NIFI-2199 - allows nifi.sh restart through ssh

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master e969a5ffe -> 88d125137


NIFI-2199 - allows nifi.sh restart through ssh

Closes: #1092

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 88d125137e3bf3faf80b522edf5cf14f99419d60
Parents: e969a5f
Author: Michal Klempa 
Authored: Tue Oct 4 12:18:46 2016 +0200
Committer: Andre F de Miranda 
Committed: Sat Oct 15 00:48:04 2016 +1100

--
 .../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/88d12513/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
index b58a622..79850ee 100755
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
@@ -267,7 +267,7 @@ run() {
 RUN_NIFI_CMD="cd "\""${NIFI_HOME}"\"" && ${sudo_cmd_prefix} 
"\""${JAVA}"\"" -cp "\""${BOOTSTRAP_CLASSPATH}"\"" -Xms12m -Xmx24m 
${BOOTSTRAP_DIR_PARAMS}  org.apache.nifi.bootstrap.RunNiFi"
 
 if [ "$1" = "start" ]; then
-(eval $RUN_NIFI_CMD $@ &)
+(eval $RUN_NIFI_CMD $@ &)> /dev/null 2>&1 < /dev/null
 else
 (eval $RUN_NIFI_CMD $@)
 fi

nifi git commit: NIFI-2691 Replaced references to kerberos/spegno principle with principal in nifi.properties and admin guide

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 92cca96d4 -> 53f7a2166


NIFI-2691 Replaced references to kerberos/spegno principle with principal in 
nifi.properties and admin guide

This closes: #1105

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 53f7a2166360de4f73a2fefbb0e6b6349ba92455
Parents: 92cca96
Author: Andrew Lim 
Authored: Wed Oct 5 11:27:52 2016 -0400
Committer: Andre F de Miranda 
Committed: Fri Oct 7 01:22:49 2016 +1100

--
 nifi-docs/src/main/asciidoc/administration-guide.adoc| 2 +-
 .../nifi-resources/src/main/resources/conf/nifi.properties   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/53f7a216/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 ec5c64a..67a912a 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -2109,7 +2109,7 @@ that is specified.
 |
 |*Property*|*Description*
 |nifi.kerberos.krb5.file*|The location of the krb5 file, if used. It is blank 
by default. At this time, only a single krb5 file is allowed to
-be specified per NiFi instance, so this property is configured here to 
support SPNEGO and service principles rather than in individual Processors.
+be specified per NiFi instance, so this property is configured here to 
support SPNEGO and service principals rather than in individual Processors.
 If necessary the krb5 file can support multiple realms.
 Example: `/etc/krb5.conf`
 |nifi.kerberos.service.principal*|The name of the NiFi Kerberos service 
principal, if used. It is blank by default. Note that this property is for NiFi 
to authenticate as a client other systems.

http://git-wip-us.apache.org/repos/asf/nifi/blob/53f7a216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
index 3cbdcb0..d34380c 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
@@ -184,11 +184,11 @@ nifi.zookeeper.root.node=${nifi.zookeeper.root.node}
 # kerberos #
 nifi.kerberos.krb5.file=${nifi.kerberos.krb5.file}
 
-# kerberos service principle #
+# kerberos service principal #
 nifi.kerberos.service.principal=${nifi.kerberos.service.principal}
 nifi.kerberos.service.keytab.location=${nifi.kerberos.service.keytab.location}
 
-# kerberos spnego principle #
+# kerberos spnego principal #
 nifi.kerberos.spnego.principal=${nifi.kerberos.spnego.principal}
 nifi.kerberos.spnego.keytab.location=${nifi.kerberos.spnego.keytab.location}
 
nifi.kerberos.spnego.authentication.expiration=${nifi.kerberos.spnego.authentication.expiration}

nifi git commit: NIFI-1912 - PutEmail fixed format when attachment

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/0.x dce27fea9 -> 4d73aedb1


NIFI-1912 - PutEmail fixed format when attachment

Correction as suggested by users in JIRA.
+ adding a unit test to check attachments.

This closes: #1081

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/0.x
Commit: 4d73aedb150e9b3e6efb75b3c5ac3baf3797cfe4
Parents: dce27fe
Author: Pierre Villard 
Authored: Thu Sep 29 22:47:04 2016 +0200
Committer: Andre F de Miranda 
Committed: Thu Oct 6 21:40:08 2016 +1100

--
 .../nifi/processors/standard/PutEmail.java  |  2 +-
 .../nifi/processors/standard/TestPutEmail.java  | 49 
 2 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/4d73aedb/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
index e71f5aa..fd65756 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
@@ -318,7 +318,7 @@ public class PutEmail extends AbstractProcessor {
 if (context.getProperty(ATTACH_FILE).asBoolean()) {
 final MimeBodyPart mimeText = new 
PreencodedMimeBodyPart("base64");
 mimeText.setDataHandler(new DataHandler(new 
ByteArrayDataSource(
-Base64.encodeBase64(messageText.getBytes("UTF-8")), 
"text/plain; charset=\"utf-8\"")));
+Base64.encodeBase64(messageText.getBytes("UTF-8")), 
contentType + "; charset=\"utf-8\"")));
 final MimeBodyPart mimeFile = new MimeBodyPart();
 session.read(flowFile, new InputStreamCallback() {
 @Override

http://git-wip-us.apache.org/repos/asf/nifi/blob/4d73aedb/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
index fb11d8f..782f61c 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
@@ -20,15 +20,21 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.mail.BodyPart;
 import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage.RecipientType;
+import javax.mail.internet.MimeMultipart;
 
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.StringUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.nifi.util.LogMessage;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
@@ -182,6 +188,7 @@ public class TestPutEmail {
 
 assertEquals("Expected no messages to be sent", 0, 
processor.getMessages().size());
 }
+
 @Test
 public void testEmptyFrom() throws Exception {
 // verifies that if the FROM property evaluates to an empty string at
@@ -204,4 +211,46 @@ public class TestPutEmail {
 assertTrue(((String)logMessage.getArgs()[2]).contains("Required 
property 'From' evaluates to an empty string"));
 }
 
+@Test
+public void testOutgoingMessageAttachment() throws Exception {
+// verifies that are set on the outgoing Message correctly
+runner.setProperty(PutEmail.SMTP_HOSTNAME, "smtp-host");
+runner.setProperty(PutEmail.HEADER_XMAILER, "TestingNiFi");
+runner.setProperty(PutEmail.F

nifi git commit: NIFI-1912 - PutEmail fixed format when attachment

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 6f1af31ff -> 3c8545a90


NIFI-1912 - PutEmail fixed format when attachment

Correction as suggested by users in JIRA.
+ adding a unit test to check attachments.

This closes: #1081

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 3c8545a90266b8f82a6c541c9a68daad107b0f23
Parents: 6f1af31
Author: Pierre Villard 
Authored: Thu Sep 29 22:47:04 2016 +0200
Committer: Andre F de Miranda 
Committed: Thu Oct 6 21:34:56 2016 +1100

--
 .../nifi/processors/standard/PutEmail.java  |  2 +-
 .../nifi/processors/standard/TestPutEmail.java  | 49 
 2 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/3c8545a9/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
index 27534fe..2965a67 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
@@ -318,7 +318,7 @@ public class PutEmail extends AbstractProcessor {
 if (context.getProperty(ATTACH_FILE).asBoolean()) {
 final MimeBodyPart mimeText = new 
PreencodedMimeBodyPart("base64");
 mimeText.setDataHandler(new DataHandler(new 
ByteArrayDataSource(
-Base64.encodeBase64(messageText.getBytes("UTF-8")), 
"text/plain; charset=\"utf-8\"")));
+Base64.encodeBase64(messageText.getBytes("UTF-8")), 
contentType + "; charset=\"utf-8\"")));
 final MimeBodyPart mimeFile = new MimeBodyPart();
 session.read(flowFile, new InputStreamCallback() {
 @Override

http://git-wip-us.apache.org/repos/asf/nifi/blob/3c8545a9/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
index fb11d8f..782f61c 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
@@ -20,15 +20,21 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.mail.BodyPart;
 import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage.RecipientType;
+import javax.mail.internet.MimeMultipart;
 
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.StringUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.nifi.util.LogMessage;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
@@ -182,6 +188,7 @@ public class TestPutEmail {
 
 assertEquals("Expected no messages to be sent", 0, 
processor.getMessages().size());
 }
+
 @Test
 public void testEmptyFrom() throws Exception {
 // verifies that if the FROM property evaluates to an empty string at
@@ -204,4 +211,46 @@ public class TestPutEmail {
 assertTrue(((String)logMessage.getArgs()[2]).contains("Required 
property 'From' evaluates to an empty string"));
 }
 
+@Test
+public void testOutgoingMessageAttachment() throws Exception {
+// verifies that are set on the outgoing Message correctly
+runner.setProperty(PutEmail.SMTP_HOSTNAME, "smtp-host");
+runner.setProperty(PutEmail.HEADER_XMAILER, "TestingNiFi");
+runner.setProperty(PutE

nifi git commit: NIFI-1840 Added compression type property in Kite processors

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 2c907c63a -> 75d0c74d2


NIFI-1840 Added compression type property in Kite processors

This closes #409


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

Branch: refs/heads/master
Commit: 75d0c74d273600629d7a6e7027196c39b66513bb
Parents: 2c907c6
Author: Pierre Villard 
Authored: Tue May 3 17:00:49 2016 +0200
Committer: Andre F de Miranda 
Committed: Thu Oct 6 00:20:52 2016 +1100

--
 .../kite/AbstractKiteConvertProcessor.java  | 62 ++
 .../nifi/processors/kite/ConvertAvroSchema.java | 22 +--
 .../nifi/processors/kite/ConvertCSVToAvro.java  |  6 +-
 .../nifi/processors/kite/ConvertJSONToAvro.java | 12 +++-
 .../processors/kite/TestCSVToAvroProcessor.java | 31 -
 .../processors/kite/TestConvertAvroSchema.java  | 68 
 .../kite/TestJSONToAvroProcessor.java   | 30 +
 7 files changed, 219 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/75d0c74d/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/AbstractKiteConvertProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/AbstractKiteConvertProcessor.java
 
b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/AbstractKiteConvertProcessor.java
new file mode 100644
index 000..561bf46
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/AbstractKiteConvertProcessor.java
@@ -0,0 +1,62 @@
+/*
+ * 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.kite;
+
+import org.apache.avro.file.CodecFactory;
+import org.apache.nifi.components.PropertyDescriptor;
+
+import com.google.common.annotations.VisibleForTesting;
+
+abstract class AbstractKiteConvertProcessor extends AbstractKiteProcessor {
+
+@VisibleForTesting
+static final PropertyDescriptor COMPRESSION_TYPE = new 
PropertyDescriptor.Builder()
+.name("kite-compression-type")
+.displayName("Compression type")
+.description("Compression type to use when writting Avro files. 
Default is Snappy.")
+.allowableValues(CodecType.values())
+.defaultValue(CodecType.SNAPPY.toString())
+.build();
+
+public enum CodecType {
+BZIP2,
+DEFLATE,
+NONE,
+SNAPPY,
+LZO
+}
+
+protected CodecFactory getCodecFactory(String property) {
+CodecType type = CodecType.valueOf(property);
+switch (type) {
+case BZIP2:
+return CodecFactory.bzip2Codec();
+case DEFLATE:
+return 
CodecFactory.deflateCodec(CodecFactory.DEFAULT_DEFLATE_LEVEL);
+case NONE:
+return CodecFactory.nullCodec();
+case LZO:
+return CodecFactory.xzCodec(CodecFactory.DEFAULT_XZ_LEVEL);
+case SNAPPY:
+default:
+return CodecFactory.snappyCodec();
+}
+}
+
+}

http://git-wip-us.apache.org/repos/asf/nifi/blob/75d0c74d/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
--
diff --git 
a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
 
b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
index a8244d2..a3fffc3 100644
--- 
a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
+++ 
b/

nifi git commit: NIFI-2709 - Refactor ConsumeIMAP and ConsumePOP3 to generate RFC2822 compliant flowfiles

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 25b7dfa9b -> bec7dbbad


NIFI-2709 - Refactor ConsumeIMAP and ConsumePOP3 to generate RFC2822
compliant flowfiles

NIFI-2709 - refactor ConsumePOP/ConsumeIMAP jUnit

tests now use the greenmail mock email server

This closes: #1083


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

Branch: refs/heads/master
Commit: bec7dbbad6ed10950411955d4718d99dc84746c1
Parents: 25b7dfa
Author: Andre F de Miranda 
Authored: Fri Sep 30 19:00:59 2016 +1000
Committer: Andre F de Miranda 
Committed: Tue Oct 4 01:35:34 2016 +1100

--
 .../nifi-email-processors/pom.xml   |   6 +
 .../email/AbstractEmailProcessor.java   |  16 +-
 .../nifi/processors/email/ConsumeEmailTest.java | 158 
 .../nifi/processors/email/TestConsumeEmail.java | 180 +++
 4 files changed, 191 insertions(+), 169 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/bec7dbba/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index d457184..43181fd 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -78,6 +78,12 @@
 nifi-mock
 test
 
+
+com.icegreen
+greenmail
+1.5.2
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/bec7dbba/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
index 7e6193d..dbcdd0e 100644
--- 
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
+++ 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
@@ -17,7 +17,6 @@
 package org.apache.nifi.processors.email;
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -44,14 +43,12 @@ 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.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.support.StaticListableBeanFactory;
 import org.springframework.integration.mail.AbstractMailReceiver;
 import org.springframework.util.Assert;
-import org.springframework.util.StreamUtils;
 
 /**
  * Base processor for implementing processors to consume messages from Email
@@ -348,14 +345,11 @@ abstract class AbstractEmailProcessor extends Ab
 long start = System.nanoTime();
 FlowFile flowFile = processSession.create();
 
-flowFile = processSession.append(flowFile, new OutputStreamCallback() {
-@Override
-public void process(final OutputStream out) throws IOException {
-try {
-StreamUtils.copy(emailMessage.getInputStream(), out);
-} catch (MessagingException e) {
-throw new IOException(e);
-}
+flowFile = processSession.append(flowFile, out -> {
+try {
+emailMessage.writeTo(out);
+} catch (MessagingException e) {
+throw new IOException(e);
 }
 });
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/bec7dbba/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/ConsumeEmailTest.java
--
diff --git 
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/ConsumeEmailTest.java
 
b/nifi-nar-bundles/nif

nifi git commit: Dummy commit closing stalled PR requests

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master d6867283b -> cc5e827aa


Dummy commit closing stalled PR requests

Closes: #335 - superseded by #366
Closes: #849 - superseded by #875

Closes: #769 - malformed PR
Closes: #595 - malformed PR

Closes: #1054


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

Branch: refs/heads/master
Commit: cc5e827aa1dfe2f376e9836380ba63c15269eea8
Parents: d686728
Author: Andre F de Miranda 
Authored: Fri Sep 23 23:35:52 2016 +1000
Committer: Andre F de Miranda 
Committed: Sat Oct 1 01:04:21 2016 +1000

--

--

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-376 [deleted] 4691b5c67

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1563 [deleted] d85d9f768

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1107 [deleted] 08e65abd2

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1073 [deleted] 313fc2ec7

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1054 [deleted] e2d3d1b76

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-731 [deleted] 94b4eddb0

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-919 [deleted] eb64448e6

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-744 [deleted] 13b3017d2

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-640 [deleted] d4ff40dfe

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-631 [deleted] ec9b53b6a

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-274 [deleted] 4bdd729dc

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1085 [deleted] 6add372bc

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-810-InputRequirement [deleted] 0636f0e73

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-730 [deleted] dbf0c7893

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-433 [deleted] e1e1aecc8

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-259 [deleted] 16f185245

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/ListHDFS [deleted] e0d4484ee

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-25 [deleted] 0211d0d71

nifi git commit: [NIFI-2813] Fix for invalid M2_HOME directory

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/0.x 5beaf8c5a -> 560a835ef


[NIFI-2813] Fix for invalid M2_HOME directory

This closes #1049

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/0.x
Commit: 560a835ef9845c36377f523ec2acf6f076824450
Parents: 5beaf8c
Author: Edgardo 
Authored: Fri Sep 23 11:45:10 2016 -0400
Committer: Andre F de Miranda 
Committed: Sat Sep 24 14:32:31 2016 +1000

--
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/560a835e/appveyor.yml
--
diff --git a/appveyor.yml b/appveyor.yml
index 9f979ea..342c9a1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,8 @@ install:
 )
 
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", 
"C:\maven")
   }
-  - cmd: SET PATH=C:\maven\apache-maven-3.1.1\bin;%JAVA_HOME%\bin;%PATH%
+  - cmd: SET M2_HOME=C:\maven\apache-maven-3.1.1
+  - cmd: SET PATH=%M2_HOME%\bin;%JAVA_HOME%\bin;%PATH%%
   - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
 build_script:

nifi git commit: [NIFI-2813] Fix for invalid M2_HOME directory

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/master 85a1f753a -> 56f7cd085


[NIFI-2813] Fix for invalid M2_HOME directory

This closes #1049

Signed-off-by: Andre F de Miranda 


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

Branch: refs/heads/master
Commit: 56f7cd085fbd043aa64d1626d4ba3e1377b59cbe
Parents: 85a1f75
Author: Edgardo 
Authored: Fri Sep 23 11:45:10 2016 -0400
Committer: Andre F de Miranda 
Committed: Sat Sep 24 14:30:40 2016 +1000

--
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/56f7cd08/appveyor.yml
--
diff --git a/appveyor.yml b/appveyor.yml
index 7b4fe1b..ed3a053 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,8 @@ install:
 )
 
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", 
"C:\maven")
   }
-  - cmd: SET PATH=C:\maven\apache-maven-3.1.1\bin;%JAVA_HOME%\bin;%PATH%
+  - cmd: SET M2_HOME=C:\maven\apache-maven-3.1.1
+  - cmd: SET PATH=%M2_HOME%\bin;%JAVA_HOME%\bin;%PATH%%
   - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
 build_script:

nifi-site git commit: Add myself to committers

[afucs]

Repository: nifi-site
Updated Branches:
  refs/heads/master 38becf59a -> 5355c8eee


Add myself to committers


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

Branch: refs/heads/master
Commit: 5355c8eee148f2218a540f42a904d6d36b4f44e8
Parents: 38becf5
Author: Andre F de Miranda 
Authored: Wed Sep 7 00:13:57 2016 +1000
Committer: Andre F de Miranda 
Committed: Sat Sep 24 00:38:42 2016 +1000

--
 src/pages/html/people.hbs | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/5355c8ee/src/pages/html/people.hbs
--
diff --git a/src/pages/html/people.hbs b/src/pages/html/people.hbs
index 9497956..11a8b2c 100644
--- a/src/pages/html/people.hbs
+++ b/src/pages/html/people.hbs
@@ -168,6 +168,11 @@ title: Apache NiFi Team
 Yolanda M. Davis
 
 
+
+    afucs
+Andre F de Miranda
+
+