[nifi] Git Push Summary

2016-12-22 Thread jpercivall 
Repository: nifi
Updated Tags:  refs/tags/rel/nifi-1.1.1 [created] e26fa480e

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

2016-12-22 Thread jpercivall 
Modified: 
nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.EncryptContent/index.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.EncryptContent/index.html?rev=1775773=1775772=1775773=diff
==
--- 
nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.EncryptContent/index.html
 (original)
+++ 
nifi/site/trunk/docs/nifi-docs/components/org.apache.nifi.processors.standard.EncryptContent/index.html
 Thu Dec 22 23:17:45 2016
@@ -1 +1 @@
-EncryptContentDescription: Encrypts or 
Decrypts a FlowFile using either symmetric encryption with a password and 
randomly generated salt, or asymmetric encryption using a public and secret 
key.Additional 
Details...Tags: encryption, decryption, password, JCE, 
OpenPGP, PGP, GPGProperties: In the list below, the names of 
required properties appear in bold. Any other properties (not 
in bold) are considered optional. The table also indicates any default values, 
and whether a property is considered "sensitive", meaning that its value will 
be encrypted. Before entering a value in a sensitive property, ensure that the 
nifi.properties file has an entry for the property 
nifi.sensitive.props.
 key.NameDefault 
ValueAllowable ValuesDescriptionModeEncryptEncryptDecryptSpecifies whether the content should be encrypted or 
decryptedKey Derivation 
FunctionBCRYPTNiFi Legacy KDF OpenSSL EVP_BytesToKey Bcrypt Scrypt PBKDF2 src="../../html/images/iconInfo.png" alt="PBKDF2 with configurable hash 
 >function and iteration count. See Admin Guide" title="PBKDF2 with 
 >configurable hash function and iteration count. See Admin 
 >Guide">None title="The cipher is given a raw key conforming to the algorithm 
 >specifications">Specifies the key 
 >derivation function to generate the key from the password (and 
 >salt)Encryption 
 >AlgorithmMD5_128AESid="allowable-values">MD5_128AES src="../../html/images/iconInfo.png" alt="org.apache.nifi.securi
 ty.util.EncryptionMethod@3db432c2[Algorithm 
name=PBEWITHMD5AND128BITAES-CBC-OPENSSL,Requires unlimited strength JCE 
policy=false,Algorithm Provider=BC,Compatible with strong KDFs=false,Keyed 
cipher=false]" 
title="org.apache.nifi.security.util.EncryptionMethod@3db432c2[Algorithm 
name=PBEWITHMD5AND128BITAES-CBC-OPENSSL,Requires unlimited strength JCE 
policy=false,Algorithm Provider=BC,Compatible with strong KDFs=false,Keyed 
cipher=false]">MD5_192AES MD5_256AES MD5_DES MD5_RC2 SHA1_RC2 SHA1_DES SHA_128AES SHA_192AES SHA_256AES SHA_40RC2 SHA_128RC2 SHA_40RC4 SHA_128RC4 SHA256_128AES SHA256_192AES SHA256_256AES SHA_2KEYTRIPLEDES SHA_3KEYTRIPLE
 DES SHA_TWOFISH PGP PGP_ASCII_ARMOR AES_CBC AES_CTR AES_GCM The 
Encry
 ption Algorithm to useAllow insecure 
cryptographic modesnot-allowedAllowed Not Allowed Overrides the default 
behavior to prevent unsafe combinations of encryption algorithms and short 
passwords on JVMs with limited strength cryptographic jurisdiction 
policiesPasswordThe 
Password to use for encrypting or decrypting the dataSensitive 
Property: trueRaw Key 
(hexadecimal)In keyed encryption, this is 
the raw key, encoded in hexadecimalSensitive Property: 
truePublic Keyring FileIn 
a PGP encrypt mode, this keyring contains the public key of the 
recipientPublic Key User Idid="description">In a PGP encrypt mode, this user id of the 
 >recipientPrivate Keyring Fileid="default-value">id="description">In a PGP decrypt mode, this keyring contains the private key 
 >of the recipientPrivate Keyring 
 >Passphraseid="description">In a PGP decrypt mode, this is the private keyring 
 >passphraseSensitive Property: 
 >trueRelationships: id="relationships">NameDescriptionsuccessAny
 > FlowFile that is successfully encrypted or decrypted will be routed to 
 >successfailureAny FlowFile that cannot be 
 >encrypted or decrypted will be routed to failureReads 
 >Attributes: None specified.Writes Attributes:
  None specified.State management: This processor has no state 
management.Restricted: 
\ No newline at end of file
+EncryptContentDescription: Encrypts or 
Decrypts a FlowFile using either symmetric encryption with a password and 
randomly generated salt, or asymmetric encryption using a public and secret 
key.Additional 
Details...Tags: encryption, decryption, password, JCE, 
OpenPGP, PGP, GPGProperties: In the list below, the names of 
required properties appear in bold. Any other properties (not 
in bold) are considered optional. The table also indicates any default values, 
and whether a property is considered "sensitive", meaning that its value will 
be encrypted. Before entering a value in a sensitive property, ensure that the 
nifi.properties file has an entry for the property 
nifi.sensitive.props.
 key.NameDefault 
ValueAllowable ValuesDescriptionModeEncryptEncryptDecryptSpecifies whether the content should be encrypted or 
decryptedKey

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

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

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

Modified:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2016-12-22 Thread jpercivall 
Repository: nifi-site
Updated Branches:
  refs/heads/master 6ababb766 -> 43105fd88


NIFI-3203 Chaning download page for release 1.1.1


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

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

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


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

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

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

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

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

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

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

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

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

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

Log:
Removing 1.1.0 with the release of 1.1.1

Removed:
release/nifi/1.1.0/

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

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

Log:
NIFI-3203

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

[jira] [Updated] (MINIFI-173) Upgrade to logback 1.1.9 when available

2016-12-22 Thread Joseph Percivall (JIRA) 

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

Joseph Percivall updated MINIFI-173:

Description: 
Due to this regression[1] in 1.1.8, the logback logs are printed to the command 
line when using SizeAndTimeBasedRollingPolicy and we use 
SizeAndTimeBasedRollingPolicy in our default config.

http://jira.qos.ch/projects/LOGBACK/versions/11410

[1] http://jira.qos.ch/browse/LOGBACK-1236

  was:
Due to this regression[1] in 1.1.8, the logback logs are printed to the command 
line when using SizeAndTimeBasedRollingPolicy and we use 
SizeAndTimeBasedRollingPolicy in our default config.


[1] http://jira.qos.ch/browse/LOGBACK-1236


> Upgrade to logback 1.1.9 when available
> ---
>
> Key: MINIFI-173
> URL: https://issues.apache.org/jira/browse/MINIFI-173
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>Reporter: Joseph Percivall
>
> Due to this regression[1] in 1.1.8, the logback logs are printed to the 
> command line when using SizeAndTimeBasedRollingPolicy and we use 
> SizeAndTimeBasedRollingPolicy in our default config.
> http://jira.qos.ch/projects/LOGBACK/versions/11410
> [1] http://jira.qos.ch/browse/LOGBACK-1236



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

nifi git commit: [NIFI-96] add align horizontal and align vertical capability to components on the canvas. This closes #1354

2016-12-22 Thread mcgilman 
Repository: nifi
Updated Branches:
  refs/heads/master e65aad8fe -> 5ea17d30c


[NIFI-96] add align horizontal and align vertical capability to components on 
the canvas. This closes #1354


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

Branch: refs/heads/master
Commit: 5ea17d30c5858fd9e56498e01a6cbd9fa3423c73
Parents: e65aad8
Author: Scott Aslan 
Authored: Thu Dec 22 16:06:38 2016 -0500
Committer: Matt Gilman 
Committed: Thu Dec 22 16:47:34 2016 -0500

--
 .../src/main/webapp/css/common-ui.css   |   5 +
 .../src/main/webapp/js/nf/canvas/nf-actions.js  | 148 -
 .../main/webapp/js/nf/canvas/nf-canvas-utils.js |  28 ++
 .../main/webapp/js/nf/canvas/nf-context-menu.js |  15 +-
 .../main/webapp/js/nf/canvas/nf-draggable.js| 297 ++-
 5 files changed, 353 insertions(+), 140 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/5ea17d30/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 a0f6af7..e871537 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
@@ -97,6 +97,11 @@ i[class^="icon-"]:before, i[class*=" icon-"]:before {
 margin: -2px;
 }
 
+/*shift rotated font awesome icons*/
+.fa-rotate-90 {
+left: -2px !important;
+}
+
 body {
 display: block;
 font-family: Roboto, sans-serif;

http://git-wip-us.apache.org/repos/asf/nifi/blob/5ea17d30/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index a9c05b8..b27e291 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -75,6 +75,13 @@ nf.Actions = (function () {
 });
 };
 
+// determine if the source of this connection is part of the selection
+var isSourceSelected = function (connection, selection) {
+return selection.filter(function (d) {
+return 
nf.CanvasUtils.getConnectionSourceComponentId(connection) === d.id;
+}).size() > 0;
+};
+
 return {
 /**
  * Initializes the actions.
@@ -867,7 +874,7 @@ nf.Actions = (function () {
 
 // refresh the birdseye
 nf.Birdseye.refresh();
-
+
 // inform Angular app values have changed
 nf.ng.Bridge.digest();
 }).fail(nf.Common.handleAjaxError);
@@ -1095,6 +1102,145 @@ nf.Actions = (function () {
 },
 
 /**
+ * Aligns the components in the specified selection vertically along 
the center of the components.
+ *
+ * @param {array} selection  The selection
+ */
+alignVertical: function (selection) {
+var updates = d3.map();
+// ensure every component is writable
+if (nf.CanvasUtils.canModify(selection) === false) {
+nf.Dialog.showOkDialog({
+headerText: 'Component Position',
+dialogContent: 'Must be authorized to modify every 
component selected.'
+});
+return;
+}
+// determine the extent
+var minX = null, maxX = null;
+selection.each(function (d) {
+if (d.type !== "Connection") {
+if (minX === null || d.position.x < minX) {
+minX = d.position.x;
+}
+var componentMaxX = d.position.x + d.dimensions.width;
+if (maxX === null || componentMaxX > maxX) {
+

[jira] [Created] (MINIFI-173) Upgrade to logback 1.1.9 when available

2016-12-22 Thread Joseph Percivall (JIRA) 
Joseph Percivall created MINIFI-173:
---

 Summary: Upgrade to logback 1.1.9 when available
 Key: MINIFI-173
 URL: https://issues.apache.org/jira/browse/MINIFI-173
 Project: Apache NiFi MiNiFi
  Issue Type: Improvement
Reporter: Joseph Percivall


Due to this regression[1] in 1.1.8, the logback logs are printed to the command 
line when using SizeAndTimeBasedRollingPolicy and we use 
SizeAndTimeBasedRollingPolicy in our default config.


[1] http://jira.qos.ch/browse/LOGBACK-1236



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

[jira] [Commented] (MINIFI-128) NPE if nifi.minifi.notifier.file.config.path wasn't configured

2016-12-22 Thread ASF GitHub Bot (JIRA) 

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

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

Github user asfgit closed the pull request at:

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


> NPE if nifi.minifi.notifier.file.config.path wasn't configured
> --
>
> Key: MINIFI-128
> URL: https://issues.apache.org/jira/browse/MINIFI-128
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>  Components: Agent Configuration/Installation
>Affects Versions: 0.0.1
> Environment: current master branch build
>Reporter: Andrew Grande
>Assignee: Aldrin Piri
>Priority: Minor
> Fix For: 0.2.0
>
>
> When enabling a FileChangeNotifier, it's easy to forget uncommenting the 
> *nifi.minifi.notifier.file.config.path* property (required). Minifi restart 
> will throw an unfriendly error:
> {noformat}
> Exception in thread "main" java.lang.IllegalArgumentException: Property, 
> nifi.minifi.notifier.file.config.path, for the path of the config file must 
> be specified.
> at 
> org.apache.nifi.minifi.bootstrap.configuration.notifiers.FileChangeNotifier.initialize(FileChangeNotifier.java:154)
> at 
> org.apache.nifi.minifi.bootstrap.RunMiNiFi.initializeNotifiers(RunMiNiFi.java:1452)
> at 
> org.apache.nifi.minifi.bootstrap.RunMiNiFi.start(RunMiNiFi.java:1116)
> at org.apache.nifi.minifi.bootstrap.RunMiNiFi.main(RunMiNiFi.java:224)
> Initiating shutdown of bootstrap change notifiers...
> Exception in thread "Thread-2" java.lang.NullPointerException
> at 
> java.util.Collections$UnmodifiableCollection.(Collections.java:1026)
> at java.util.Collections$UnmodifiableSet.(Collections.java:1128)
> at java.util.Collections.unmodifiableSet(Collections.java:1118)
> at 
> org.apache.nifi.minifi.bootstrap.RunMiNiFi.getChangeNotifiers(RunMiNiFi.java:1438)
> at 
> org.apache.nifi.minifi.bootstrap.ShutdownHook.run(ShutdownHook.java:57)
> {noformat}
> Expected: improve the error message to be meaningful and suggest the user 
> configure the property. No stacktrace, as we know what's going on exactly.



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

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

2016-12-22 Thread jpercivall 
Repository: nifi-minifi
Updated Branches:
  refs/heads/master 2fcf5ec60 -> a2f6e9d8c


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

This closes #68

Signed-off-by: Joseph Percivall 


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

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

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


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

[jira] [Commented] (MINIFI-172) "NIFI_VERSION" variable in ConfigTransformer is still set to 1.0.0

2016-12-22 Thread ASF GitHub Bot (JIRA) 

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

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

Github user asfgit closed the pull request at:

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


> "NIFI_VERSION" variable in ConfigTransformer is still set to 1.0.0
> --
>
> Key: MINIFI-172
> URL: https://issues.apache.org/jira/browse/MINIFI-172
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>Affects Versions: 0.1.0
>Reporter: Joseph Percivall
>Assignee: Joseph Percivall
>Priority: Trivial
> Fix For: 0.2.0
>
>
> When updating the underlying dependencies to nifi-1.1.0, the variable in 
> ConfigTransformer[1] wasn't updated
> [1] 
> https://github.com/apache/nifi-minifi/blob/94869042fdfeec21d0fbcc4b4c18886464972b05/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java#L83-L83



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

[jira] [Updated] (MINIFI-172) "NIFI_VERSION" variable in ConfigTransformer is still set to 1.0.0

2016-12-22 Thread Aldrin Piri (JIRA) 

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

Aldrin Piri updated MINIFI-172:
---
Fix Version/s: 0.2.0

> "NIFI_VERSION" variable in ConfigTransformer is still set to 1.0.0
> --
>
> Key: MINIFI-172
> URL: https://issues.apache.org/jira/browse/MINIFI-172
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>Affects Versions: 0.1.0
>Reporter: Joseph Percivall
>Assignee: Joseph Percivall
>Priority: Trivial
> Fix For: 0.2.0
>
>
> When updating the underlying dependencies to nifi-1.1.0, the variable in 
> ConfigTransformer[1] wasn't updated
> [1] 
> https://github.com/apache/nifi-minifi/blob/94869042fdfeec21d0fbcc4b4c18886464972b05/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java#L83-L83



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

nifi-minifi git commit: MINIFI-172 Updating last remanents of the 1.1.0 upgrade

2016-12-22 Thread aldrin 
Repository: nifi-minifi
Updated Branches:
  refs/heads/master 4514a04fb -> 2fcf5ec60


MINIFI-172 Updating last remanents of the 1.1.0 upgrade

This closes #69.

Signed-off-by: Aldrin Piri 


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

Branch: refs/heads/master
Commit: 2fcf5ec60dec050324fa364301fcc8c773c58d8a
Parents: 4514a04
Author: Joseph Percivall 
Authored: Thu Dec 22 13:16:37 2016 -0500
Committer: Aldrin Piri 
Committed: Thu Dec 22 15:12:46 2016 -0500

--
 .../nifi/minifi/bootstrap/util/ConfigTransformer.java|  2 +-
 .../minifi-framework-bundle/minifi-framework-nar/pom.xml |  1 -
 pom.xml  | 11 ---
 3 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/2fcf5ec6/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
--
diff --git 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
index b724019..9c963f5 100644
--- 
a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
+++ 
b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
@@ -80,7 +80,7 @@ import java.util.zip.GZIPOutputStream;
 
 public final class ConfigTransformer {
 // Underlying version of NIFI will be using
-public static final String NIFI_VERSION = "1.0.0";
+public static final String NIFI_VERSION = "1.1.0";
 public static final String ROOT_GROUP = "Root-Group";
 public static final String DEFAULT_PROV_REPORTING_TASK_CLASS = 
"org.apache.nifi.reporting.SiteToSiteProvenanceReportingTask";
 

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/2fcf5ec6/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
--
diff --git 
a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml 
b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
index 8a161a8..c16e97b 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
@@ -69,7 +69,6 @@ limitations under the License.
 org.apache.nifi
 nifi-security
 compile
-1.0.0
 
 
 org.eclipse.jetty

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/2fcf5ec6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fc3271b..6948836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -545,9 +545,9 @@ limitations under the License.
 ${org.apache.nifi.version}
 
 
-commons-io
-commons-io
-2.5
+org.apache.nifi
+nifi-security
+${org.apache.nifi.version}
 
 
 org.apache.nifi
@@ -620,6 +620,11 @@ limitations under the License.
 
 
 
+commons-io
+commons-io
+2.5
+
+
 org.apache.commons
 commons-compress
 1.11

nifi git commit: NIFI-2994: - Setting the default position for remote process groups.

2016-12-22 Thread ymdavis 
Repository: nifi
Updated Branches:
  refs/heads/master acc9e0b45 -> e65aad8fe


NIFI-2994: - Setting the default position for remote process groups.

Signed-off-by: Yolanda M. Davis 

This closes #1303


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

Branch: refs/heads/master
Commit: e65aad8fe61a806540d13a91e06bfdf22c51bf2f
Parents: acc9e0b
Author: Matt Gilman 
Authored: Mon Nov 7 11:58:27 2016 -0500
Committer: Yolanda M. Davis 
Committed: Thu Dec 22 14:39:56 2016 -0500

--
 .../nifi/remote/StandardRemoteProcessGroup.java |  2 +-
 .../apache/nifi/web/api/ConnectionResource.java | 11 
 .../org/apache/nifi/web/api/FunnelResource.java |  8 +++
 .../apache/nifi/web/api/InputPortResource.java  |  8 +++
 .../org/apache/nifi/web/api/LabelResource.java  |  8 +++
 .../apache/nifi/web/api/OutputPortResource.java |  8 +++
 .../nifi/web/api/ProcessGroupResource.java  | 67 
 .../apache/nifi/web/api/ProcessorResource.java  |  8 +++
 .../web/api/RemoteProcessGroupResource.java |  8 +++
 9 files changed, 127 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/e65aad8f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
index 1fd4d32..855dab7 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
@@ -95,7 +95,7 @@ public class StandardRemoteProcessGroup implements 
RemoteProcessGroup {
 private final NiFiProperties nifiProperties;
 
 private final AtomicReference name = new AtomicReference<>();
-private final AtomicReference position = new AtomicReference<>();
+private final AtomicReference position = new 
AtomicReference<>(new Position(0D, 0D));
 private final AtomicReference comments = new AtomicReference<>();
 private final AtomicReference processGroup;
 private final AtomicBoolean transmitting = new AtomicBoolean(false);

http://git-wip-us.apache.org/repos/asf/nifi/blob/e65aad8f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
index cf6aada..4527e87 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
@@ -33,6 +33,7 @@ import org.apache.nifi.connectable.ConnectableType;
 import org.apache.nifi.web.NiFiServiceFacade;
 import org.apache.nifi.web.Revision;
 import org.apache.nifi.web.api.dto.ConnectionDTO;
+import org.apache.nifi.web.api.dto.PositionDTO;
 import org.apache.nifi.web.api.entity.ConnectionEntity;
 import org.apache.nifi.web.api.request.ClientIdParameter;
 import org.apache.nifi.web.api.request.LongParameter;
@@ -51,6 +52,7 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -214,6 +216,15 @@ public class ConnectionResource extends 
ApplicationResource {
 }
 }
 
+final List proposedBends = requestConnection.getBends();
+if (proposedBends != null) {
+for (final PositionDTO proposedBend : proposedBends) {
+if (proposedBend.getX() == null || proposedBend.getY() == 
null) {
+throw new IllegalArgumentException("The x and y coordinate 
of the each bend must be specified.");
+}
+}
+

[jira] [Commented] (MINIFI-172) "NIFI_VERSION" variable in ConfigTransformer is still set to 1.0.0

2016-12-22 Thread ASF GitHub Bot (JIRA) 

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

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

GitHub user JPercivall opened a pull request:

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

MINIFI-172 Updating last remanents of the 1.1.0 upgrade



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

$ git pull https://github.com/JPercivall/nifi-minifi MINIFI-172

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

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

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

This closes #69


commit 7046160cb322902c103f50700ed508ccf09f9fd6
Author: Joseph Percivall 
Date:   2016-12-22T18:16:37Z

MINIFI-172 Updating last remanents of the 1.1.0 upgrade




> "NIFI_VERSION" variable in ConfigTransformer is still set to 1.0.0
> --
>
> Key: MINIFI-172
> URL: https://issues.apache.org/jira/browse/MINIFI-172
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>Affects Versions: 0.1.0
>Reporter: Joseph Percivall
>Assignee: Joseph Percivall
>Priority: Trivial
>
> When updating the underlying dependencies to nifi-1.1.0, the variable in 
> ConfigTransformer[1] wasn't updated
> [1] 
> https://github.com/apache/nifi-minifi/blob/94869042fdfeec21d0fbcc4b4c18886464972b05/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java#L83-L83



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

[jira] [Created] (MINIFI-172) "NIFI_VERSION" variable in ConfigTransformer is still set to 1.0.0

2016-12-22 Thread Joseph Percivall (JIRA) 
Joseph Percivall created MINIFI-172:
---

 Summary: "NIFI_VERSION" variable in ConfigTransformer is still set 
to 1.0.0
 Key: MINIFI-172
 URL: https://issues.apache.org/jira/browse/MINIFI-172
 Project: Apache NiFi MiNiFi
  Issue Type: Bug
Affects Versions: 0.1.0
Reporter: Joseph Percivall
Assignee: Joseph Percivall
Priority: Trivial


When updating the underlying dependencies to nifi-1.1.0, the variable in 
ConfigTransformer[1] wasn't updated

[1] 
https://github.com/apache/nifi-minifi/blob/94869042fdfeec21d0fbcc4b4c18886464972b05/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java#L83-L83



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

nifi git commit: NIFI-2967: - Disabling the Add button in the new Processor, Controller Service, and Reporting Task dialog when no components match the filter. This closes #1340

2016-12-22 Thread scottyaslan 
Repository: nifi
Updated Branches:
  refs/heads/master 908e7d313 -> acc9e0b45


NIFI-2967:
- Disabling the Add button in the new Processor, Controller Service, and 
Reporting Task dialog when no components match the filter.
This closes #1340


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

Branch: refs/heads/master
Commit: acc9e0b45ca726a6dc5f4725336a5d6d1fb9ff5d
Parents: 908e7d3
Author: Matt Gilman 
Authored: Mon Dec 19 15:59:39 2016 -0500
Committer: Scott Aslan 
Committed: Thu Dec 22 11:52:20 2016 -0500

--
 .../js/nf/canvas/header/components/nf-ng-processor-component.js | 5 -
 .../src/main/webapp/js/nf/canvas/nf-controller-services.js  | 5 -
 .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js | 5 -
 3 files changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/acc9e0b4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js
index c96bab4..21e76f5 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js
@@ -37,6 +37,9 @@ nf.ng.ProcessorComponent = function (serviceProvider) {
 });
 processorTypesData.refresh();
 
+// update the buttons to possibly trigger the disabled state
+$('#new-processor-dialog').modal('refreshButtons');
+
 // update the selection if possible
 if (processorTypesData.getLength() > 0) {
 processorTypesGrid.setSelectedRows([0]);
@@ -593,7 +596,7 @@ nf.ng.ProcessorComponent = function (serviceProvider) {
 var item = grid.getDataItem(selected[0]);
 return isSelectable(item) === false;
 } else {
-return false;
+return grid.getData().getLength() === 0;
 }
 },
 handler: {

http://git-wip-us.apache.org/repos/asf/nifi/blob/acc9e0b4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
index 9473978..2d378bd 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
@@ -74,6 +74,9 @@ nf.ControllerServices = (function () {
 });
 controllerServiceTypesData.refresh();
 
+// update the buttons to possibly trigger the disabled state
+$('#new-controller-service-dialog').modal('refreshButtons');
+
 // update the selection if possible
 if (controllerServiceTypesData.getLength() > 0) {
 controllerServiceTypesGrid.setSelectedRows([0]);
@@ -908,7 +911,7 @@ nf.ControllerServices = (function () {
 var item = grid.getDataItem(selected[0]);
 return isSelectable(item) === false;
 } else {
-return false;
+return grid.getData().getLength() === 0;
 }
 },
 handler: {

http://git-wip-us.apache.org/repos/asf/nifi/blob/acc9e0b4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
--
diff --git

[1/3] nifi git commit: NIFI-2585: Add attributes to track where a flow file came from when receiving over site-to-site

2016-12-22 Thread bbende 
Repository: nifi
Updated Branches:
  refs/heads/master 44c9ea0a6 -> 908e7d313


NIFI-2585: Add attributes to track where a flow file came from when receiving 
over site-to-site

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

Branch: refs/heads/master
Commit: 28e5d85493e43a6df7ec7f39657373734cb162ed
Parents: 44c9ea0
Author: Randy Gelhausen 
Authored: Wed Dec 7 02:18:09 2016 -0500
Committer: Bryan Bende 
Committed: Thu Dec 22 10:59:55 2016 -0500

--
 .../nifi/remote/protocol/AbstractFlowFileServerProtocol.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/28e5d854/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/AbstractFlowFileServerProtocol.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/AbstractFlowFileServerProtocol.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/AbstractFlowFileServerProtocol.java
index 2ba87a2..e149481 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/AbstractFlowFileServerProtocol.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/AbstractFlowFileServerProtocol.java
@@ -506,6 +506,12 @@ public abstract class AbstractFlowFileServerProtocol 
implements ServerProtocol {
 throw new ProtocolException(this + " Received unexpected 
Response Code from peer " + peer + " : " + confirmTransactionResponse + "; 
expected 'Confirm Transaction' Response Code");
 }
 
+// For routing purposes, downstream consumers often need to reference 
Flowfile's originating system
+for (FlowFile flowFile : transaction.getFlowFilesSent()){
+  flowFile = session.putAttribute(flowFile, "remote.host", 
peer.getHost());
+  flowFile = session.putAttribute(flowFile, "remote.address", 
peer.getHost() + ":" + peer.getPort());
+}
+
 // Commit the session so that we have persisted the data
 session.commit();

[3/3] nifi git commit: NIFI-2585: Add attributes to track s2s host and port

2016-12-22 Thread bbende 
NIFI-2585: Add attributes to track s2s host and port

- Removed host and port field from Peer since the same information is
  available in PeerDescription
- Refactored variable names in SocketRemoteSiteListener to improve readability
- Changed how SocketRemoteSiteListener constructs PeerDescription
  instance. It used to use hard-coded 'localhost' as hostname, and
  getPort() which returns server's port. Since the peer is a remote peer,
  i.e the client, it should be client hostname and port.
- Added hostname resolution at DataTransferResource to make s2s.host
  value consistent with RAW transport. Without this, RAW uses hostname
  while HTTP uses IP address. It will be hard to be used from downstream flows.
- Replaced heavy use of mockito which was difficult to maintain, with
  nifi-mock
- Added SiteToSiteAttributes and more assertions in unit tests

This closes #1342.

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

Branch: refs/heads/master
Commit: 908e7d3131908671d7e7df4b4aa4a29a9ec91694
Parents: f7d761a
Author: Koji Kawamura 
Authored: Tue Dec 20 11:19:22 2016 +0900
Committer: Bryan Bende 
Committed: Thu Dec 22 11:00:00 2016 -0500

--
 .../main/java/org/apache/nifi/remote/Peer.java  |  11 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|   4 +-
 .../nifi/remote/SocketRemoteSiteListener.java   |  14 +-
 .../remote/TestStandardRemoteGroupPort.java | 171 +
 .../http/TestHttpFlowFileServerProtocol.java| 369 +--
 .../nifi/web/api/DataTransferResource.java  |  11 +-
 6 files changed, 308 insertions(+), 272 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/908e7d31/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/Peer.java
--
diff --git 
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/Peer.java
 
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/Peer.java
index 962baec..17bc011 100644
--- 
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/Peer.java
+++ 
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/Peer.java
@@ -29,8 +29,6 @@ public class Peer implements Communicant {
 private final CommunicationsSession commsSession;
 private final String url;
 private final String clusterUrl;
-private final String host;
-private final int port;
 
 private final Map penaltyExpirationMap = new HashMap<>();
 private boolean closed = false;
@@ -42,9 +40,8 @@ public class Peer implements Communicant {
 this.clusterUrl = clusterUrl;
 
 try {
-final URI uri = new URI(peerUrl);
-this.port = uri.getPort();
-this.host = uri.getHost();
+// Parse peerUrl to validate it.
+new URI(peerUrl);
 } catch (final Exception e) {
 throw new IllegalArgumentException("Invalid URL: " + peerUrl);
 }
@@ -104,7 +101,7 @@ public class Peer implements Communicant {
 
 @Override
 public String getHost() {
-return host;
+return description.getHostname();
 }
 
 @Override
@@ -141,7 +138,7 @@ public class Peer implements Communicant {
 
 @Override
 public int getPort() {
-return port;
+return description.getPort();
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/nifi/blob/908e7d31/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
index 2f0183c..a44989a 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
@@ -71,8 +71,8 @@
 httpclient
 
 
-org.mockito
-mockito-core
+org.apache.nifi
+nifi-mock
 test
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/908e7d31/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/SocketRemoteSiteListener.java
--
diff --git

[2/3] nifi git commit: NIFI-2585 Moving attributes into loop in AbstractFlowFileServerProtocol, and also updating StandardRemoteGroupPort to apply the same attributes when doing a pull-based site-to-s

2016-12-22 Thread bbende 
NIFI-2585 Moving attributes into loop in AbstractFlowFileServerProtocol, and 
also updating StandardRemoteGroupPort to apply the same attributes when doing a 
pull-based site-to-site.

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

Branch: refs/heads/master
Commit: f7d761a28ae3a07cb8e614e243e197716df025b1
Parents: 28e5d85
Author: Bryan Bende 
Authored: Thu Dec 8 15:17:06 2016 -0500
Committer: Bryan Bende 
Committed: Thu Dec 22 10:59:56 2016 -0500

--
 .../attributes/SiteToSiteAttributes.java| 39 
 .../nifi/remote/StandardRemoteGroupPort.java| 15 
 .../AbstractFlowFileServerProtocol.java | 20 ++
 .../remote/TestStandardRemoteGroupPort.java |  4 +-
 .../http/TestHttpFlowFileServerProtocol.java| 12 --
 5 files changed, 77 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/f7d761a2/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/SiteToSiteAttributes.java
--
diff --git 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/SiteToSiteAttributes.java
 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/SiteToSiteAttributes.java
new file mode 100644
index 000..ed6437e
--- /dev/null
+++ 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/SiteToSiteAttributes.java
@@ -0,0 +1,39 @@
+/*
+ * 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.flowfile.attributes;
+
+/**
+ * FlowFile attributes used during site-to-site transfer.
+ */
+public enum SiteToSiteAttributes implements FlowFileAttributeKey {
+
+S2S_HOST("s2s.host"),
+
+S2S_ADDRESS("s2s.address");
+
+private final String key;
+
+private SiteToSiteAttributes(final String key) {
+this.key = key;
+}
+
+@Override
+public String key() {
+return key;
+}
+
+}

http://git-wip-us.apache.org/repos/asf/nifi/blob/f7d761a2/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
index 3a23601..b1a1c92 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRemoteGroupPort.java
@@ -21,7 +21,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,6 +39,7 @@ import org.apache.nifi.controller.ProcessScheduler;
 import org.apache.nifi.controller.ScheduledState;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.flowfile.attributes.CoreAttributes;
+import org.apache.nifi.flowfile.attributes.SiteToSiteAttributes;
 import org.apache.nifi.groups.ProcessGroup;
 import org.apache.nifi.groups.RemoteProcessGroup;
 import org.apache.nifi.processor.ProcessContext;
@@ -56,6 +59,7 @@ import org.apache.nifi.scheduling.SchedulingStrategy;
 import org.apache.nifi.util.FormatUtils;
 import org.apache.nifi.util.NiFiProperties;
 import org.apache.nifi.util.StopWatch;

[jira] [Commented] (MINIFI-128) NPE if nifi.minifi.notifier.file.config.path wasn't configured

2016-12-22 Thread ASF GitHub Bot (JIRA) 

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

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

Github user JPercivall commented on a diff in the pull request:

https://github.com/apache/nifi-minifi/pull/68#discussion_r93628936
  
--- Diff: 
minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java 
---
@@ -1197,7 +1197,14 @@ public void start() throws IOException, 
InterruptedException {
 this.changeListener = new MiNiFiConfigurationChangeListener(this, 
defaultLogger);
 this.periodicStatusReporters = initializePeriodicNotifiers();
 startPeriodicNotifiers();
-this.changeCoordinator = initializeNotifier(this.changeListener);
+try {
+this.changeCoordinator = 
initializeNotifier(this.changeListener);
+} catch (Exception e) {
--- End diff --

Those are fair points. My main point was that this way didn't offer any 
stacktrace in the event we hit an error we didn't expect. Instead of a more 
fine-grain catch, could we change the "cmdLogger" line to log the stack trace?


> NPE if nifi.minifi.notifier.file.config.path wasn't configured
> --
>
> Key: MINIFI-128
> URL: https://issues.apache.org/jira/browse/MINIFI-128
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>  Components: Agent Configuration/Installation
>Affects Versions: 0.0.1
> Environment: current master branch build
>Reporter: Andrew Grande
>Assignee: Aldrin Piri
>Priority: Minor
> Fix For: 0.2.0
>
>
> When enabling a FileChangeNotifier, it's easy to forget uncommenting the 
> *nifi.minifi.notifier.file.config.path* property (required). Minifi restart 
> will throw an unfriendly error:
> {noformat}
> Exception in thread "main" java.lang.IllegalArgumentException: Property, 
> nifi.minifi.notifier.file.config.path, for the path of the config file must 
> be specified.
> at 
> org.apache.nifi.minifi.bootstrap.configuration.notifiers.FileChangeNotifier.initialize(FileChangeNotifier.java:154)
> at 
> org.apache.nifi.minifi.bootstrap.RunMiNiFi.initializeNotifiers(RunMiNiFi.java:1452)
> at 
> org.apache.nifi.minifi.bootstrap.RunMiNiFi.start(RunMiNiFi.java:1116)
> at org.apache.nifi.minifi.bootstrap.RunMiNiFi.main(RunMiNiFi.java:224)
> Initiating shutdown of bootstrap change notifiers...
> Exception in thread "Thread-2" java.lang.NullPointerException
> at 
> java.util.Collections$UnmodifiableCollection.(Collections.java:1026)
> at java.util.Collections$UnmodifiableSet.(Collections.java:1128)
> at java.util.Collections.unmodifiableSet(Collections.java:1118)
> at 
> org.apache.nifi.minifi.bootstrap.RunMiNiFi.getChangeNotifiers(RunMiNiFi.java:1438)
> at 
> org.apache.nifi.minifi.bootstrap.ShutdownHook.run(ShutdownHook.java:57)
> {noformat}
> Expected: improve the error message to be meaningful and suggest the user 
> configure the property. No stacktrace, as we know what's going on exactly.



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