svn commit: r17203 - /dev/nifi/nifi-minifi/0.1.0/
Author: aldrin Date: Thu Dec 1 05:01:03 2016 New Revision: 17203 Log: MINIFI-146-RC1 Staging source and convenience binary artifacts for voting process. Adding minifi-toolkit binaries and metadata that were previously omitted. Added: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz (with props) dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.asc dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.md5 dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.sha1 dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.sha256 dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip (with props) dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip.asc dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip.md5 dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip.sha1 dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip.sha256 Added: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.asc == --- dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.asc (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.asc Thu Dec 1 05:01:03 2016 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIcBAABCgAGBQJYP64tAAoJEFMa66pM/l0AtPIP/A2g26hNqV/WVqbi+rId77sR +kzA4X/bMlkhejp6fl9cvaE/mMWstvhjiEiHtqQxvWLPbnaqJSBnQkaiz6NVxxOCe +pXHntj2TR28R9gaMUmvE84hZeP+tiSGzlSsC5OQQekoTcZT/hfxUNfeSZesLTwsm +VFJuXtyEZdCU9JVJ7eiOV82rmTgzCrbaVvmaVs3BifRUvzx0wAa93I7+Hm680n01 +DUoJamCRDWR0Sw/cx15u3OgrGjdsQ271a7ad6ykZ2DJbvBshiQJKFZBteXf3K0Zr +wy9glMWcZUJEiDOjICxi1XtWBIDH6SQDkjcZwZsr8CKS5NvGcIbxmvDA48wYelJG +CX844XPbp+AnkCzZykGAOXLvK1EGSI00X1Tr3j2WjMEgJx1y4YWTB+TAWCDtgp6N +QuuINdAA8FHxIWH9k+mfzRl/Mbj0Jzqc5vHqrWvSuOAhFuUSQbvkyNKFsSmhdDMC +3EwvPnhCRAKzzsaSpTPTkyx1Z+oSZq0GddGGfcFOOdngGZphRVs/MXuuhNg5eZ1N +G+NH2mayombkIsWYHBV3EzfliLS5vw+lto9nxYoJG44d4l2DIvzZ5MuOMikrJVRj +r9XXVu2mY9TgXsoPmVdt/RwNMKgEpxjlDg8mFZ3VNwvEhVG3mlbAg+dR0K01LdWq +dlocDtBJYKOl8+dOJkaO +=w5Wm +-END PGP SIGNATURE- Added: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.md5 == --- dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.md5 (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.md5 Thu Dec 1 05:01:03 2016 @@ -0,0 +1 @@ +c878eea473db7f1a69d27e11c8d56914 \ No newline at end of file Added: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.sha1 == --- dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.sha1 (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.sha1 Thu Dec 1 05:01:03 2016 @@ -0,0 +1 @@ +ffb3a299f32eb851a89ba8de8f5124360c48561e \ No newline at end of file Added: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.sha256 == --- dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.sha256 (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.tar.gz.sha256 Thu Dec 1 05:01:03 2016 @@ -0,0 +1 @@ +6d4032177969a9b960e585bb97577627e35b86bbb570923d66769e5141eb804f \ No newline at end of file Added: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip.asc == --- dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip.asc (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-toolkit-0.1.0-bin.zip.asc Thu Dec 1 05:01:03 2016 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIcBAABCgAGBQJYP64tAAoJEFMa66pM/l0A+b8QAI5MkqQ/dFa/4mGZ9UFdRRWI +Alhe+1+favZ8mXpgrA69+Te4/RZWXI4BjJa4iV3Q/TzdP8nErKc6LsFy5N7ZF8va +r+b7yfHgygDQ15maHLaLw4NhOjI2FHtxMGNkpQa4r79LsfHoqEwx1GOTmYwXC7NL +rJe+2jfNCyG5T5L8t7MvkaAYgxuW2Tq7p4dMX0hdkQfxMdbD6TMTguEdIwXXZqlM +fTGzlcm5qWU3k3EUGtTawDnj6dfy7fycWLbp9pUiF1XXGqAfIpR6eILBec9EN70e +9HoAR2zApmtBS8mTBmo4DnfOeExO887jnvX5mtjyiObgSswLSD1srym4bltYivr/ +dmlXDhmr5HnxliB2UW/l6UdJrrvsTvaUHe0T+xJ9rCPfORQgnKRuFq0dszPk45af +lJYqNla+HAHS7C5/LkU0fNhi/vv/vMsfbiYKV9FqdFODYceFkkDvN4bhmdeUHRIw
[nifi-minifi] Git Push Summary
Repository: nifi-minifi Updated Tags: refs/tags/minifi-0.1.0-RC1 [created] c4489cd47
svn commit: r17202 - in /dev/nifi/nifi-minifi: ./ 0.1.0/
Author: aldrin Date: Thu Dec 1 04:22:49 2016 New Revision: 17202 Log: MINIFI-146-RC1 Staging source and convenience binary artifacts for voting process. Added: dev/nifi/nifi-minifi/ dev/nifi/nifi-minifi/0.1.0/ dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz (with props) dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.asc dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.md5 dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.sha1 dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.sha256 dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip (with props) dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip.asc dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip.md5 dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip.sha1 dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip.sha256 dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-source-release.zip (with props) dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-source-release.zip.asc dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-source-release.zip.md5 dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-source-release.zip.sha1 dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-source-release.zip.sha256 Added: dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.asc == --- dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.asc (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.asc Thu Dec 1 04:22:49 2016 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIcBAABCgAGBQJYP6TXAAoJEFMa66pM/l0AOggP/RIt1RPKH4qqhKNirIbHb/dp +ZNdJEM+yYGmMw/aITQggQ/A5xN5pzk/bLbiWWKWZZIVHrNZuQDFxMwChYnq+QrvH +ParK+hZyeExk/gE2RM8o2yqI7hpWuse2DFy01H0iIOOu5KzsbX080nSwmZpdG7V4 +ZSYO3uou1EY/OerUS1cCyqKRBRBpGCh4dz10jU25XdrbKN6Twmof4ZtFib+nAxI1 +haekqFgqpGB/U7ykSnblck7lesOxrgX+OjBVVZvahhEUa6+aw+AsWMXGRRsZYQlt +XdMErqd6TuG9k/l1wHk5bFL5BqimAJMR/BGU10AXCGvEwolVd4jfnE4fik4rNsdw +5QzMWVVhK/2AWgRvqG97Vcb8erKloE4ZH1z5lJsJhqOx9WzJ3KisMxBhFVcF05X9 +a3rQS4TrfOLeWtcuzqr3EZ5mHzAd+t3HXc5TG4kUzTr6m8wHMMt3mgPh3G89u93a +pjmUngFwIF46LSS8GM0t6coaXY55LX+p/NoKO9vtLcOLM7qcvdIgjehgJmeT855O +8dgN3WVlh/c4jPtYFpJvLboj9h+DzychZfp72aONB64OKrZqk3P96qb+oT2YhgUC +lUAnDM5tDznyLv3tSw7WZPQUqh0RBO5U2zAOP9xfP4sRRs8byoaLZpuw3VQ73ySG +ydIYA7W/RMWBK/KtI9pu +=0lTz +-END PGP SIGNATURE- Added: dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.md5 == --- dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.md5 (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.md5 Thu Dec 1 04:22:49 2016 @@ -0,0 +1 @@ +10feb305349e24f9ca923785c5500ea9 \ No newline at end of file Added: dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.sha1 == --- dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.sha1 (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.sha1 Thu Dec 1 04:22:49 2016 @@ -0,0 +1 @@ +c6bac4a28a2b78c6b78c80ad9350e0a5cf0e5be5 \ No newline at end of file Added: dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.sha256 == --- dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.sha256 (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.tar.gz.sha256 Thu Dec 1 04:22:49 2016 @@ -0,0 +1 @@ +c8871707b75218c8de5a1c68880d18163631f02367dc94c5411b7de7a744cef6 \ No newline at end of file Added: dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip.asc == --- dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip.asc (added) +++ dev/nifi/nifi-minifi/0.1.0/minifi-0.1.0-bin.zip.asc Thu Dec 1 04:22:49 2016 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIcBAABCgAGBQJYP6TYAAoJEFMa66pM/l0A77cP/A6WYuOO/sFf7qMOSfDTapz4 +X8DSmpW2bzskPvNOmdPOjvG7Ba2tMQ4c95rhvL07USt2LP3i48AvFJZMSuT1Cu2f ++6lI+HshjYnaqIN7anUpJaV8DW/FN/ZkpXSR3VZWPiX3bJKwbA+abiHBHtGYO9Os +Y6mCa4lgjfYjJajbhZFgeVqVw4bk3WKiQbYJXZHq2F526wAHicFrmJ+zvSRIv5Ws +LryVHD6raU0hZI2cUSF9h5HQ46tsK+UIFLAQh7RZ9yQkGx1UrP7x1FHBnvvOZv1z +XaNy9sTd0/f46rGq6o0Xj+heQNMzcyYMQgB6dl40kIeU7DTpxfsDG6f62DibD9cr +jbci8NH/hCyJNzetHMxjWIbC/Nwz4RX742OVYKZHfBHN7SQxeSCcEGjylK3OhT5F
[1/2] nifi-minifi git commit: MINIFI-146-RC1 prepare release minifi-0.1.0-RC1
Repository: nifi-minifi Updated Branches: refs/heads/MINIFI-146-RC1 [created] a3deb27d9 MINIFI-146-RC1 prepare release minifi-0.1.0-RC1 Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/6e7f05d4 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/6e7f05d4 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/6e7f05d4 Branch: refs/heads/MINIFI-146-RC1 Commit: 6e7f05d4bef3637a829c17435eb9eff83aa6b810 Parents: 967d402 Author: Aldrin PiriAuthored: Wed Nov 30 22:54:50 2016 -0500 Committer: Aldrin Piri Committed: Wed Nov 30 22:54:50 2016 -0500 -- minifi-api/pom.xml | 2 +- minifi-assembly/pom.xml | 4 +- minifi-bootstrap/pom.xml| 2 +- minifi-commons/minifi-commons-schema/pom.xml| 2 +- minifi-commons/minifi-utils/pom.xml | 2 +- minifi-commons/pom.xml | 2 +- minifi-docs/pom.xml | 2 +- .../minifi-framework-nar/pom.xml| 2 +- .../minifi-framework-core/pom.xml | 2 +- .../minifi-framework/minifi-nar-utils/pom.xml | 5 +-- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml | 2 +- .../minifi-framework/pom.xml| 2 +- .../minifi-framework-bundle/pom.xml | 2 +- .../minifi-provenance-reporting-nar/pom.xml | 2 +- .../minifi-provenance-reporting-bundle/pom.xml | 2 +- .../pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml| 2 +- .../minifi-provenance-repository-bundle/pom.xml | 2 +- .../minifi-ssl-context-service-nar/pom.xml | 5 +-- minifi-nar-bundles/minifi-standard-nar/pom.xml | 2 +- .../minifi-standard-services-api-nar/pom.xml| 11 +++-- .../minifi-update-attribute-nar/pom.xml | 2 +- minifi-nar-bundles/pom.xml | 2 +- minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml| 2 +- minifi-toolkit/pom.xml | 2 +- pom.xml | 42 ++-- 28 files changed, 57 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6e7f05d4/minifi-api/pom.xml -- diff --git a/minifi-api/pom.xml b/minifi-api/pom.xml index 98a78af..edd1af1 100644 --- a/minifi-api/pom.xml +++ b/minifi-api/pom.xml @@ -20,7 +20,7 @@ limitations under the License. minifi org.apache.nifi.minifi -0.1.0-SNAPSHOT +0.1.0 minifi-api jar http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6e7f05d4/minifi-assembly/pom.xml -- diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml index b303c6c..411af1f 100644 --- a/minifi-assembly/pom.xml +++ b/minifi-assembly/pom.xml @@ -20,7 +20,7 @@ limitations under the License. minifi org.apache.nifi.minifi -0.1.0-SNAPSHOT +0.1.0 minifi-assembly pom @@ -139,7 +139,7 @@ limitations under the License. org.apache.nifi.minifi minifi-provenance-reporting-nar nar -0.1.0-SNAPSHOT +0.1.0 http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6e7f05d4/minifi-bootstrap/pom.xml -- diff --git a/minifi-bootstrap/pom.xml b/minifi-bootstrap/pom.xml index 71e9b78..2fb6626 100644 --- a/minifi-bootstrap/pom.xml +++ b/minifi-bootstrap/pom.xml @@ -20,7 +20,7 @@ limitations under the License. minifi org.apache.nifi.minifi -0.1.0-SNAPSHOT +0.1.0 minifi-bootstrap jar http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6e7f05d4/minifi-commons/minifi-commons-schema/pom.xml -- diff --git a/minifi-commons/minifi-commons-schema/pom.xml b/minifi-commons/minifi-commons-schema/pom.xml index d17c999..84f86fd 100644 --- a/minifi-commons/minifi-commons-schema/pom.xml +++ b/minifi-commons/minifi-commons-schema/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi.minifi minifi-commons -0.1.0-SNAPSHOT +0.1.0 minifi-commons-schema http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6e7f05d4/minifi-commons/minifi-utils/pom.xml -- diff --git a/minifi-commons/minifi-utils/pom.xml
[2/2] nifi-minifi git commit: MINIFI-146-RC1 prepare for next development iteration
MINIFI-146-RC1 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/a3deb27d Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/a3deb27d Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/a3deb27d Branch: refs/heads/MINIFI-146-RC1 Commit: a3deb27d9fa6eb1001010f003c0c0302acb79261 Parents: 6e7f05d Author: Aldrin PiriAuthored: Wed Nov 30 22:55:00 2016 -0500 Committer: Aldrin Piri Committed: Wed Nov 30 22:55:00 2016 -0500 -- minifi-api/pom.xml | 2 +- minifi-assembly/pom.xml | 4 +- minifi-bootstrap/pom.xml| 2 +- minifi-commons/minifi-commons-schema/pom.xml| 2 +- minifi-commons/minifi-utils/pom.xml | 2 +- minifi-commons/pom.xml | 2 +- minifi-docs/pom.xml | 2 +- .../minifi-framework-nar/pom.xml| 2 +- .../minifi-framework-core/pom.xml | 2 +- .../minifi-framework/minifi-nar-utils/pom.xml | 2 +- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml | 2 +- .../minifi-framework/pom.xml| 2 +- .../minifi-framework-bundle/pom.xml | 2 +- .../minifi-provenance-reporting-nar/pom.xml | 2 +- .../minifi-provenance-reporting-bundle/pom.xml | 2 +- .../pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml| 2 +- .../minifi-provenance-repository-bundle/pom.xml | 2 +- .../minifi-ssl-context-service-nar/pom.xml | 2 +- minifi-nar-bundles/minifi-standard-nar/pom.xml | 2 +- .../minifi-standard-services-api-nar/pom.xml| 6 +-- .../minifi-update-attribute-nar/pom.xml | 2 +- minifi-nar-bundles/pom.xml | 2 +- minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml| 2 +- minifi-toolkit/pom.xml | 2 +- pom.xml | 42 ++-- 28 files changed, 49 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/a3deb27d/minifi-api/pom.xml -- diff --git a/minifi-api/pom.xml b/minifi-api/pom.xml index edd1af1..e6a8dbf 100644 --- a/minifi-api/pom.xml +++ b/minifi-api/pom.xml @@ -20,7 +20,7 @@ limitations under the License. minifi org.apache.nifi.minifi -0.1.0 +0.2.0-SNAPSHOT minifi-api jar http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/a3deb27d/minifi-assembly/pom.xml -- diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml index 411af1f..f525d01 100644 --- a/minifi-assembly/pom.xml +++ b/minifi-assembly/pom.xml @@ -20,7 +20,7 @@ limitations under the License. minifi org.apache.nifi.minifi -0.1.0 +0.2.0-SNAPSHOT minifi-assembly pom @@ -139,7 +139,7 @@ limitations under the License. org.apache.nifi.minifi minifi-provenance-reporting-nar nar -0.1.0 +0.2.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/a3deb27d/minifi-bootstrap/pom.xml -- diff --git a/minifi-bootstrap/pom.xml b/minifi-bootstrap/pom.xml index 2fb6626..099f6e6 100644 --- a/minifi-bootstrap/pom.xml +++ b/minifi-bootstrap/pom.xml @@ -20,7 +20,7 @@ limitations under the License. minifi org.apache.nifi.minifi -0.1.0 +0.2.0-SNAPSHOT minifi-bootstrap jar http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/a3deb27d/minifi-commons/minifi-commons-schema/pom.xml -- diff --git a/minifi-commons/minifi-commons-schema/pom.xml b/minifi-commons/minifi-commons-schema/pom.xml index 84f86fd..3eb2e41 100644 --- a/minifi-commons/minifi-commons-schema/pom.xml +++ b/minifi-commons/minifi-commons-schema/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi.minifi minifi-commons -0.1.0 +0.2.0-SNAPSHOT minifi-commons-schema http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/a3deb27d/minifi-commons/minifi-utils/pom.xml -- diff --git a/minifi-commons/minifi-utils/pom.xml b/minifi-commons/minifi-utils/pom.xml index 8686de8..a266a3e 100644 --- a/minifi-commons/minifi-utils/pom.xml +++
[jira] [Commented] (MINIFI-146) Perform MiNiFi 0.1.0 release (Java)
[ https://issues.apache.org/jira/browse/MINIFI-146?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15710731#comment-15710731 ] Aldrin Piri commented on MINIFI-146: The release will be based off of 967d402434d448f08411c1933eea21a9dd4c53cb (https://git-wip-us.apache.org/repos/asf?p=nifi-minifi.git;a=commit;h=967d402434d448f08411c1933eea21a9dd4c53cb). > Perform MiNiFi 0.1.0 release (Java) > --- > > Key: MINIFI-146 > URL: https://issues.apache.org/jira/browse/MINIFI-146 > Project: Apache NiFi MiNiFi > Issue Type: Bug >Reporter: Aldrin Piri >Assignee: Aldrin Piri > Fix For: 0.1.0 > > > Carry out release functions for the MiNiFi Java 0.1.0 release. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (MINIFI-146) Perform MiNiFi 0.1.0 release (Java)
Aldrin Piri created MINIFI-146: -- Summary: Perform MiNiFi 0.1.0 release (Java) Key: MINIFI-146 URL: https://issues.apache.org/jira/browse/MINIFI-146 Project: Apache NiFi MiNiFi Issue Type: Bug Reporter: Aldrin Piri Assignee: Aldrin Piri Fix For: 0.1.0 Carry out release functions for the MiNiFi Java 0.1.0 release. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (MINIFI-142) Upgrade NiFi dependencies to 1.1.0
[ https://issues.apache.org/jira/browse/MINIFI-142?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15709974#comment-15709974 ] ASF GitHub Bot commented on MINIFI-142: --- Github user asfgit closed the pull request at: https://github.com/apache/nifi-minifi/pull/60 > Upgrade NiFi dependencies to 1.1.0 > -- > > Key: MINIFI-142 > URL: https://issues.apache.org/jira/browse/MINIFI-142 > Project: Apache NiFi MiNiFi > Issue Type: Task > Components: Core Framework >Reporter: Aldrin Piri >Assignee: Aldrin Piri > Fix For: 0.1.0 > > > With the release of NiFi 1.1.0 underway, it would be advantageous to > incorporate this version's fixes into MiNiFi before performing our next > release. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[2/3] nifi-minifi git commit: MINIFI-142 Updating License and Notice information for NiFi 1.1.0 upgrade
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/967d4024/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE -- diff --git a/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE b/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE index a38d06b..d645695 100644 --- a/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE +++ b/minifi-nar-bundles/minifi-standard-services-api-nar/src/main/resources/META-INF/LICENSE @@ -200,138 +200,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -APACHE NIFI SUBCOMPONENTS: - -The Apache NiFi project contains subcomponents with separate copyright -notices and license terms. Your use of the source code for the these -subcomponents is subject to the terms and conditions of the following -licenses. - -The binary distribution of this product bundles 'Bouncy Castle JDK 1.5 Provider' -under an MIT style license. - -Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -This product bundes 'JCraft Jsch' which is available under a 3-Clause BSD -License. - -Copyright (c) 2002-2015 Atsuhiko Yamanaka, JCraft,Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the distribution. - - 3. The names of the authors may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -This product bundles 'JCraft Jzlib' which is available under a 3-Clause BSD License. - -Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the distribution. - - 3. The names of the authors may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS
[1/3] nifi-minifi git commit: MINIFI-142 Upgrading NiFi dependencies to 1.1.0 and adjusting NAR and ClassLoader code to reflect changes introduced in NiFi.
Repository: nifi-minifi Updated Branches: refs/heads/master bcf6c6cb2 -> 967d40243 MINIFI-142 Upgrading NiFi dependencies to 1.1.0 and adjusting NAR and ClassLoader code to reflect changes introduced in NiFi. Signed-off-by: Joseph PercivallProject: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/85d69ead Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/85d69ead Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/85d69ead Branch: refs/heads/master Commit: 85d69eadae5bffb570a28fcb4a05649d58605ce6 Parents: bcf6c6c Author: Aldrin Piri Authored: Tue Nov 29 16:36:46 2016 -0500 Committer: Joseph Percivall Committed: Wed Nov 30 17:13:13 2016 -0500 -- .../org/apache/nifi/nar/ExtensionManager.java | 103 ++-- .../apache/nifi/nar/InstanceClassLoader.java| 160 +++ .../java/org/apache/nifi/nar/NarCloseable.java | 27 ++-- .../nifi/nar/NarThreadContextClassLoader.java | 22 ++- .../java/org/apache/nifi/nar/NarUnpacker.java | 28 ++-- .../java/org/apache/nifi/util/FileUtils.java| 105 .../pom.xml | 5 + .../MiNiFiPersistentProvenanceRepository.java | 52 +++--- ...estMiNiFiPersistentProvenanceRepository.java | 156 +++--- pom.xml | 2 +- 10 files changed, 385 insertions(+), 275 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/85d69ead/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java -- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java index 787fb3c..9fd9e66 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java @@ -16,14 +16,8 @@ */ package org.apache.nifi.nar; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.ServiceLoader; -import java.util.Set; +import org.apache.nifi.annotation.behavior.RequiresInstanceClassLoading; import org.apache.nifi.authentication.LoginIdentityProvider; - import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.controller.ControllerService; import org.apache.nifi.controller.repository.ContentRepository; @@ -34,10 +28,21 @@ import org.apache.nifi.flowfile.FlowFilePrioritizer; import org.apache.nifi.processor.Processor; import org.apache.nifi.provenance.ProvenanceRepository; import org.apache.nifi.reporting.ReportingTask; - +import org.apache.nifi.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + /** * Scans through the classpath to load all FlowFileProcessors, FlowFileComparators, and ReportingTasks using the service provider API and running through all classloaders (root, NARs). * @@ -53,6 +58,9 @@ public class ExtensionManager { private static final Map extensionClassloaderLookup = new HashMap<>(); +private static final Set requiresInstanceClassLoading = new HashSet<>(); +private static final Map instanceClassloaderLookup = new ConcurrentHashMap<>(); + static { definitionMap.put(Processor.class, new HashSet<>()); definitionMap.put(FlowFilePrioritizer.class, new HashSet<>()); @@ -127,6 +135,12 @@ public class ExtensionManager { if (registeredClassLoader == null) { classloaderMap.put(className, classLoader); classes.add(type); + +// keep track of which classes require a class loader per component instance +if (type.isAnnotationPresent(RequiresInstanceClassLoading.class)) { +requiresInstanceClassLoading.add(className); +} + } else { boolean loadedFromAncestor = false; @@ -159,6 +173,77 @@ public class ExtensionManager { return extensionClassloaderLookup.get(classType); } +
[3/3] nifi-minifi git commit: MINIFI-142 Updating License and Notice information for NiFi 1.1.0 upgrade
MINIFI-142 Updating License and Notice information for NiFi 1.1.0 upgrade This closes #60 Signed-off-by: Aldrin PiriProject: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/967d4024 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/967d4024 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/967d4024 Branch: refs/heads/master Commit: 967d402434d448f08411c1933eea21a9dd4c53cb Parents: 85d69ea Author: Joseph Percivall Authored: Tue Nov 29 23:21:47 2016 -0500 Committer: Joseph Percivall Committed: Wed Nov 30 17:13:15 2016 -0500 -- minifi-assembly/LICENSE | 43 +++- minifi-assembly/NOTICE | 62 - .../src/main/resources/META-INF/LICENSE | 202 .../src/main/resources/META-INF/NOTICE | 32 +++ .../src/main/resources/META-INF/LICENSE | 202 .../src/main/resources/META-INF/NOTICE | 28 +++ .../src/main/resources/META-INF/LICENSE | 202 .../src/main/resources/META-INF/NOTICE | 193 +--- .../src/main/resources/META-INF/LICENSE | 135 --- .../src/main/resources/META-INF/NOTICE | 174 +- .../src/main/resources/META-INF/LICENSE | 27 +-- .../src/main/resources/META-INF/NOTICE | 50 ++-- .../src/main/resources/META-INF/LICENSE | 135 --- .../src/main/resources/META-INF/NOTICE | 172 -- .../src/main/resources/META-INF/LICENSE | 202 .../src/main/resources/META-INF/NOTICE | 13 ++ minifi-toolkit/minifi-toolkit-assembly/LICENSE | 106 - minifi-toolkit/minifi-toolkit-assembly/NOTICE | 229 ++- 18 files changed, 1333 insertions(+), 874 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/967d4024/minifi-assembly/LICENSE -- diff --git a/minifi-assembly/LICENSE b/minifi-assembly/LICENSE index dda1222..af59c3f 100644 --- a/minifi-assembly/LICENSE +++ b/minifi-assembly/LICENSE @@ -202,9 +202,9 @@ limitations under the License. -APACHE NIFI - MINIFI SUBCOMPONENTS: +APACHE MINIFI SUBCOMPONENTS: -The Apache NiFi - MiNiFi project contains subcomponents with separate copyright +The Apache MiNiFi project contains subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. @@ -483,4 +483,41 @@ For details see https://github.com/svenkubiak/jBCrypt/blob/0.4.1/LICENSE ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. \ No newline at end of file +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +The binary distribution of this product bundles 'JLine' under a BSD +style license. + +Copyright (c) 2002-2006, Marc Prud'hommeaux +All rights reserved. + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the following +conditions are met: + +Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with +the distribution. + +Neither the name of JLine nor the names of its contributors +may be used to endorse or promote products derived from this +software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
[jira] [Created] (MINIFI-145) Add OS X build to Travis CI
Aldrin Piri created MINIFI-145: -- Summary: Add OS X build to Travis CI Key: MINIFI-145 URL: https://issues.apache.org/jira/browse/MINIFI-145 Project: Apache NiFi MiNiFi Issue Type: Improvement Components: Build Reporter: Aldrin Piri Priority: Minor It would be helpful to extend Travis CI to support usage of building on OS X as another point in tracking cross platform builds. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
nifi git commit: NIFI-2017: Fixed typo in nf-port.js that was referencing the wrong variable name to determine whether or not a port is transmitting Fixed merging logic for root group status. Only con
Repository: nifi Updated Branches: refs/heads/master 1f40f298c -> 02f02b245 NIFI-2017: Fixed typo in nf-port.js that was referencing the wrong variable name to determine whether or not a port is transmitting Fixed merging logic for root group status. Only consider a port transmitting when there is an active request, not when there is a 'queued' request This closes #1279 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/02f02b24 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/02f02b24 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/02f02b24 Branch: refs/heads/master Commit: 02f02b245a3704666b2e2951c8d29277538d9f25 Parents: 1f40f29 Author: Mark PayneAuthored: Tue Nov 29 14:49:12 2016 -0500 Committer: Matt Gilman Committed: Wed Nov 30 14:51:28 2016 -0500 -- .../nifi/cluster/manager/StatusMerger.java | 2 + .../nifi/remote/StandardRootGroupPort.java | 44 .../src/main/webapp/js/nf/canvas/nf-port.js | 8 ++-- 3 files changed, 24 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/02f02b24/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 d6eaed6..a876d51 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 @@ -307,6 +307,8 @@ public class StatusMerger { merge(target.getAggregateSnapshot(), targetReadablePermission, toMerge.getAggregateSnapshot(), toMergeReadablePermission); +target.setTransmitting(Boolean.TRUE.equals(target.isTransmitting()) || Boolean.TRUE.equals(toMerge.isTransmitting())); + if (target.getNodeSnapshots() != null) { final NodePortStatusSnapshotDTO nodeSnapshot = new NodePortStatusSnapshotDTO(); nodeSnapshot.setStatusSnapshot(toMerge.getAggregateSnapshot()); http://git-wip-us.apache.org/repos/asf/nifi/blob/02f02b24/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java index 5cb26ea..873cd33 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/StandardRootGroupPort.java @@ -16,6 +16,24 @@ */ package org.apache.nifi.remote; +import static java.util.Objects.requireNonNull; + +import java.io.IOException; +import java.net.SocketTimeoutException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + import org.apache.nifi.authorization.AuthorizationResult; import org.apache.nifi.authorization.AuthorizationResult.Result; import org.apache.nifi.authorization.Authorizer; @@ -55,24 +73,6 @@ import org.apache.nifi.util.NiFiProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.net.SocketTimeoutException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import
[1/2] nifi-minifi git commit: MINIFI-127: Added quick start document.
Repository: nifi-minifi Updated Branches: refs/heads/master 5ac121fae -> bcf6c6cb2 MINIFI-127: Added quick start document. Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/9ea13c65 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/9ea13c65 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/9ea13c65 Branch: refs/heads/master Commit: 9ea13c65fa2689841dd2de0ef93ea1695e03dc4e Parents: 5ac121f Author: Sarah OlsonAuthored: Tue Oct 25 13:42:15 2016 -0700 Committer: Aldrin Piri Committed: Wed Nov 30 14:24:38 2016 -0500 -- .../markdown/minifi-java-agent-quick-start.md | 288 +++ 1 file changed, 288 insertions(+) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/9ea13c65/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md -- diff --git a/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md b/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md new file mode 100644 index 000..80ca1cb --- /dev/null +++ b/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md @@ -0,0 +1,288 @@ + + +# MiNiFi Java Agent Quick Start Guide + +[Apache NiFi Team](d...@nifi.apache.org>) + +[NiFi Homepage](http://nifi.apache.org) + +# Overview + +Apache NiFi MiNiFi is an Apache NiFi project, designed to collect data at its source. MiNiFi was developed with the following objectives in mind: +* Small and lightweight footprint +* Central agent management +* Data provenance generation +* NiFi integration for follow-on dataflow management and chain of custody information + +# Before You Begin +MiNiFi Java Agent is supported on the following operating systems: +* Red Hat Enterprise Linux / CentOS 6 (64-bit) +* Red Hat Enterprise Linux / CentOS 7 (64-bit) +* Ubuntu Precise (12.04) (64-bit) +* Ubuntu Trusty (14.04) (64-bit) +* Debian 7 +* SUSE Linux Enterprise Server (SLES) 11 SP3 (64-bit) + +You can download the MiNiFi Java Agent and the MiNiFi Toolkit from the [MiNiFi download page](http://nifi.apache.org/minifi/download.html). + +# Installing and Starting MiNiFi +You have several options for installing and starting MiNiFi. + +## For Linux and Mac OS X Users +To install MiNiFi: +1. [Download](http://nifi.apache.org/minifi/download.html) MiNiFi. +2. Extract the file to the location from which you want to the application. + +You can also install MiNiFi as a service: +1. Navigate to the MiNiFi installation directory. +2. Enter: +``` +bin/minifi.sh install +``` +**Note:** You can also specify a custom name for your MiNiFi installation, by specifying that name during your install command. For example, to install MiNiFi as a service and named dataflow, enter: + +``` +bin/minifi.sh install dataflow +``` +Once you have downloaded and installed MiNiFi, you need to start MiNiF. You can start NiFi in the foreground, background, or as a service. + +To launch MiNiFi in the foreground: + +1. From a terminal window, navigate to the MiNiFi installation directory.Enter: + +``` +bin/minifi.sh run +``` +To launch MiNiFi in the background: +1. From a terminal window, navigate to the MiNiFi installation directory. +2. Enter: +``` +bin/minifi.sh start +``` + +To launch MiNiFi as a service: +1. From a terminal window, enter: +``` +sudo service minifi start +``` +## For Windows Users +For Windows users, navigate to the folder where MiNiFi was installed. Navigate to the /bin subdirectory and double-click the run-minifi.bat file. + +This launches MiNiFi and leaves it running in the foreground. To shut down NiFi, select the window that was launched and hold the Ctrl key while pressing C. + +#Working with dataflows +When you are working with a MiNiFi dataflow, you should design it, add any additional configuration your environment or use case requires, and then deploy your dataflow. MiNiFi is not designed to accommodate substantial mid-dataflow configuration. + +##Setting up Your Dataflow +Before you begin, you should be aware that the following NiFi components are not supported in MiNiFi dataflows: +* Controller services +* Funnels +* Multiple source relationships for a single connection +* Process groups + +Additionally, each processor requires a distinct name. + +You can use the MiNiFi Toolkit, located in your MiNiFi installation directory, and any NiFi instance to set up the dataflow you want MiNiFi to run: + +1. Launch NiFi +2. Create a dataflow. +3. Convert your dataflow into a template. +4. Download your template as an .xml file. For more information on working with templates, see the [Templates](http://docs.hortonworks.com/HDPDocuments/HDF2/HDF-2.0.0/bk_user-guide/content/templates.html) section in the *User Guide*. +5. From
[2/2] nifi-minifi git commit: MINIFI-127 In quick start guide, removing processors that are currently unusable due to reliance on Controller Services other than SSL Context
MINIFI-127 In quick start guide, removing processors that are currently unusable due to reliance on Controller Services other than SSL Context This closes #49. Signed-off-by: Aldrin PiriProject: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/bcf6c6cb Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/bcf6c6cb Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/bcf6c6cb Branch: refs/heads/master Commit: bcf6c6cb2fe1c00c83559a2bee490d5b468ec98f Parents: 9ea13c6 Author: Joseph Percivall Authored: Wed Nov 30 12:07:28 2016 -0500 Committer: Aldrin Piri Committed: Wed Nov 30 14:24:42 2016 -0500 -- .../markdown/minifi-java-agent-quick-start.md| 19 --- 1 file changed, 8 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/bcf6c6cb/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md -- diff --git a/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md b/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md index 80ca1cb..63ee343 100644 --- a/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md +++ b/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md @@ -115,15 +115,13 @@ config.sh transform input_file output_file **Result:** Once you have your config.yml file in the minifi/conf directory, launch that instance of MiNiFi and your dataflow begins automatically. ##Using Processors Not Packaged with MiNiFi -MiNiFi is shipped with the following processors: +MiNiFi is able to use following processors out of the box: * UpdateAttribute * AttributesToJSON * Base64EncodeContent * CompressContent * ControlRate * ConvertCharacterSet -* DetectDuplicate -* DistributeLoad * DuplicateFlowFile * EncryptContent * EvaluateJsonPath @@ -131,10 +129,8 @@ MiNiFi is shipped with the following processors: * EvaluateXPath * EvaluateXQuery * ExecuteProcess -* ExecuteSQL * ExecuteStreamCommand * ExtractText -* FetchDistributedMapCache * FetchFile * FetchSFTP * GenerateFlowFile @@ -144,8 +140,6 @@ MiNiFi is shipped with the following processors: * GetJMSQueue * GetJMSTopic * GetSFTP -* HandleHttpRequest -* HandleHttpResponse * HashAttribute * HashContent * IdentifyMimeType @@ -163,15 +157,12 @@ MiNiFi is shipped with the following processors: * MonitorActivity * ParseSyslog * PostHTTP -* PutDistributedMapCache * PutEmail * PutFTP * PutFile * PutJMS * PutSFTP -* PutSQL * PutSyslog -* QueryDatabaseTable * ReplaceText * ReplaceTextWithMapping * RouteOnAttribute @@ -194,6 +185,10 @@ If you want to create a dataflow with a processor not shipped with MiNiFi, you c 2. Copy the desired NAR file into the MiNiFi lib directory. 3. Restart your MiNiFi instance. +**Note:** Currently only the StandardSSLContextService is supported as a controller service. It is created automatically if the the "Security Properties" section is set and can be referenced in the processor configuration using the ID "SSL-Context-Service". + + + # Securing your Dataflow You can secure your MiNiFi dataflow using keystore or trust store SSL protocols, however, this information is not automatically generated. You will need to generate your security configuration information yourself. @@ -272,9 +267,10 @@ You can load a new dataflow for a MiNiFi instance to run: ## Stopping MiNiFi -You can MiNiFi at any time. +You can stop MiNiFi at any time. Stopping MiNiFi: + 1. From a terminal window, navigate to the MiNiFi installation directory. 2. Enter: ``` @@ -282,6 +278,7 @@ bin/minifi.sh stop ``` Stopping MiNiFi as a service: + 1. From a terminal window, enter: ``` sudo service minifi stop
[jira] [Commented] (MINIFI-127) Add MiNiFi Java Agent Quick Start Guide
[ https://issues.apache.org/jira/browse/MINIFI-127?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15709510#comment-15709510 ] ASF GitHub Bot commented on MINIFI-127: --- Github user asfgit closed the pull request at: https://github.com/apache/nifi-minifi/pull/49 > Add MiNiFi Java Agent Quick Start Guide > --- > > Key: MINIFI-127 > URL: https://issues.apache.org/jira/browse/MINIFI-127 > Project: Apache NiFi MiNiFi > Issue Type: Improvement > Components: Documentation >Reporter: Sarah Olson >Assignee: Sarah Olson > Fix For: 0.1.0 > > > Create a MiNiFi Java Agent Quick Start Guide, with basic information about > how to get started using MiNiFi. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
nifi git commit: NIFI-3129: When adding controller services to a snippet, ensure that we don't add the service multiple times, even when it's referenced by child process groups. This closes #1284
Repository: nifi Updated Branches: refs/heads/master ba513447d -> fff0148a0 NIFI-3129: When adding controller services to a snippet, ensure that we don't add the service multiple times, even when it's referenced by child process groups. This closes #1284 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/fff0148a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/fff0148a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/fff0148a Branch: refs/heads/master Commit: fff0148a0e057277b34e647ef31c441ed5b4bdc3 Parents: ba51344 Author: Mark PayneAuthored: Wed Nov 30 11:07:32 2016 -0500 Committer: Matt Gilman Committed: Wed Nov 30 13:07:51 2016 -0500 -- .../apache/nifi/util/ComponentIdGenerator.java | 8 +++- .../org/apache/nifi/web/util/SnippetUtils.java | 19 +-- 2 files changed, 20 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/fff0148a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/ComponentIdGenerator.java -- diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/ComponentIdGenerator.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/ComponentIdGenerator.java index 49f00b8..51cf0c0 100644 --- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/ComponentIdGenerator.java +++ b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/ComponentIdGenerator.java @@ -19,6 +19,9 @@ package org.apache.nifi.util; import java.security.SecureRandom; import java.util.UUID; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * IMPORTANT: This component is not part of public API! * @@ -48,6 +51,7 @@ import java.util.UUID; * */ public class ComponentIdGenerator { +private static final Logger logger = LoggerFactory.getLogger(ComponentIdGenerator.class); public static final Object lock = new Object(); @@ -97,6 +101,8 @@ public class ComponentIdGenerator { long clockSequenceHi = clockSequence; clockSequenceHi <<= 48; lsb = clockSequenceHi | lsb; -return new UUID(time, lsb); +final UUID uuid = new UUID(time, lsb); +logger.debug("Generating UUID {} for msb={}, lsb={}, ensureUnique={}", uuid, msb, lsb, ensureUnique); +return uuid; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/fff0148a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java index 4f8afde..c5baa8c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java @@ -110,6 +110,7 @@ public final class SnippetUtils { } final Set controllerServices = new HashSet<>(); +final Set allServicesReferenced = new HashSet<>(); // add any processors final Set processors = new LinkedHashSet<>(); @@ -122,7 +123,10 @@ public final class SnippetUtils { processors.add(dtoFactory.createProcessorDto(processor)); if (includeControllerServices) { - controllerServices.addAll(getControllerServices(processor.getProperties())); +// Include all referenced services that are not already included in this snippet. +getControllerServices(processor.getProperties()).stream() +.filter(svc -> allServicesReferenced.add(svc)) +.forEach(svc -> controllerServices.add(svc)); } } } @@ -199,7 +203,7 @@ public final class SnippetUtils { final ProcessGroupDTO childGroupDto = dtoFactory.createProcessGroupDto(childGroup, recurse); processGroups.add(childGroupDto); -addControllerServices(childGroup, childGroupDto); +addControllerServices(childGroup, childGroupDto, allServicesReferenced); } } @@ -241,7 +245,7 @@ public final class SnippetUtils { return snippetDto; } -private void
[jira] [Resolved] (MINIFI-125) Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap
[ https://issues.apache.org/jira/browse/MINIFI-125?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bryan Rosander resolved MINIFI-125. --- Resolution: Fixed > Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap > - > > Key: MINIFI-125 > URL: https://issues.apache.org/jira/browse/MINIFI-125 > Project: Apache NiFi MiNiFi > Issue Type: Improvement >Reporter: Joseph Percivall >Assignee: Joseph Percivall > Fix For: 0.1.0 > > > There were commits improving the NiFi-bootstrap in 1.0.0. Not all of them > will be relevant to the MiNiFi bootstrap but some may be. Any applicable > changes/improvements should be applied to the MiNiFi Bootstrap. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (MINIFI-125) Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap
[ https://issues.apache.org/jira/browse/MINIFI-125?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15709285#comment-15709285 ] ASF GitHub Bot commented on MINIFI-125: --- Github user asfgit closed the pull request at: https://github.com/apache/nifi-minifi/pull/59 > Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap > - > > Key: MINIFI-125 > URL: https://issues.apache.org/jira/browse/MINIFI-125 > Project: Apache NiFi MiNiFi > Issue Type: Improvement >Reporter: Joseph Percivall >Assignee: Joseph Percivall > Fix For: 0.1.0 > > > There were commits improving the NiFi-bootstrap in 1.0.0. Not all of them > will be relevant to the MiNiFi bootstrap but some may be. Any applicable > changes/improvements should be applied to the MiNiFi Bootstrap. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
nifi git commit: NIFI-3076: Fixed handling of 'medium' unsigned integers in JdbcCommon
Repository: nifi Updated Branches: refs/heads/master bc223fa19 -> ba513447d NIFI-3076: Fixed handling of 'medium' unsigned integers in JdbcCommon This closes #1254. Signed-off-by: Bryan BendeProject: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ba513447 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ba513447 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ba513447 Branch: refs/heads/master Commit: ba513447d75dc5e95ddcdfcac1a1fefe2eb175ce Parents: bc223fa Author: Matt Burgess Authored: Mon Nov 21 16:33:12 2016 -0500 Committer: Bryan Bende Committed: Wed Nov 30 13:05:38 2016 -0500 -- .../processors/standard/util/JdbcCommon.java| 3 +- .../standard/util/TestJdbcCommon.java | 36 2 files changed, 38 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/ba513447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java -- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java index 22301b0..49be067 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JdbcCommon.java @@ -72,6 +72,7 @@ import org.apache.commons.lang3.StringUtils; public class JdbcCommon { private static final int MAX_DIGITS_IN_BIGINT = 19; +private static final int MAX_DIGITS_IN_INT = 9; public static long convertToAvroStream(final ResultSet rs, final OutputStream outStream, boolean convertNames) throws SQLException, IOException { return convertToAvroStream(rs, outStream, null, null, convertNames); @@ -284,7 +285,7 @@ public class JdbcCommon { break; case INTEGER: -if (meta.isSigned(i)) { +if (meta.isSigned(i) || (meta.getPrecision(i) > 0 && meta.getPrecision(i) <= MAX_DIGITS_IN_INT)) { builder.name(columnName).type().unionOf().nullBuilder().endNull().and().intType().endUnion().noDefault(); } else { builder.name(columnName).type().unionOf().nullBuilder().endNull().and().longType().endUnion().noDefault(); http://git-wip-us.apache.org/repos/asf/nifi/blob/ba513447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java -- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java index 18621d6..f8ce1f3 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestJdbcCommon.java @@ -282,6 +282,7 @@ public class TestJdbcCommon { final ResultSetMetaData metadata = mock(ResultSetMetaData.class); when(metadata.getColumnCount()).thenReturn(1); when(metadata.getColumnType(1)).thenReturn(Types.INTEGER); +when(metadata.getPrecision(1)).thenReturn(10); when(metadata.isSigned(1)).thenReturn(false); when(metadata.getColumnName(1)).thenReturn("Col1"); when(metadata.getTableName(1)).thenReturn("Table1"); @@ -311,6 +312,41 @@ public class TestJdbcCommon { assertTrue(foundNullSchema); } +@Test +public void testMediumUnsignedIntShouldBeInt() throws SQLException, IllegalArgumentException, IllegalAccessException { +final ResultSetMetaData metadata = mock(ResultSetMetaData.class); +when(metadata.getColumnCount()).thenReturn(1); +when(metadata.getColumnType(1)).thenReturn(Types.INTEGER); +when(metadata.getPrecision(1)).thenReturn(8); +when(metadata.isSigned(1)).thenReturn(false); +when(metadata.getColumnName(1)).thenReturn("Col1"); +when(metadata.getTableName(1)).thenReturn("Table1"); + +final ResultSet rs =
nifi-minifi git commit: MINIFI-126 Migrating improvements made in NiFi bootstrap
Repository: nifi-minifi Updated Branches: refs/heads/master 66595772e -> 5ac121fae MINIFI-126 Migrating improvements made in NiFi bootstrap This closes #59 Signed-off-by: Bryan RosanderProject: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/5ac121fa Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/5ac121fa Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/5ac121fa Branch: refs/heads/master Commit: 5ac121faea8efcc6c16a7e1e836549d339a478d8 Parents: 6659577 Author: Joseph Percivall Authored: Mon Nov 28 18:13:34 2016 -0500 Committer: Bryan Rosander Committed: Wed Nov 30 13:02:24 2016 -0500 -- .../nifi/minifi/bootstrap/BootstrapCodec.java | 2 +- .../apache/nifi/minifi/bootstrap/RunMiNiFi.java | 193 +-- .../nifi/minifi/bootstrap/ShutdownHook.java | 10 +- .../bootstrap/util/ConfigTransformer.java | 1 + .../src/main/resources/bin/dump-minifi.bat | 6 +- .../src/main/resources/bin/minifi-env.bat | 29 +++ .../src/main/resources/bin/minifi-env.sh| 28 +++ .../src/main/resources/bin/minifi.sh| 132 ++--- .../src/main/resources/bin/run-minifi.bat | 6 +- .../src/main/resources/bin/status-minifi.bat| 4 +- .../src/main/resources/conf/logback.xml | 10 +- 11 files changed, 325 insertions(+), 96 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/5ac121fa/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapCodec.java -- diff --git a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapCodec.java b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapCodec.java index 2e8a537..6e8ae91 100644 --- a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapCodec.java +++ b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapCodec.java @@ -85,7 +85,7 @@ public class BootstrapCodec { final String secretKey = args[1]; -runner.setNiFiCommandControlPort(port, secretKey); +runner.setMiNiFiCommandControlPort(port, secretKey); writer.write("OK"); writer.newLine(); writer.flush(); http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/5ac121fa/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 52a803c..9ac7e23 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 @@ -64,6 +64,7 @@ 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; @@ -73,6 +74,7 @@ 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; @@ -98,6 +100,8 @@ public class RunMiNiFi implements QueryableStatusAggregator, ConfigurationFileHo public static final String DEFAULT_CONFIG_FILE = "./conf/bootstrap.conf"; public static final String DEFAULT_NIFI_PROPS_FILE = "./conf/nifi.properties"; public static final String DEFAULT_JAVA_CMD = "java"; +public static final String DEFAULT_PID_DIR = "bin"; +public static final String DEFAULT_LOG_DIR = "./logs"; public static final String CONF_DIR_KEY = "conf.dir"; @@ -107,9 +111,14 @@ public class RunMiNiFi implements QueryableStatusAggregator, ConfigurationFileHo public static final String GRACEFUL_SHUTDOWN_PROP = "graceful.shutdown.seconds"; public static final String DEFAULT_GRACEFUL_SHUTDOWN_VALUE = "20"; -public static final String RUN_AS_PROP = "run.as"; +public static final String MINIFI_PID_DIR_PROP = "org.apache.nifi.minifi.bootstrap.config.pid.dir"; + +public static final String MINIFI_PID_FILE_NAME = "minifi.pid"; +public
[jira] [Commented] (MINIFI-125) Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap
[ https://issues.apache.org/jira/browse/MINIFI-125?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15709277#comment-15709277 ] ASF GitHub Bot commented on MINIFI-125: --- Github user brosander commented on a diff in the pull request: https://github.com/apache/nifi-minifi/pull/59#discussion_r90290047 --- Diff: minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java --- @@ -367,11 +399,40 @@ private synchronized void saveProperties(final Properties nifiProps, final Logge } try (final FileOutputStream fos = new FileOutputStream(statusFile)) { -nifiProps.store(fos, null); +minifiProps.store(fos, null); fos.getFD().sync(); } -logger.debug("Saved Properties {} to {}", new Object[]{nifiProps, statusFile}); +logger.debug("Saved Properties {} to {}", new Object[]{minifiProps, statusFile}); +} + +private synchronized void writePidFile(final String pid, final Logger logger) throws IOException { +final File pidFile = getPidFile(logger); +if (pidFile.exists() && !pidFile.delete()) { --- End diff -- Makes sense > Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap > - > > Key: MINIFI-125 > URL: https://issues.apache.org/jira/browse/MINIFI-125 > Project: Apache NiFi MiNiFi > Issue Type: Improvement >Reporter: Joseph Percivall >Assignee: Joseph Percivall > Fix For: 0.1.0 > > > There were commits improving the NiFi-bootstrap in 1.0.0. Not all of them > will be relevant to the MiNiFi bootstrap but some may be. Any applicable > changes/improvements should be applied to the MiNiFi Bootstrap. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
nifi git commit: NIFI-3117: - Checking referenced services when performing an action with a snippet that requires it. - Updating the SnippetManager to automatically expire unused snippets. - Making th
Repository: nifi Updated Branches: refs/heads/master e3c761134 -> bc223fa19 NIFI-3117: - Checking referenced services when performing an action with a snippet that requires it. - Updating the SnippetManager to automatically expire unused snippets. - Making the checking of referenced services consistent across component removal. - Adding checking of referenced services for all nested components in a snippet. - Updating the REST API docs to clarify when a referenced service is authorized. - Conditionally authorizing transitive service references. This closes #1277. Signed-off-by: Bryan BendeProject: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bc223fa1 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bc223fa1 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bc223fa1 Branch: refs/heads/master Commit: bc223fa197ae0d49f7f8cead3a4acc6c6a1cb023 Parents: e3c7611 Author: Matt Gilman Authored: Tue Nov 29 14:04:57 2016 -0500 Committer: Bryan Bende Committed: Wed Nov 30 12:50:25 2016 -0500 -- .../apache/nifi/controller/SnippetManager.java | 45 +-- .../AuthorizeControllerServiceReference.java| 34 ++ .../ConfigurableComponentAuthorizable.java | 9 + .../authorization/ProcessGroupAuthorizable.java | 70 - .../StandardAuthorizableLookup.java | 307 ++- .../nifi/web/api/ApplicationResource.java | 165 ++ .../nifi/web/api/ControllerServiceResource.java | 12 +- .../nifi/web/api/ProcessGroupResource.java | 25 +- .../apache/nifi/web/api/ProcessorResource.java | 12 +- .../nifi/web/api/ReportingTaskResource.java | 12 +- .../apache/nifi/web/api/SnippetResource.java| 51 ++- 11 files changed, 475 insertions(+), 267 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/bc223fa1/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/SnippetManager.java -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/SnippetManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/SnippetManager.java index 3a9662e..06f4975 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/SnippetManager.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/SnippetManager.java @@ -16,49 +16,52 @@ */ package org.apache.nifi.controller; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import org.apache.nifi.persistence.StandardSnippetDeserializer; +import org.apache.nifi.persistence.StandardSnippetSerializer; +import org.apache.nifi.stream.io.ByteArrayInputStream; +import org.apache.nifi.stream.io.ByteArrayOutputStream; +import org.apache.nifi.stream.io.DataOutputStream; +import org.apache.nifi.stream.io.StreamUtils; + import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import org.apache.nifi.stream.io.ByteArrayInputStream; -import org.apache.nifi.stream.io.ByteArrayOutputStream; -import org.apache.nifi.stream.io.DataOutputStream; -import org.apache.nifi.stream.io.StreamUtils; -import org.apache.nifi.persistence.StandardSnippetDeserializer; -import org.apache.nifi.persistence.StandardSnippetSerializer; +import java.util.concurrent.TimeUnit; public class SnippetManager { -private final ConcurrentMap snippetMap = new ConcurrentHashMap<>(); +private final Cache snippetMap = CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(); -public void addSnippet(final StandardSnippet snippet) { -final StandardSnippet oldSnippet = this.snippetMap.putIfAbsent(snippet.getId(), snippet); -if (oldSnippet != null) { +public synchronized void addSnippet(final StandardSnippet snippet) { +if (snippetMap.getIfPresent(snippet.getId()) != null) { throw new IllegalStateException("Snippet with ID " + snippet.getId() + " already exists"); } +snippetMap.put(snippet.getId(), snippet); } -public void removeSnippet(final StandardSnippet snippet) { -if (!snippetMap.remove(snippet.getId(), snippet)) { +public synchronized void
[jira] [Commented] (MINIFI-125) Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap
[ https://issues.apache.org/jira/browse/MINIFI-125?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15709209#comment-15709209 ] ASF GitHub Bot commented on MINIFI-125: --- Github user brosander commented on a diff in the pull request: https://github.com/apache/nifi-minifi/pull/59#discussion_r90285106 --- Diff: minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java --- @@ -367,11 +399,40 @@ private synchronized void saveProperties(final Properties nifiProps, final Logge } try (final FileOutputStream fos = new FileOutputStream(statusFile)) { -nifiProps.store(fos, null); +minifiProps.store(fos, null); fos.getFD().sync(); } -logger.debug("Saved Properties {} to {}", new Object[]{nifiProps, statusFile}); +logger.debug("Saved Properties {} to {}", new Object[]{minifiProps, statusFile}); +} + +private synchronized void writePidFile(final String pid, final Logger logger) throws IOException { +final File pidFile = getPidFile(logger); +if (pidFile.exists() && !pidFile.delete()) { --- End diff -- Fair enough, I'm ok with it for now. > Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap > - > > Key: MINIFI-125 > URL: https://issues.apache.org/jira/browse/MINIFI-125 > Project: Apache NiFi MiNiFi > Issue Type: Improvement >Reporter: Joseph Percivall >Assignee: Joseph Percivall > Fix For: 0.1.0 > > > There were commits improving the NiFi-bootstrap in 1.0.0. Not all of them > will be relevant to the MiNiFi bootstrap but some may be. Any applicable > changes/improvements should be applied to the MiNiFi Bootstrap. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (MINIFI-125) Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap
[ https://issues.apache.org/jira/browse/MINIFI-125?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15708720#comment-15708720 ] ASF GitHub Bot commented on MINIFI-125: --- Github user brosander commented on a diff in the pull request: https://github.com/apache/nifi-minifi/pull/59#discussion_r90240544 --- Diff: minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java --- @@ -357,8 +387,10 @@ private synchronized void saveProperties(final Properties nifiProps, final Logge try { final Set perms = new HashSet<>(); -perms.add(PosixFilePermission.OWNER_READ); perms.add(PosixFilePermission.OWNER_WRITE); +perms.add(PosixFilePermission.OWNER_READ); +perms.add(PosixFilePermission.GROUP_READ); +perms.add(PosixFilePermission.OTHERS_READ); --- End diff -- On further investigation, it seems like this is just the pid file (I initially assumed it was the properties file) I'm ok with others knowing the pid since OS permissions should still keep them from doing bad things. (Also, it's not uncommon to be able to list all processes) > Implement applicable NiFi 1.0.0 bootstrap changes to MiNiFi bootstrap > - > > Key: MINIFI-125 > URL: https://issues.apache.org/jira/browse/MINIFI-125 > Project: Apache NiFi MiNiFi > Issue Type: Improvement >Reporter: Joseph Percivall >Assignee: Joseph Percivall > Fix For: 0.1.0 > > > There were commits improving the NiFi-bootstrap in 1.0.0. Not all of them > will be relevant to the MiNiFi bootstrap but some may be. Any applicable > changes/improvements should be applied to the MiNiFi Bootstrap. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (MINIFI-143) Class Not Found Exception when running on Windows 8
[ https://issues.apache.org/jira/browse/MINIFI-143?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15708709#comment-15708709 ] ASF GitHub Bot commented on MINIFI-143: --- Github user asfgit closed the pull request at: https://github.com/apache/nifi-minifi/pull/61 > Class Not Found Exception when running on Windows 8 > --- > > Key: MINIFI-143 > URL: https://issues.apache.org/jira/browse/MINIFI-143 > Project: Apache NiFi MiNiFi > Issue Type: Bug > Components: Agent Configuration/Installation >Affects Versions: 0.0.1 >Reporter: Joseph Percivall >Assignee: Aldrin Piri > Fix For: 0.1.0 > > > When executing run-minifi.bat script on Windows 8 I run into this exception: > {code} > C:\nifi-minifi\minifi-assembly\target\minifi-0.1.0-SNAPSHOT-bin\minifi-0.1.0-SNA > PSHOT\bin>run-minifi.bat > Error: A JNI error has occurred, please check your installation and try again > Exception in thread "main" java.lang.NoClassDefFoundError: org/slf4j/Logger > at java.lang.Class.getDeclaredMethods0(Native Method) > at java.lang.Class.privateGetDeclaredMethods(Class.java:2701) > at java.lang.Class.privateGetMethodRecursive(Class.java:3048) > at java.lang.Class.getMethod0(Class.java:3018) > at java.lang.Class.getMethod(Class.java:1784) > at > sun.launcher.LauncherHelper.validateMainClass(LauncherHelper.java:544 > ) > at > sun.launcher.LauncherHelper.checkAndLoadMain(LauncherHelper.java:526) > Caused by: java.lang.ClassNotFoundException: org.slf4j.Logger > at java.net.URLClassLoader.findClass(URLClassLoader.java:381) > at java.lang.ClassLoader.loadClass(ClassLoader.java:424) > at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:331) > at java.lang.ClassLoader.loadClass(ClassLoader.java:357) > ... 7 more > {code} -- This message was sent by Atlassian JIRA (v6.3.4#6332)
nifi-minifi git commit: MINIFI-143 Correcting library classpath for Windows environments to reflect changes in assembly structure.
Repository: nifi-minifi Updated Branches: refs/heads/master d623521b1 -> 66595772e MINIFI-143 Correcting library classpath for Windows environments to reflect changes in assembly structure. This closes #61 Signed-off-by: Bryan RosanderProject: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/66595772 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/66595772 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/66595772 Branch: refs/heads/master Commit: 66595772ea5de5ecc45f5ae62d8fc75ac4ca32c5 Parents: d623521 Author: Aldrin Piri Authored: Tue Nov 29 17:20:57 2016 -0500 Committer: Bryan Rosander Committed: Wed Nov 30 09:14:39 2016 -0500 -- .../minifi-resources/src/main/resources/bin/dump-minifi.bat | 5 +++-- .../minifi-resources/src/main/resources/bin/run-minifi.bat | 5 +++-- .../minifi-resources/src/main/resources/bin/status-minifi.bat | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/66595772/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/dump-minifi.bat -- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/dump-minifi.bat b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/dump-minifi.bat index d55fcfd..ecf831f 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/dump-minifi.bat +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/dump-minifi.bat @@ -33,13 +33,14 @@ goto startMiNifi :startMiNifi set MINIFI_ROOT=%~dp0..\ pushd "%MINIFI_ROOT%" -set LIB_DIR=lib\bootstrap +set BOOTSTRAP_LIB_DIR=lib\bootstrap +set LIB_DIR=lib set CONF_DIR=conf set BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf set JAVA_ARGS=-Dorg.apache.nifi.minifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% -SET JAVA_PARAMS=-cp %CONF_DIR%;%LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.minifi.bootstrap.RunMiNiFi +set JAVA_PARAMS=-cp %CONF_DIR%;%BOOTSTRAP_LIB_DIR%\*;%LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.minifi.bootstrap.RunMiNiFi set BOOTSTRAP_ACTION=dump cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION% http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/66595772/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/run-minifi.bat -- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/run-minifi.bat b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/run-minifi.bat index 8750af6..d0b50d8 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/run-minifi.bat +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/run-minifi.bat @@ -33,13 +33,14 @@ goto startMiNifi :startMiNifi set MiNIFI_ROOT=%~dp0..\ pushd "%MiNIFI_ROOT%" -set LIB_DIR=lib\bootstrap +set BOOTSTRAP_LIB_DIR=lib\bootstrap +set LIB_DIR=lib set CONF_DIR=conf set BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf set JAVA_ARGS=-Dorg.apache.nifi.minifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% -SET JAVA_PARAMS=-cp %CONF_DIR%;%LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.minifi.bootstrap.RunMiNiFi +set JAVA_PARAMS=-cp %CONF_DIR%;%BOOTSTRAP_LIB_DIR%\*;%LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.minifi.bootstrap.RunMiNiFi set BOOTSTRAP_ACTION=run cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION% http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/66595772/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/status-minifi.bat -- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/status-minifi.bat b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/status-minifi.bat index 8551baa..5f36259 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/status-minifi.bat +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/bin/status-minifi.bat @@ -33,13 +33,14 @@ goto startMiNifi :startMiNifi set
[jira] [Commented] (MINIFI-139) Build fails on OS X 10.12
[ https://issues.apache.org/jira/browse/MINIFI-139?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15708563#comment-15708563 ] Jeremy Dyer commented on MINIFI-139: Also validated this build against raspbian Jesse 2016-11-25 on a RPI Model B > Build fails on OS X 10.12 > - > > Key: MINIFI-139 > URL: https://issues.apache.org/jira/browse/MINIFI-139 > Project: Apache NiFi MiNiFi > Issue Type: Bug > Components: C++ > Environment: Mac OS X 10.12 >Reporter: Jeremy Dyer >Priority: Minor > Labels: build > > The minifi-cpp build fails on OS X 10.12 (Sierra). The build works on Ubuntu > 16.10 and CentOS 7.2. It seems that on OS X 10.12 leveldb libraries are not > being properly resolved however causing the Provenance.h dependency check to > fail. LevelDB version 1.18 is installed on the local OS X instance. -- This message was sent by Atlassian JIRA (v6.3.4#6332)