nifi git commit: NIFI-2852 base64 expression language functions

2016-10-05 Thread jpercivall 
Repository: nifi
Updated Branches:
  refs/heads/master 6ad633d17 -> 6f1af31ff


NIFI-2852 base64 expression language functions

Signed-off-by: jpercivall 


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

Branch: refs/heads/master
Commit: 6f1af31ff28f60d0eddbee5dafe909bc66cc9c71
Parents: 6ad633d
Author: Joe N 
Authored: Mon Oct 3 18:16:14 2016 -0400
Committer: jpercivall 
Committed: Wed Oct 5 17:33:07 2016 -0400

--
 .../language/antlr/AttributeExpressionLexer.g   |  4 +-
 .../language/antlr/AttributeExpressionParser.g  |  4 +-
 .../output/AttributeExpressionLexer.tokens  |  2 +
 .../attribute/expression/language/Query.java| 12 +
 .../functions/Base64DecodeEvaluator.java| 55 
 .../functions/Base64EncodeEvaluator.java| 55 
 .../expression/language/TestQuery.java  | 16 ++
 .../asciidoc/expression-language-guide.adoc | 36 +
 8 files changed, 181 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/6f1af31f/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
--
diff --git 
a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
 
b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
index f91e6ab..8841375 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
+++ 
b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
@@ -127,6 +127,8 @@ UNESCAPE_XML : 'unescapeXml';
 UNESCAPE_CSV : 'unescapeCsv';
 UNESCAPE_HTML3 : 'unescapeHtml3';
 UNESCAPE_HTML4 : 'unescapeHtml4';
+BASE64_ENCODE : 'base64Encode';
+BASE64_DECODE : 'base64Decode';
 
 // 1 arg functions
 SUBSTRING_AFTER: 'substringAfter';
@@ -226,4 +228,4 @@ ESC
 ATTRIBUTE_NAME : (
  ~('$' | '{' | '}' | '(' | ')' | '[' | ']' | 
',' | ':' | ';' | '/' | '*' | '\'' | ' ' | '\t' | '\r' | '\n' | '0'..'9')
  ~('$' | '{' | '}' | '(' | ')' | '[' | ']' | 
',' | ':' | ';' | '/' | '*' | '\'' | ' ' | '\t' | '\r' | '\n')*
-);
+);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/6f1af31f/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
--
diff --git 
a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
 
b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
index 3f77190..01a0495 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
+++ 
b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g
@@ -73,7 +73,7 @@ tokens {
 }
 
 // functions that return Strings
-zeroArgString : (TO_UPPER | TO_LOWER | TRIM | TO_STRING | URL_ENCODE | 
URL_DECODE | ESCAPE_JSON | ESCAPE_XML | ESCAPE_CSV | ESCAPE_HTML3 | 
ESCAPE_HTML4 | UNESCAPE_JSON | UNESCAPE_XML | UNESCAPE_CSV | UNESCAPE_HTML3 | 
UNESCAPE_HTML4 ) LPAREN! RPAREN!;
+zeroArgString : (TO_UPPER | TO_LOWER | TRIM | TO_STRING | URL_ENCODE | 
URL_DECODE | BASE64_ENCODE | BASE64_DECODE | ESCAPE_JSON | ESCAPE_XML | 
ESCAPE_CSV | ESCAPE_HTML3 | ESCAPE_HTML4 | UNESCAPE_JSON | UNESCAPE_XML | 
UNESCAPE_CSV | UNESCAPE_HTML3 | UNESCAPE_HTML4 ) LPAREN! RPAREN!;
 oneArgString : ((SUBSTRING_BEFORE | SUBSTRING_BEFORE_LAST | SUBSTRING_AFTER | 
SUBSTRING_AFTER_LAST | REPLACE_NULL | REPLACE_EMPTY |
PREPEND | APPEND | FORMAT | STARTS_WITH | 
ENDS_WITH | CONTAINS | JOIN | JSON_PATH) LPAREN! anyArg RPAREN!) |
   (TO_RADIX LPAREN! anyArg (COMMA! anyArg)? RPAREN!);
@@ -138,4 +138,4 @@ expression : DOLLAR LBRACE attributeRefOrFunctionCall 
(COLON functionCall)* RBRA
^(EXPRESSION attributeRefOrFunctionCall functionCall*);
 
 query : expression EOF ->

nifi git commit: [NIFI-2838] update width of rule name and save message. This closes #1089

2016-10-05 Thread mcgilman 
Repository: nifi
Updated Branches:
  refs/heads/master da33e2859 -> 6ad633d17


[NIFI-2838] update width of rule name and save message. This closes #1089


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

Branch: refs/heads/master
Commit: 6ad633d17422f2110645553cb03ae3b364926eee
Parents: da33e28
Author: Scott Aslan 
Authored: Wed Oct 5 16:00:34 2016 -0400
Committer: Matt Gilman 
Committed: Wed Oct 5 16:40:06 2016 -0400

--
 .../src/main/webapp/css/common-ui.css   |  5 ++-
 .../src/main/webapp/WEB-INF/jsp/worksheet.jsp   |  3 +-
 .../src/main/webapp/css/main.css| 12 +--
 .../src/main/webapp/js/application.js   | 37 
 4 files changed, 37 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/6ad633d1/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css
index 9eac226..cf6a7a6 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css
@@ -208,7 +208,7 @@ input[type=text], input[type=password], textarea {
 border: 1px solid #eaeef0;
 font-family: Roboto, sans-serif;
 font-size: 13px;
-padding: 0px 0px 0px 10px;
+padding: 0px 10px 0px 10px;
 resize: none;
 height: 32px;
 width: 100%;
@@ -216,6 +216,9 @@ input[type=text], input[type=password], textarea {
 -moz-box-sizing: border-box; /* Firefox, other Gecko */
 box-sizing: border-box;
 color: #262626;
+white-space: nowrap;
+overflow: hidden;
+text-overflow: ellipsis;
 }
 
 input:focus, textarea:focus {

http://git-wip-us.apache.org/repos/asf/nifi/blob/6ad633d1/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
--
diff --git 
a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
 
b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
index 544d706..520b842 100644
--- 
a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
+++ 
b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
@@ -125,9 +125,8 @@
 
 
 
-Save
 
-
+Save
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/6ad633d1/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
--
diff --git 
a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
 
b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
index c56eafa..b5d315c 100644
--- 
a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
+++ 
b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/css/main.css
@@ -135,6 +135,7 @@ div.label {
 padding: 0px 10px;
 box-shadow: 0 1px 1px rgba(0,0,0,0.4);
 margin-bottom: 5px;
+display: flex;
 }
 
 #rule-list li.selected {
@@ -158,6 +159,7 @@ div.label {
 
 div.rule-label {
 float: left;
+flex-grow: 1;
 }
 
 div.remove-rule {
@@ -249,11 +251,14 @@ div.large-label-container {
 #message {
 color: #ba554a;
 margin-left: 20px;
-float: right;
 margin-right: 20px;
-line-height: 28px;
+line-height: 32px;
 font-size: 13px;
 font-weight: bold;
+flex-grow: 1;
+overflow: auto;
+width: 100%;
+height: 41px;
 }
 
 #message-and-save-container {
@@ -261,11 +266,12 @@ div.large-label-container {
 right: 0px;
 left: 0px;
 bottom: 0px;
+display: flex;
 }
 
 #selected-rule-save {
 margin-right: 20px;
-float: right;
+margin-top: 10px;
 }
 
 input.editor-text {

nifi git commit: NIFI-2398 - GetIgnite processor

2016-10-05 Thread pvillard 
Repository: nifi
Updated Branches:
  refs/heads/master e46fea920 -> da33e2859


NIFI-2398 - GetIgnite processor

This closes #721.


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

Branch: refs/heads/master
Commit: da33e2859ce45321d28901e5820c38a37dcfc709
Parents: e46fea9
Author: mans2singh 
Authored: Sun Jul 24 16:18:55 2016 -0700
Committer: Pierre Villard 
Committed: Wed Oct 5 22:31:01 2016 +0200

--
 .../ignite/AbstractIgniteProcessor.java |  30 +-
 .../cache/AbstractIgniteCacheProcessor.java |  35 +-
 .../processors/ignite/cache/GetIgniteCache.java | 117 ++
 .../processors/ignite/cache/PutIgniteCache.java |  41 +-
 .../org.apache.nifi.processor.Processor |   1 +
 .../ignite/cache/ITGetIgniteCache.java  | 184 +
 .../ignite/cache/ITPutIgniteCache.java  |  67 +++-
 .../ignite/cache/TestGetIgniteCache.java| 383 +++
 .../ignite/cache/TestPutIgniteCache.java|   9 +-
 9 files changed, 817 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/da33e285/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java
 
b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java
index 1feaf83..28b7b52 100644
--- 
a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java
+++ 
b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java
@@ -18,6 +18,8 @@
  */
 package org.apache.nifi.processors.ignite;
 
+import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.Ignition;
@@ -88,20 +90,28 @@ public abstract class AbstractIgniteProcessor extends 
AbstractProcessor  {
 public void initializeIgnite(ProcessContext context) {
 
 if ( getIgnite() != null ) {
-getLogger().warn("Ignite already initialized");
+getLogger().info("Ignite already initialized");
 return;
 }
 
-Ignition.setClientMode(true);
 
-String configuration = 
context.getProperty(IGNITE_CONFIGURATION_FILE).getValue();
-getLogger().info("Initializing ignite with configuration {} ", new 
Object[] { configuration });
-if ( StringUtils.isEmpty(configuration) ) {
-ignite = Ignition.start();
-} else {
-ignite = Ignition.start(configuration);
-}
+synchronized(Ignition.class) {
+List grids = Ignition.allGrids();
 
-}
+if ( grids.size() == 1 ) {
+getLogger().info("Ignite grid already available");
+ignite = grids.get(0);
+return;
+}
+Ignition.setClientMode(true);
 
+String configuration = 
context.getProperty(IGNITE_CONFIGURATION_FILE).getValue();
+getLogger().info("Initializing ignite with configuration {} ", new 
Object[] { configuration });
+if ( StringUtils.isEmpty(configuration) ) {
+ignite = Ignition.start();
+} else {
+ignite = Ignition.start(configuration);
+}
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/da33e285/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/cache/AbstractIgniteCacheProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/cache/AbstractIgniteCacheProcessor.java
 
b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/cache/AbstractIgniteCacheProcessor.java
index 8e1a7cb..ca6136c 100644
--- 
a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/cache/AbstractIgniteCacheProcessor.java
+++ 
b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/cache/AbstractIgniteCacheProcessor.java
@@ -18,12 +18,12 @@ package

nifi git commit: [NIFI-1794] Update .dialog-content to wrap text. This closes #1094

2016-10-05 Thread mcgilman 
Repository: nifi
Updated Branches:
  refs/heads/master c764f8350 -> e46fea920


[NIFI-1794] Update .dialog-content to wrap text. This closes #1094


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

Branch: refs/heads/master
Commit: e46fea920af11d2527f4eb4da3a191e309d12618
Parents: c764f83
Author: Scott Aslan 
Authored: Tue Oct 4 14:13:17 2016 -0400
Committer: Matt Gilman 
Committed: Wed Oct 5 16:15:11 2016 -0400

--
 .../nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/e46fea92/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
index 04cbedc..d998436 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
@@ -83,6 +83,7 @@
 left: 20px;
 right: 20px;
 overflow-y: auto;
+word-wrap: break-word;
 }
 
 .dialog-buttons {

[jira] [Updated] (MINIFI-117) Maintainable Configuration Versioning

2016-10-05 Thread Bryan Rosander (JIRA) 

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

Bryan Rosander updated MINIFI-117:
--
Description: 
In order to avoid a tangled web of if/else statements around every possible 
permutation of config.yml and an equally complicated validation routine, we 
need to utilize a versioning strategy that allows for specific parsing and 
validation code for each version of the ConfigSchema.

This will allow us to determine if a schema will be compatible with an older 
MiNiFi instance more easily by validating the structure of the file at a given 
version while still supporting an upconvert on read to the latest ConfigSchema 
while parsing at runtime.

It should also facilitate a deprecation strategy of removing older versions' 
classes without needing to touch current implementation

  was:
In order to avoid a tangled web of if/else statements around every possible 
permutation of config.yml and an equally complicated validation routine, we 
need to utilize a versioning strategy that allows for specific parsing and 
validation code for each version of the ConfigSchema.

This will allow us to determine if a schema will be compatible with an older 
MiNiFi instance more easily by validating the structure of the file at a given 
version while still supporting an upconvert on read to the latest ConfigSchema 
while parsing at runtime.


> Maintainable Configuration Versioning
> -
>
> Key: MINIFI-117
> URL: https://issues.apache.org/jira/browse/MINIFI-117
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>Reporter: Bryan Rosander
>Assignee: Bryan Rosander
>
> In order to avoid a tangled web of if/else statements around every possible 
> permutation of config.yml and an equally complicated validation routine, we 
> need to utilize a versioning strategy that allows for specific parsing and 
> validation code for each version of the ConfigSchema.
> This will allow us to determine if a schema will be compatible with an older 
> MiNiFi instance more easily by validating the structure of the file at a 
> given version while still supporting an upconvert on read to the latest 
> ConfigSchema while parsing at runtime.
> It should also facilitate a deprecation strategy of removing older versions' 
> classes without needing to touch current implementation



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Assigned] (MINIFI-117) Maintainable Configuration Versioning

2016-10-05 Thread Bryan Rosander (JIRA) 

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

Bryan Rosander reassigned MINIFI-117:
-

Assignee: Bryan Rosander

> Maintainable Configuration Versioning
> -
>
> Key: MINIFI-117
> URL: https://issues.apache.org/jira/browse/MINIFI-117
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>Reporter: Bryan Rosander
>Assignee: Bryan Rosander
>
> In order to avoid a tangled web of if/else statements around every possible 
> permutation of config.yml and an equally complicated validation routine, we 
> need to utilize a versioning strategy that allows for specific parsing and 
> validation code for each version of the ConfigSchema.
> This will allow us to determine if a schema will be compatible with an older 
> MiNiFi instance more easily by validating the structure of the file at a 
> given version while still supporting an upconvert on read to the latest 
> ConfigSchema while parsing at runtime.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Created] (MINIFI-117) Maintainable Configuration Versioning

2016-10-05 Thread Bryan Rosander (JIRA) 
Bryan Rosander created MINIFI-117:
-

 Summary: Maintainable Configuration Versioning
 Key: MINIFI-117
 URL: https://issues.apache.org/jira/browse/MINIFI-117
 Project: Apache NiFi MiNiFi
  Issue Type: Bug
Reporter: Bryan Rosander


In order to avoid a tangled web of if/else statements around every possible 
permutation of config.yml and an equally complicated validation routine, we 
need to utilize a versioning strategy that allows for specific parsing and 
validation code for each version of the ConfigSchema.

This will allow us to determine if a schema will be compatible with an older 
MiNiFi instance more easily by validating the structure of the file at a given 
version while still supporting an upconvert on read to the latest ConfigSchema 
while parsing at runtime.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

nifi git commit: [NIFI-1904] If open, close hamburger menu on window resize. This closes #1106

2016-10-05 Thread mcgilman 
Repository: nifi
Updated Branches:
  refs/heads/master 3b408f560 -> c764f8350


[NIFI-1904] If open, close hamburger menu on window resize. This closes #1106


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

Branch: refs/heads/master
Commit: c764f83506165c99e77c707e358cb327e9af16b8
Parents: 3b408f5
Author: Scott Aslan 
Authored: Wed Oct 5 11:46:48 2016 -0400
Committer: Matt Gilman 
Committed: Wed Oct 5 14:23:13 2016 -0400

--
 .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/c764f835/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
index 7ae1353..66c1c6f 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
@@ -479,6 +479,11 @@ nf.Canvas = (function () {
 // listen for browser resize events to reset the graph size
 $(window).on('resize', function (e) {
 if (e.target === window) {
+// close the hamburger menu if open
+if($('.md-menu-backdrop').is(':visible') === true){
+$('.md-menu-backdrop').click();
+}
+
 updateGraphSize();
 updateFlowStatusContainerSize();

[2/2] nifi git commit: NIFI-2816 - Clean typos across the code - Part 2. This closes #1085

2016-10-05 Thread mcgilman 
NIFI-2816 - Clean typos across the code - Part 2. This closes #1085


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

Branch: refs/heads/master
Commit: 3b408f560124efec40983eb218109afc4ba19c95
Parents: f157076
Author: Andre F de Miranda 
Authored: Sat Oct 1 23:08:49 2016 +1000
Committer: Matt Gilman 
Committed: Wed Oct 5 13:07:57 2016 -0400

--
 .../controller/ControllerServiceLookup.java |  2 +-
 .../org/apache/nifi/bootstrap/ShutdownHook.java |  2 +-
 .../expression/language/ValueLookup.java|  2 +-
 .../org/apache/nifi/hl7/query/TestHL7Query.java |  2 +-
 .../java/org/apache/nifi/io/nio/BufferPool.java | 10 ++--
 .../flowfile/attributes/CoreAttributes.java |  4 +-
 .../org/apache/nifi/web/util/ClientUtils.java   |  2 +-
 .../nifi/controller/repository/SwapSummary.java |  2 +-
 .../repository/claim/ResourceClaimManager.java  |  2 +-
 .../nifi/provenance/lineage/LineageNode.java|  2 +-
 .../java/org/apache/nifi/util/TestRunner.java   |  6 +--
 ...AbstractAWSCredentialsProviderProcessor.java |  2 +-
 .../processors/aws/AbstractAWSProcessor.java|  4 +-
 .../nifi/processors/aws/sqs/TestGetSQS.java |  2 +-
 .../nifi/processors/aws/sqs/TestPutSQS.java |  2 +-
 .../reporting/datadog/TestMetricsService.java   |  6 +--
 .../processors/evtx/parser/bxml/RootNode.java   |  4 +-
 .../parser/bxml/value/SignedDWordTypeNode.java  |  2 +-
 .../nifi/web/api/dto/RemoteProcessGroupDTO.java |  4 +-
 .../nifi/web/api/dto/ReportingTaskDTO.java  |  2 +-
 .../dto/provenance/ProvenanceResultsDTO.java|  2 +-
 .../status/ProcessGroupStatusSnapshotDTO.java   |  2 +-
 .../nifi/web/api/entity/InputPortsEntity.java   |  2 +-
 .../RemoteProcessGroupStatusSnapshotEntity.java |  2 +-
 .../http/StandardHttpResponseMerger.java|  2 +-
 .../ProvenanceQueryEndpointMerger.java  |  2 +-
 .../TestThreadPoolRequestReplicator.java|  2 +-
 .../nifi/web/revision/RevisionManager.java  |  2 +-
 .../apache/nifi/controller/TemplateUtils.java   |  2 +-
 .../manager/StandardStateManagerProvider.java   |  2 +-
 .../org/apache/nifi/util/ReflectionUtils.java   |  2 +-
 .../nifi/remote/HttpRemoteSiteListener.java |  8 ++--
 .../AbstractFlowFileServerProtocol.java | 18 
 .../StandardHttpFlowFileServerProtocol.java |  2 +-
 .../socket/SocketFlowFileServerProtocol.java|  2 +-
 .../apache/nifi/audit/AccessPolicyAuditor.java  |  2 +-
 .../nifi/audit/ControllerServiceAuditor.java|  2 +-
 .../org/apache/nifi/audit/ProcessorAuditor.java |  2 +-
 .../java/org/apache/nifi/audit/UserAuditor.java |  2 +-
 .../org/apache/nifi/audit/UserGroupAuditor.java |  2 +-
 .../nifi/web/StandardNiFiServiceFacade.java |  4 +-
 .../config/MutableRequestExceptionMapper.java   |  2 +-
 .../nifi/web/controller/ControllerFacade.java   |  6 +--
 .../org/apache/nifi/web/dao/TemplateDAO.java|  2 +-
 .../dao/impl/StandardControllerServiceDAO.java  |  2 +-
 .../accesscontrol/ITAccessTokenEndpoint.java|  2 +-
 .../nifi/web/ContentViewerController.java   |  2 +-
 .../apache/nifi/web/filter/CatchAllFilter.java  |  2 +-
 .../partials/provenance/provenance-content.jsp  |  4 +-
 .../webapp/js/nf/provenance/nf-provenance.js|  4 +-
 .../nifi/processors/hadoop/TestListHDFS.java|  2 +-
 .../hadoop/inotify/TestEventTypeValidator.java  | 12 ++---
 .../org/apache/nifi/hbase/AbstractPutHBase.java |  4 +-
 .../org/apache/nifi/hbase/TestPutHBaseCell.java | 16 +++
 .../apache/nifi/processors/hive/PutHiveQL.java  |  4 +-
 .../nifi/processors/hive/TestSelectHiveQL.java  |  2 +-
 .../org/apache/nifi/AbstractHTMLProcessor.java  |  2 +-
 .../processors/ignite/cache/PutIgniteCache.java |  4 +-
 .../ignite/cache/TestPutIgniteCache.java| 48 ++--
 .../jms/cf/JMSConnectionFactoryProvider.java|  2 +-
 .../apache/nifi/jms/processors/ConsumeJMS.java  |  2 +-
 .../kafka/pubsub/ConsumeKafka_0_10.java |  2 +-
 .../processors/kafka/pubsub/ConsumerLease.java  |  2 +-
 .../apache/nifi/processors/kafka/GetKafka.java  |  2 +-
 .../nifi/processors/kafka/KafkaUtils.java   |  2 +-
 .../apache/nifi/processors/kafka/PutKafka.java  |  4 +-
 .../kafka/GetKafkaIntegrationTests.java |  2 +-
 .../src/test/resources/server.properties|  2 +-
 .../processors/kafka/pubsub/ConsumeKafka.java   |  2 +-
 .../handler/TestLumberjackFrameHandler.java |  2 +-
 .../TestPersistentProvenanceRepository.java |  4 +-
 .../authorization/TestRangerNiFiAuthorizer.java |  8 ++--
 .../nifi/processors/twitter/TestGetTwitter.java | 10 ++--
 .../processors/standard/PutFileTransfer.java|  2 +-
 .../apache/nifi/processors/standard/PutSQL.java |  6

[1/2] nifi git commit: NIFI-2816 - Clean typos across the code - Part 2. This closes #1085

2016-10-05 Thread mcgilman 
Repository: nifi
Updated Branches:
  refs/heads/master f15707637 -> 3b408f560


http://git-wip-us.apache.org/repos/asf/nifi/blob/3b408f56/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestPutHBaseCell.java
--
diff --git 
a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestPutHBaseCell.java
 
b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestPutHBaseCell.java
index 2d9068f..ee6a53f 100644
--- 
a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestPutHBaseCell.java
+++ 
b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestPutHBaseCell.java
@@ -83,7 +83,7 @@ public class TestPutHBaseCell {
 final MockHBaseClientService hBaseClient = 
getHBaseClientService(runner);
 
 final String content = "some content";
-final Map attributes = 
getAtrributeMapWithEL(tableName, row, columnFamily, columnQualifier);
+final Map attributes = 
getAttributeMapWithEL(tableName, row, columnFamily, columnQualifier);
 runner.enqueue(content.getBytes("UTF-8"), attributes);
 
 runner.run();
@@ -144,7 +144,7 @@ public class TestPutHBaseCell {
 
 // this will go to success
 final String content2 = "some content2";
-final Map attributes = getAtrributeMapWithEL("table", 
"row", "cf", "cq");
+final Map attributes = getAttributeMapWithEL("table", 
"row", "cf", "cq");
 runner.enqueue(content2.getBytes("UTF-8"), attributes);
 
 runner.run();
@@ -167,11 +167,11 @@ public class TestPutHBaseCell {
 final MockHBaseClientService hBaseClient = 
getHBaseClientService(runner);
 
 final String content1 = "some content1";
-final Map attributes1 = 
getAtrributeMapWithEL(tableName, row1, columnFamily, columnQualifier);
+final Map attributes1 = 
getAttributeMapWithEL(tableName, row1, columnFamily, columnQualifier);
 runner.enqueue(content1.getBytes("UTF-8"), attributes1);
 
 final String content2 = "some content1";
-final Map attributes2 = 
getAtrributeMapWithEL(tableName, row2, columnFamily, columnQualifier);
+final Map attributes2 = 
getAttributeMapWithEL(tableName, row2, columnFamily, columnQualifier);
 runner.enqueue(content2.getBytes("UTF-8"), attributes2);
 
 runner.run();
@@ -205,11 +205,11 @@ public class TestPutHBaseCell {
 hBaseClient.setThrowException(true);
 
 final String content1 = "some content1";
-final Map attributes1 = 
getAtrributeMapWithEL(tableName, row1, columnFamily, columnQualifier);
+final Map attributes1 = 
getAttributeMapWithEL(tableName, row1, columnFamily, columnQualifier);
 runner.enqueue(content1.getBytes("UTF-8"), attributes1);
 
 final String content2 = "some content1";
-final Map attributes2 = 
getAtrributeMapWithEL(tableName, row2, columnFamily, columnQualifier);
+final Map attributes2 = 
getAttributeMapWithEL(tableName, row2, columnFamily, columnQualifier);
 runner.enqueue(content2.getBytes("UTF-8"), attributes2);
 
 runner.run();
@@ -230,7 +230,7 @@ public class TestPutHBaseCell {
 final MockHBaseClientService hBaseClient = 
getHBaseClientService(runner);
 
 final String content1 = "some content1";
-final Map attributes1 = 
getAtrributeMapWithEL(tableName, row, columnFamily, columnQualifier);
+final Map attributes1 = 
getAttributeMapWithEL(tableName, row, columnFamily, columnQualifier);
 runner.enqueue(content1.getBytes("UTF-8"), attributes1);
 
 final String content2 = "some content1";
@@ -299,7 +299,7 @@ public class TestPutHBaseCell {
 
 assertEquals(1, runner.getProvenanceEvents().size());
 }
-private Map getAtrributeMapWithEL(String tableName, String 
row, String columnFamily, String columnQualifier) {
+private Map getAttributeMapWithEL(String tableName, String 
row, String columnFamily, String columnQualifier) {
 final Map attributes1 = new HashMap<>();
 attributes1.put("hbase.tableName", tableName);
 attributes1.put("hbase.row", row);

http://git-wip-us.apache.org/repos/asf/nifi/blob/3b408f56/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveQL.java
--
diff --git 
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveQL.java

nifi git commit: NIFI-2828: Fix Hive NAR dependencies NIFI-2828: Added dependency on hadoop-client to Hive NAR

2016-10-05 Thread bbende 
Repository: nifi
Updated Branches:
  refs/heads/master 9a7c36dc1 -> f15707637


NIFI-2828: Fix Hive NAR dependencies
NIFI-2828: Added dependency on hadoop-client to Hive NAR

This closes #1075.

Signed-off-by: Bryan Bende 


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

Branch: refs/heads/master
Commit: f157076378abef2d4973a04a86f5dc867838fdc4
Parents: 9a7c36d
Author: Matt Burgess 
Authored: Tue Sep 27 19:51:49 2016 -0400
Committer: Bryan Bende 
Committed: Wed Oct 5 11:37:05 2016 -0400

--
 .../nifi-hive-bundle/nifi-hive-nar/pom.xml  |   5 -
 .../nifi-hive-processors/pom.xml| 135 +--
 2 files changed, 3 insertions(+), 137 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/f1570763/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/pom.xml 
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/pom.xml
index 4120a01..3f6b673 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/pom.xml
@@ -36,11 +36,6 @@
 nifi-hive-processors
 1.1.0-SNAPSHOT
 
-
-org.apache.nifi
-nifi-hadoop-libraries-nar
-nar
-
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/f1570763/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml 
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml
index f68d5a5..3d07b86 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml
@@ -38,104 +38,6 @@
 org.apache.hive
 hive-jdbc
 ${hive.version}
-
-
-org.apache.hadoop
-hadoop-common
-
-
-org.apache.hadoop
-hadoop-client
-
-
-org.xerial.snappy
-snappy-java
-
-
-com.thoughtworks.paranamer
-paranamer
-
-
-org.codehaus.jackson
-jackson-mapper-asl
-
-
-org.codehaus.jackson
-jackson-core-asl
-
-
-com.google.guava
-guava
-
-
-commons-logging
-commons-logging
-
-
-org.apache.commons
-commons-compress
-
-
-commons-codec
-commons-codec
-
-
-org.apache.avro
-avro
-
-
-org.apache.zookeeper
-zookeeper
-
-
-commons-lang
-commons-lang
-
-
-commons-cli
-commons-cli
-
-
-commons-collections
-commons-collections
-
-
-commons-io
-commons-io
-
-
-com.google.code.gson
-gson
-
-
-org.mortbay.jetty
-jetty
-
-
-org.mortbay.jetty
-jetty-util
-
-
-log4j
-log4j
-
-
-com.google.protobuf
-protobuf-java
-
-
-com.google.code.findbugs
-jsr305
-
-
-org.apache.curator
-curator-framework
-
-
-org.apache.curator
-curator-client
-
-

[2/2] nifi git commit: NIFI-1615 Removing Apache License header and adding exclusion for Pull Request template for RAT check as we cannot provide comments without cluttering PR dialog.

2016-10-05 Thread aldrin 
NIFI-1615 Removing Apache License header and adding exclusion for Pull Request 
template for RAT check as we cannot provide comments without cluttering PR 
dialog.

This closes #1103.

Signed-off-by: Aldrin Piri 


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

Branch: refs/heads/0.x
Commit: dce27fea96e79235f8ffd094255f77f9452f646c
Parents: 5d3f3c9
Author: Aldrin Piri 
Authored: Wed Oct 5 11:00:29 2016 -0400
Committer: Aldrin Piri 
Committed: Wed Oct 5 11:15:20 2016 -0400

--
 .github/PULL_REQUEST_TEMPLATE.md | 37 +++
 pom.xml  |  1 +
 2 files changed, 12 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/dce27fea/.github/PULL_REQUEST_TEMPLATE.md
--
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c57e0dc..108caee 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,43 +1,28 @@
-
-
 Thank you for submitting a contribution to Apache NiFi.
 
 In order to streamline the review of the contribution we ask you
 to ensure the following steps have been taken:
 
 ### For all changes:
-- [] Is there a JIRA ticket associated with this PR? Is it referenced 
+- [ ] Is there a JIRA ticket associated with this PR? Is it referenced 
  in the commit message?
 
-- [] Does your PR title start with NIFI- where  is the JIRA number you 
are trying to resolve? Pay particular attention to the hyphen "-" character.
+- [ ] Does your PR title start with NIFI- where  is the JIRA number 
you are trying to resolve? Pay particular attention to the hyphen "-" character.
 
-- [] Has your PR been rebased against the latest commit within the target 
branch (typically master)?
+- [ ] Has your PR been rebased against the latest commit within the target 
branch (typically master)?
 
-- [] Is your initial contribution a single, squashed commit?
+- [ ] Is your initial contribution a single, squashed commit?
 
 ### For code changes:
-- [] Have you ensured that the full suite of tests is executed via mvn 
-Pcontrib-check clean install at the root nifi folder?
-- [] Have you written or updated unit tests to verify your changes?
-- [] If adding new dependencies to the code, are these dependencies licensed 
in a way that is compatible for inclusion under ASF 2.0? 
-- [] If applicable, have you updated the LICENSE file, including the main 
LICENSE file under nifi-assembly?
-- [] If applicable, have you updated the NOTICE file, including the main 
NOTICE file found under nifi-assembly?
-- [] If adding new Properties, have you added .displayName in addition to 
.name (programmatic access) for each of the new properties?
+- [ ] Have you ensured that the full suite of tests is executed via mvn 
-Pcontrib-check clean install at the root nifi folder?
+- [ ] Have you written or updated unit tests to verify your changes?
+- [ ] If adding new dependencies to the code, are these dependencies licensed 
in a way that is compatible for inclusion under [ASF 
2.0](http://www.apache.org/legal/resolved.html#category-a)? 
+- [ ] If applicable, have you updated the LICENSE file, including the main 
LICENSE file under nifi-assembly?
+- [ ] If applicable, have you updated the NOTICE file, including the main 
NOTICE file found under nifi-assembly?
+- [ ] If adding new Properties, have you added .displayName in addition to 
.name (programmatic access) for each of the new properties?
 
 ### For documentation related changes:
-- [] Have you ensured that format looks appropriate for the output in which it 
is rendered?
+- [ ] Have you ensured that format looks appropriate for the output in which 
it is rendered?
 
 ### Note:
 Please ensure that once the PR is submitted, you check travis-ci for build 
issues and submit an update to your PR as soon as possible.

http://git-wip-us.apache.org/repos/asf/nifi/blob/dce27fea/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ac4f0c1..457cc94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1582,6 +1582,7 @@ language governing permissions and limitations under the 
License. -->
 nb-configuration.xml 
 nbactions.xml 
 DEPENDENCIES 
+.github/PULL_REQUEST_TEMPLATE.md

[1/2] nifi git commit: NIFI-1615 Removing Apache License header and adding exclusion for Pull Request template for RAT check as we cannot provide comments without cluttering PR dialog.

2016-10-05 Thread aldrin 
Repository: nifi
Updated Branches:
  refs/heads/0.x 5d3f3c9a9 -> dce27fea9
  refs/heads/master 7fd293f33 -> 9a7c36dc1


NIFI-1615 Removing Apache License header and adding exclusion for Pull Request 
template for RAT check as we cannot provide comments without cluttering PR 
dialog.

This closes #1103.

Signed-off-by: Aldrin Piri 


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

Branch: refs/heads/master
Commit: 9a7c36dc13477b688e68aeaf0a6d847c5dbbb465
Parents: 7fd293f
Author: Aldrin Piri 
Authored: Wed Oct 5 11:00:29 2016 -0400
Committer: Aldrin Piri 
Committed: Wed Oct 5 11:14:24 2016 -0400

--
 .github/PULL_REQUEST_TEMPLATE.md | 37 +++
 pom.xml  |  1 +
 2 files changed, 12 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/9a7c36dc/.github/PULL_REQUEST_TEMPLATE.md
--
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c57e0dc..108caee 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,43 +1,28 @@
-
-
 Thank you for submitting a contribution to Apache NiFi.
 
 In order to streamline the review of the contribution we ask you
 to ensure the following steps have been taken:
 
 ### For all changes:
-- [] Is there a JIRA ticket associated with this PR? Is it referenced 
+- [ ] Is there a JIRA ticket associated with this PR? Is it referenced 
  in the commit message?
 
-- [] Does your PR title start with NIFI- where  is the JIRA number you 
are trying to resolve? Pay particular attention to the hyphen "-" character.
+- [ ] Does your PR title start with NIFI- where  is the JIRA number 
you are trying to resolve? Pay particular attention to the hyphen "-" character.
 
-- [] Has your PR been rebased against the latest commit within the target 
branch (typically master)?
+- [ ] Has your PR been rebased against the latest commit within the target 
branch (typically master)?
 
-- [] Is your initial contribution a single, squashed commit?
+- [ ] Is your initial contribution a single, squashed commit?
 
 ### For code changes:
-- [] Have you ensured that the full suite of tests is executed via mvn 
-Pcontrib-check clean install at the root nifi folder?
-- [] Have you written or updated unit tests to verify your changes?
-- [] If adding new dependencies to the code, are these dependencies licensed 
in a way that is compatible for inclusion under ASF 2.0? 
-- [] If applicable, have you updated the LICENSE file, including the main 
LICENSE file under nifi-assembly?
-- [] If applicable, have you updated the NOTICE file, including the main 
NOTICE file found under nifi-assembly?
-- [] If adding new Properties, have you added .displayName in addition to 
.name (programmatic access) for each of the new properties?
+- [ ] Have you ensured that the full suite of tests is executed via mvn 
-Pcontrib-check clean install at the root nifi folder?
+- [ ] Have you written or updated unit tests to verify your changes?
+- [ ] If adding new dependencies to the code, are these dependencies licensed 
in a way that is compatible for inclusion under [ASF 
2.0](http://www.apache.org/legal/resolved.html#category-a)? 
+- [ ] If applicable, have you updated the LICENSE file, including the main 
LICENSE file under nifi-assembly?
+- [ ] If applicable, have you updated the NOTICE file, including the main 
NOTICE file found under nifi-assembly?
+- [ ] If adding new Properties, have you added .displayName in addition to 
.name (programmatic access) for each of the new properties?
 
 ### For documentation related changes:
-- [] Have you ensured that format looks appropriate for the output in which it 
is rendered?
+- [ ] Have you ensured that format looks appropriate for the output in which 
it is rendered?
 
 ### Note:
 Please ensure that once the PR is submitted, you check travis-ci for build 
issues and submit an update to your PR as soon as possible.

http://git-wip-us.apache.org/repos/asf/nifi/blob/9a7c36dc/pom.xml
--
diff --git a/pom.xml b/pom.xml
index cad5a24..497823b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1721,6 +1721,7 @@ language governing permissions and limitations under the 
License. -->
 nb-configuration.xml 
 nbactions.xml 
 DEPENDENCIES 
+.github/PULL_REQUEST_TEMPLATE.md

[1/2] nifi git commit: NIFI-1615 - Add GitHbub pull request template to address some of the reocurring PR mistakes

2016-10-05 Thread aldrin 
Repository: nifi
Updated Branches:
  refs/heads/0.x 4e6f9d396 -> 5d3f3c9a9
  refs/heads/master 75d0c74d2 -> 7fd293f33


NIFI-1615 - Add GitHbub pull request template to address some of the reocurring 
PR mistakes

Signed-off-by: Aldrin Piri 


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

Branch: refs/heads/master
Commit: 7fd293f3390ab4785bdbe53069ddffeee529a4ed
Parents: 75d0c74
Author: Andre F de Miranda 
Authored: Thu Oct 6 00:52:54 2016 +1100
Committer: Aldrin Piri 
Committed: Wed Oct 5 10:52:16 2016 -0400

--
 .github/PULL_REQUEST_TEMPLATE.md | 43 +++
 1 file changed, 43 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7fd293f3/.github/PULL_REQUEST_TEMPLATE.md
--
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000..c57e0dc
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,43 @@
+
+
+Thank you for submitting a contribution to Apache NiFi.
+
+In order to streamline the review of the contribution we ask you
+to ensure the following steps have been taken:
+
+### For all changes:
+- [] Is there a JIRA ticket associated with this PR? Is it referenced 
+ in the commit message?
+
+- [] Does your PR title start with NIFI- where  is the JIRA number you 
are trying to resolve? Pay particular attention to the hyphen "-" character.
+
+- [] Has your PR been rebased against the latest commit within the target 
branch (typically master)?
+
+- [] Is your initial contribution a single, squashed commit?
+
+### For code changes:
+- [] Have you ensured that the full suite of tests is executed via mvn 
-Pcontrib-check clean install at the root nifi folder?
+- [] Have you written or updated unit tests to verify your changes?
+- [] If adding new dependencies to the code, are these dependencies licensed 
in a way that is compatible for inclusion under ASF 2.0? 
+- [] If applicable, have you updated the LICENSE file, including the main 
LICENSE file under nifi-assembly?
+- [] If applicable, have you updated the NOTICE file, including the main 
NOTICE file found under nifi-assembly?
+- [] If adding new Properties, have you added .displayName in addition to 
.name (programmatic access) for each of the new properties?
+
+### For documentation related changes:
+- [] Have you ensured that format looks appropriate for the output in which it 
is rendered?
+
+### Note:
+Please ensure that once the PR is submitted, you check travis-ci for build 
issues and submit an update to your PR as soon as possible.

[jira] [Created] (MINIFI-116) Establish Travis CI integration for MiNiFi C++ build

2016-10-05 Thread Aldrin Piri (JIRA) 
Aldrin Piri created MINIFI-116:
--

 Summary: Establish Travis CI integration for MiNiFi C++ build
 Key: MINIFI-116
 URL: https://issues.apache.org/jira/browse/MINIFI-116
 Project: Apache NiFi MiNiFi
  Issue Type: Task
  Components: Build
Reporter: Aldrin Piri
Assignee: Aldrin Piri


It would be helpful to have Travis provide builds in at least a Linux 
environment initially.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

[jira] [Resolved] (MINIFI-11) C++ implementation of Site to Site

2016-10-05 Thread Aldrin Piri (JIRA) 

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

Aldrin Piri resolved MINIFI-11.
---
Resolution: Fixed

> C++ implementation of Site to Site
> --
>
> Key: MINIFI-11
> URL: https://issues.apache.org/jira/browse/MINIFI-11
> Project: Apache NiFi MiNiFi
>  Issue Type: Sub-task
>  Components: Data Transmission
>Reporter: Aldrin Piri
>Assignee: bqiu
>  Labels: native
> Fix For: 0.1.0
>
>
> In the spirit of reuse, it would also be advantageous to make a similar site 
> to site client library for the native implementation.  To that end, any 
> incompatibilities in terms of the serialization format should also be 
> established.  Given where NiFi is currently, we have flexibility in terms of 
> being able to make changes with the major release on the roadmap.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

2016-10-05 Thread 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
---

nifi git commit: NIFI-2858: - getSystemLoadAverage of OperatingSystemMXBean sometimes returns a negative value. - ProcessorLoadAverage sets -1.0. It added a defensive logic. - When load average is zer

2016-10-05 Thread mcgilman 
Repository: nifi
Updated Branches:
  refs/heads/master 44cc7e007 -> 2c907c63a


NIFI-2858:
- getSystemLoadAverage of OperatingSystemMXBean sometimes returns a negative 
value.
- ProcessorLoadAverage sets -1.0. It added a defensive logic.
- When load average is zero(load average: 0.00, 0.02, 0.04), systemLoad is zero.
- This closes #1091


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

Branch: refs/heads/master
Commit: 2c907c63af921a9968bafd87903c93fe732c692f
Parents: 44cc7e0
Author: Byunghwa Yun 
Authored: Tue Oct 4 15:24:42 2016 +0900
Committer: Matt Gilman 
Committed: Wed Oct 5 08:59:26 2016 -0400

--
 .../java/org/apache/nifi/cluster/manager/StatusMerger.java  | 9 -
 .../apache/nifi/diagnostics/SystemDiagnosticsFactory.java   | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/2c907c63/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
index 7ad9e84..38caba2 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
@@ -573,7 +573,14 @@ public class StatusMerger {
 target.setFreeNonHeapBytes(target.getFreeNonHeapBytes() + 
toMerge.getFreeNonHeapBytes());
 target.setMaxHeapBytes(target.getMaxHeapBytes() + 
toMerge.getMaxHeapBytes());
 target.setMaxNonHeapBytes(target.getMaxNonHeapBytes() + 
toMerge.getMaxNonHeapBytes());
-target.setProcessorLoadAverage(target.getProcessorLoadAverage() + 
toMerge.getProcessorLoadAverage());
+double systemLoad = target.getProcessorLoadAverage();
+double toMergeSystemLoad = toMerge.getProcessorLoadAverage();
+if (systemLoad >= 0 && toMergeSystemLoad >= 0) {
+systemLoad += toMergeSystemLoad;
+} else if (systemLoad < 0 && toMergeSystemLoad >= 0) {
+systemLoad = toMergeSystemLoad;
+}
+target.setProcessorLoadAverage(systemLoad);
 target.setTotalHeapBytes(target.getTotalHeapBytes() + 
toMerge.getTotalHeapBytes());
 target.setTotalNonHeapBytes(target.getTotalNonHeapBytes() + 
toMerge.getTotalNonHeapBytes());
 target.setTotalThreads(target.getTotalThreads() + 
toMerge.getTotalThreads());

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c907c63/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
index da3f603..24685e9 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
@@ -67,8 +67,10 @@ public class SystemDiagnosticsFactory {
 systemDiagnostics.setAvailableProcessors(os.getAvailableProcessors());
 
 final double systemLoad = os.getSystemLoadAverage();
-if (systemLoad > 0) {
+if (systemLoad >= 0) {
 systemDiagnostics.setProcessorLoadAverage(systemLoad);
+} else {
+systemDiagnostics.setProcessorLoadAverage(-1.0);
 }
 
 // get the database disk usage

nifi git commit: [NIFI-2864] Update when shell empties content. This closes #1096

2016-10-05 Thread mcgilman 
Repository: nifi
Updated Branches:
  refs/heads/master 4dbdfea5d -> 44cc7e007


[NIFI-2864] Update when shell empties content. This closes #1096


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

Branch: refs/heads/master
Commit: 44cc7e00728892a3025d7554ffd7df432b32b02e
Parents: 4dbdfea
Author: Scott Aslan 
Authored: Tue Oct 4 16:07:44 2016 -0400
Committer: Matt Gilman 
Committed: Wed Oct 5 08:14:15 2016 -0400

--
 .../nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/44cc7e00/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
index b5eaeb2..c51f03f 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
@@ -145,9 +145,6 @@ nf.Shell = (function () {
 if (content.length) {
 var shell = $('#shell');
 
-// remove the previous contents of the shell
-shell.empty();
-
 // get the parent of the content and detach it
 var parent = content.parent();
 content.detach();
@@ -166,6 +163,9 @@ nf.Shell = (function () {
 
 // detach the content and add it back to the parent
 content.hide().detach().appendTo(parent);
+
+// remove the previous contents of the shell
+shell.empty();
 });
 
 // hide the undock button