svn commit: r939454 - /websites/production/nifi/content/
Author: joewitt Date: Sun Feb 8 17:07:23 2015 New Revision: 939454 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r939453, websites/staging/nifi/trunk/content/
incubator-nifi git commit: Appended keys and added typical header
Repository: incubator-nifi Updated Branches: refs/heads/develop b5c70587b - 01a63bd04 Appended keys and added typical header Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/01a63bd0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/01a63bd0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/01a63bd0 Branch: refs/heads/develop Commit: 01a63bd04549eb6db167ea99e1cf954727c7f344 Parents: b5c7058 Author: joewitt joew...@apache.org Authored: Wed Jan 14 19:17:31 2015 -0500 Committer: joewitt joew...@apache.org Committed: Wed Jan 14 19:17:31 2015 -0500 -- KEYS | 90 +++ 1 file changed, 90 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/01a63bd0/KEYS -- diff --git a/KEYS b/KEYS index 8089ee9..cac752f 100644 --- a/KEYS +++ b/KEYS @@ -1,3 +1,13 @@ +This file contains the PGP keys of various developers. + +Users: pgp KEYS + gpg --import KEYS +Developers: +pgp -kxa your name and append it to this file. +(pgpk -ll your name pgpk -xa your name) this file. +(gpg --list-sigs your name + gpg --armor --export your name) this file. + pub 4096R/98B1CC53 2010-10-23 uid Benson Margulies bimargul...@apache.org sub 4096R/C5E91334 2010-10-23 @@ -54,3 +64,83 @@ numenORuE0/O7DgoihMrYzTTaRBkHLssIzfaPu96jcWjU9dhuxFW5AktUshr2RLw EaWfWeQZ4Q== =b8+3 -END PGP PUBLIC KEY BLOCK- + + +pub 2048R/4F811A1A 2014-08-26 +uid Joseph Witt joew...@apache.org +sig 34F811A1A 2015-01-15 Joseph Witt joew...@apache.org +uid Joseph Witt joe.w...@gmail.com +sig 34F811A1A 2014-11-27 Joseph Witt joew...@apache.org +sub 2048R/E45C0258 2014-08-26 +sig 4F811A1A 2014-08-26 Joseph Witt joew...@apache.org + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v2.0.22 (GNU/Linux) + +mQENBFP74wQBCADCKbvNYxUB6Ms0Qgfy4VYWMZ3t99rYDUoQvyknw4DLUXFZJ1XC +hPfRkmF2yIQ1WkOE9eQ19iAJ3EBzMtJK5/C68G9sk1FWh5z4HqIkEhNi4pVKJOnj +fz7KrbUUJ1AnmAK3yR+nTVDEo5CRsMK3KXporfch3GQDbSQy+/3tkFU8sGqn8SAd +ILwfyo/YVtKWKfwOWPV/bYIMoTEn5stq9Y6EmkvFE5kZe6m1YyLaXcPaI77bwOXD +WuuwbmjvTASTTdXknG3be/U9f3jtMV8aeRRPfBrWkjJW45/y4cFEwbL7KT/b1QvW +jlRFWkOx67ghnbmvUrCRvOXLDrnWeV5i80lLABEBAAG0IEpvc2VwaCBXaXR0IDxq +b2Uud2l0dEBnbWFpbC5jb20+iQE3BBMBAgAhAhsDAh4BAheABQJUdq/tBQsJCAcD +BRUKCQgLBRYCAwEAAAoJEJCTv4VPgRoa5e4H/jCQqGetejbC7FwItc+HmrA9+7NP +gYf5zPQUPrOndfCxDcAbiqp7A9L9J+84JoHqbamjTq1/j5gkMQiF7tvUWrHUqXjM +thvEEe+FKYaDdUfDWay+cgyDoJR7kKtbG051+y2pEPzNZqvziLny8gro2cgZms/x +WTRXR5zMzkAThESdPd86FCZ+FHByTe0llJE68Ug+qngcc3yMR+UdotvB81ukOf4N +ZPVvM1If7sn4Yy5rBK/WdxAYfiHKvObECtuHXnPn232mQOAKYd1K+SeOnxkix0IB +34kXOZk+nuRDnW77/oeKTvwhjAfiDWG9AJLkUi0R1kGQzjzod4Mq6v+ta3u0IEpv +c2VwaCBXaXR0IDxqb2V3aXR0QGFwYWNoZS5vcmc+iQE5BBMBAgAjBQJUtwShAhsD +BwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQkJO/hU+BGhr/eAgAj59xF3Ay +gzJWhdev5ZTL35izJ816DocUpk4LrLHvd8F0fvfwuQaS22XNMuvMtyLn+KBdPeuH +LHUOWZhLNwV5Q3qOiVFCk9DYwCaIVq2ZxsxlHOl5hf/4AFTFhCzhmUm/DbK1Ahcp +eL6KuhkMYTRwRj92LtWwObnvhlvopiYv0jVzWTj/cMFWq07BV/vdRq+11NpndoJS +JlWyKjUEfhEoYxa8SzsjVEqse55TI7VVgqsgWqQCIag71J8cZasMxbj/evtPL4ab +566PnnmGbufSqptQ50/bWMbYsGDHV+gktHsimHtzg5fMvHy/4b0fIF4C+27MhHPK +fQmcraXZ/tKcebkBDQRT++MEAQgAxODFekTd5GhRlM9lYqCpKFti8HW1q3fehM0I +IHkWyhAbBO1vfcC9wJliaAl+tHgotzz0ZaMyuH7YJ98DQpQ/7nliaf5x+CdIjolQ +eHqUjYY2c0M6beJ3569BgfrZ1tYnznGhvkvmUsIRhH8RTj39Iga4txBHhGLN6xzE +j0AilHhT7TG2jr4x1Y1PnrRJfHamTVBlJ/4MbmcNbMWar/wLWYsQk+ygGwCqZmB+ +GN599dTKrzixobEKg6JoLgwXWPKzFbfLqvu9jTYf1EVg5BfvwxYPwnB7fCr52XgP +1zD1EuSBl4eQDhbJ3yUkRDYrz0o8OsMD/FpiCVilv//tw5s08wARAQABiQEfBBgB +AgAJBQJT++MEAhsMAAoJEJCTv4VPgRoa0BkH/jILuRXt0vrVMaQWWPfgdIXjqTge +iAoG5tOBEUPu6IKi49Ed6p9Gp7+hq9uPiwxp5aTSaKUDReZYNol+NN+ow1YdMJxd +PZwH/OxiqQH2lx/dwoXan6VVORkgpGdh8DW3Xm8sk5moMm76Osktj3rNnnI9Xmqg +pXPJzANlwijNhaQPmHDYteybKsY5oU+guXuhWlOJ/5LLiOLdgYaF9TN75973bBW7 +6622Mm+KA+NrdbNAEZ6F2iVry6HWIXyBMRK9sD2nNEdqOTo3HX6Iz/FbG9KKz3qC +jTV5DLe6QqCkuu5IrLDfU5lU1LyuQSYSBfhcUMMa5h1iPfsX2rL1c2MpYMc= +=2Pk/ +-END PGP PUBLIC KEY BLOCK- + + +pub 2048R/3DD8317F 2014-08-31 +uid Tony Kurc tk...@apache.org +sig 33DD8317F 2015-01-15 Tony Kurc tk...@apache.org +uid Tony Kurc tk...@gizmolabs.org +sig 33DD8317F 2014-08-31 Tony Kurc tk...@apache.org +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.7 (FreeBSD) + +mQENBFQCZ5kBCACvnOSvPUnKeLKvbO/QYi/cyPmjVaANucftepG9G5Hu/BAaCfW+ +71cSiSkQvr16THoiNP/wsTOkrxk+ZtSVayGJTXSY9FGsnLOVMPkdXiDcV3sDIH6t +HM76Eve+yHLoVbMW9qFc0LbvxFiHouFg4cyH85WSIoORRJ+k6JdxqklrS4XIrcir +6rVP/7vfijOykvRXtWPCBCmOrFVIa6AIl+BGm3VoDMdmD0nDEw7n8ekpbMdwkxax +5K
incubator-nifi git commit: NIFI-270 updating poms approaching release - about to practice another staging build
Repository: incubator-nifi
Updated Branches:
refs/heads/nifi-270-release-setup 314241ba8 - a2f63c7c8
NIFI-270 updating poms approaching release - about to practice another staging
build
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a2f63c7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a2f63c7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a2f63c7c
Branch: refs/heads/nifi-270-release-setup
Commit: a2f63c7c886495ccee52a448e7a9625ad65ad1f9
Parents: 314241b
Author: joewitt joew...@apache.org
Authored: Fri Jan 16 11:59:49 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 16 11:59:49 2015 -0500
--
maven-plugins/nar-maven-plugin/pom.xml | 91 +++---
nifi/pom.xml | 114
2 files changed, 93 insertions(+), 112 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a2f63c7c/maven-plugins/nar-maven-plugin/pom.xml
--
diff --git a/maven-plugins/nar-maven-plugin/pom.xml
b/maven-plugins/nar-maven-plugin/pom.xml
index b176de6..5c9bc62 100644
--- a/maven-plugins/nar-maven-plugin/pom.xml
+++ b/maven-plugins/nar-maven-plugin/pom.xml
@@ -59,8 +59,8 @@
connectionscm:git:git://git.apache.org/incubator-nifi.git/connection
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection
urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url
- tagHEAD/tag
- /scm
+tagHEAD/tag
+/scm
issueManagement
systemJIRA/system
urlhttps://issues.apache.org/jira/browse/NIFI/url
@@ -68,7 +68,7 @@
properties
maven.compiler.source1.7/maven.compiler.source
maven.compiler.target1.7/maven.compiler.target
-maven.version3.0.5/maven.version
+maven.min-version3.0.5/maven.min-version
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
/properties
@@ -144,24 +144,24 @@
artifactIdmaven-release-plugin/artifactId
version2.5.1/version
configuration
- useReleaseProfiletrue/useReleaseProfile
- releaseProfilesapache-release/releaseProfiles
- autoVersionSubmodulestrue/autoVersionSubmodules
- goalsdeploy/goals
-
tagNameFormat@{project.artifactId}-@{project.version}/tagNameFormat
- pushChangesfalse/pushChanges
- localCheckouttrue/localCheckout
+useReleaseProfiletrue/useReleaseProfile
+releaseProfilesapache-release/releaseProfiles
+autoVersionSubmodulestrue/autoVersionSubmodules
+goalsdeploy/goals
+
tagNameFormat@{project.artifactId}-@{project.version}/tagNameFormat
+pushChangesfalse/pushChanges
+localCheckouttrue/localCheckout
/configuration
executions
- execution
-iddefault/id
-goals
- goalperform/goal
-/goals
-configuration
-
pomFileNamemaven-plugins/nar-maven-plugin/pom.xml/pomFileName
-/configuration
- /execution
+execution
+iddefault/id
+goals
+goalperform/goal
+/goals
+configuration
+
pomFileNamemaven-plugins/nar-maven-plugin/pom.xml/pomFileName
+/configuration
+/execution
/executions
/plugin
plugin
@@ -179,16 +179,16 @@
/plugins
/pluginManagement
plugins
- plugin
- groupIdorg.sonatype.plugins/groupId
- artifactIdnexus-staging-maven-plugin/artifactId
- version1.6.5/version
- extensionstrue/extensions
- configuration
- serverIdrepository.apache.org/serverId
- nexusUrlhttps://repository.apache.org//nexusUrl
- /configuration
- /plugin
+plugin
+groupIdorg.sonatype.plugins/groupId
+artifactIdnexus-staging-maven-plugin/artifactId
[3/3] incubator-nifi git commit: NIFI-270 staging build for nar plugin good. Now to try for full build
NIFI-270 staging build for nar plugin good. Now to try for full build Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9c8c1c4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9c8c1c4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9c8c1c4f Branch: refs/heads/nifi-270-release-setup Commit: 9c8c1c4f48b951c06301077ffbcd51eb470d31cc Parents: b1be36e Author: joewitt joew...@apache.org Authored: Fri Jan 16 12:20:20 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 12:20:20 2015 -0500 -- nifi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c8c1c4f/nifi/pom.xml -- diff --git a/nifi/pom.xml b/nifi/pom.xml index d6d312d..f64f13b 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -1002,7 +1002,7 @@ plugin groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.2-test-incubating/version +version0.0.3-test-incubating/version extensionstrue/extensions /plugin /plugins
[2/3] incubator-nifi git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b1be36e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b1be36e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b1be36e6 Branch: refs/heads/nifi-270-release-setup Commit: b1be36e6221d1275cd81f160238f04ebf0c7dbe1 Parents: eb3d599 Author: joewitt joew...@apache.org Authored: Fri Jan 16 12:01:27 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 12:01:27 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1be36e6/maven-plugins/nar-maven-plugin/pom.xml -- diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 2bbfeb6..9e2ba97 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.3-test-incubating/version +version0.0.4-test-incubating-SNAPSHOT/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description @@ -59,7 +59,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagnar-maven-plugin-0.0.3-test-incubating/tag +tagHEAD/tag /scm issueManagement systemJIRA/system
[1/3] incubator-nifi git commit: [maven-release-plugin] prepare release nar-maven-plugin-0.0.3-test-incubating
Repository: incubator-nifi Updated Branches: refs/heads/nifi-270-release-setup a2f63c7c8 - 9c8c1c4f4 [maven-release-plugin] prepare release nar-maven-plugin-0.0.3-test-incubating Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/eb3d5992 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/eb3d5992 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/eb3d5992 Branch: refs/heads/nifi-270-release-setup Commit: eb3d59920aaf329254fe23abb1dbfdd4873fd8dd Parents: a2f63c7 Author: joewitt joew...@apache.org Authored: Fri Jan 16 12:01:17 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 12:01:17 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/eb3d5992/maven-plugins/nar-maven-plugin/pom.xml -- diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 5c9bc62..2bbfeb6 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.3-test-incubating-SNAPSHOT/version +version0.0.3-test-incubating/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description @@ -59,7 +59,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagHEAD/tag +tagnar-maven-plugin-0.0.3-test-incubating/tag /scm issueManagement systemJIRA/system
incubator-nifi git commit: NIFI-270 nar maven plugin now on proper version scheme for incubator
Repository: incubator-nifi Updated Branches: refs/heads/nifi-270-release-setup 9c8c1c4f4 - c91d875f3 NIFI-270 nar maven plugin now on proper version scheme for incubator Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c91d875f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c91d875f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c91d875f Branch: refs/heads/nifi-270-release-setup Commit: c91d875f3649b73ce909585780b2e218736e76d6 Parents: 9c8c1c4 Author: joewitt joew...@apache.org Authored: Fri Jan 16 12:32:07 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 12:32:07 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 2 +- nifi/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c91d875f/maven-plugins/nar-maven-plugin/pom.xml -- diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 9e2ba97..4d762e9 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.4-test-incubating-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c91d875f/nifi/pom.xml -- diff --git a/nifi/pom.xml b/nifi/pom.xml index f64f13b..78a81ad 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -1002,7 +1002,7 @@ plugin groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.3-test-incubating/version +version0.0.1-incubating-SNAPSHOT/version extensionstrue/extensions /plugin /plugins
[03/16] incubator-nifi git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c222859a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c222859a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c222859a Branch: refs/heads/develop Commit: c222859a2510cf27aa1cb24caa719717bf98bb80 Parents: 7632514 Author: Benson Margulies bimargul...@apache.org Authored: Fri Jan 16 07:47:59 2015 -0500 Committer: Benson Margulies bimargul...@apache.org Committed: Fri Jan 16 07:47:59 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- maven-plugins/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c222859a/maven-plugins/nar-maven-plugin/pom.xml -- diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index fcf9c54..cb09ff8 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -19,10 +19,10 @@ parent groupIdorg.apache.nifi/groupId artifactIdmaven-plugins/artifactId -version0.0.1-test-incubating/version +version0.0.2-test-incubating-SNAPSHOT/version /parent artifactIdnar-maven-plugin/artifactId -version0.0.1-test-incubating/version +version0.0.2-test-incubating-SNAPSHOT/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c222859a/maven-plugins/pom.xml -- diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 127fde4..22be9c9 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdmaven-plugins/artifactId -version0.0.1-test-incubating/version +version0.0.2-test-incubating-SNAPSHOT/version packagingpom/packaging nameApache NiFi Maven Plugins/name descriptionApache NiFi Maven Plugins. It is currently a part of the Apache Incubator./description @@ -65,7 +65,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url - tagmaven-plugins-0.0.1-test-incubating/tag + tagHEAD/tag /scm issueManagement systemJIRA/system
[15/16] incubator-nifi git commit: NIFI-270 nar maven plugin now on proper version scheme for incubator
NIFI-270 nar maven plugin now on proper version scheme for incubator Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c91d875f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c91d875f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c91d875f Branch: refs/heads/develop Commit: c91d875f3649b73ce909585780b2e218736e76d6 Parents: 9c8c1c4 Author: joewitt joew...@apache.org Authored: Fri Jan 16 12:32:07 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 12:32:07 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 2 +- nifi/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c91d875f/maven-plugins/nar-maven-plugin/pom.xml -- diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 9e2ba97..4d762e9 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.4-test-incubating-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c91d875f/nifi/pom.xml -- diff --git a/nifi/pom.xml b/nifi/pom.xml index f64f13b..78a81ad 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -1002,7 +1002,7 @@ plugin groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.3-test-incubating/version +version0.0.1-incubating-SNAPSHOT/version extensionstrue/extensions /plugin /plugins
[16/16] incubator-nifi git commit: Merge branch 'nifi-270-release-setup' into develop
Merge branch 'nifi-270-release-setup' into develop Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ad1b768f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ad1b768f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ad1b768f Branch: refs/heads/develop Commit: ad1b768fc22633f52e1c8aba9f277ef39d6653fb Parents: 73384b2 c91d875 Author: joewitt joew...@apache.org Authored: Fri Jan 16 12:33:33 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 12:33:33 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 206 - maven-plugins/pom.xml | 346 nifi/pom.xml | 114 +++-- 3 files changed, 233 insertions(+), 433 deletions(-) --
[14/16] incubator-nifi git commit: NIFI-270 staging build for nar plugin good. Now to try for full build
NIFI-270 staging build for nar plugin good. Now to try for full build Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9c8c1c4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9c8c1c4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9c8c1c4f Branch: refs/heads/develop Commit: 9c8c1c4f48b951c06301077ffbcd51eb470d31cc Parents: b1be36e Author: joewitt joew...@apache.org Authored: Fri Jan 16 12:20:20 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 12:20:20 2015 -0500 -- nifi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c8c1c4f/nifi/pom.xml -- diff --git a/nifi/pom.xml b/nifi/pom.xml index d6d312d..f64f13b 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -1002,7 +1002,7 @@ plugin groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.2-test-incubating/version +version0.0.3-test-incubating/version extensionstrue/extensions /plugin /plugins
[04/16] incubator-nifi git commit: NIFI-270: rework to assume that each maven item is released independently.
NIFI-270: rework to assume that each maven item is released independently.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3ed0d13d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3ed0d13d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3ed0d13d
Branch: refs/heads/develop
Commit: 3ed0d13da1bf4388f85998da38efc4506ddac7ca
Parents: c222859
Author: Benson Margulies bimargul...@apache.org
Authored: Fri Jan 16 08:05:15 2015 -0500
Committer: Benson Margulies bimargul...@apache.org
Committed: Fri Jan 16 08:05:15 2015 -0500
--
maven-plugins/nar-maven-plugin/pom.xml | 161 -
maven-plugins/pom.xml | 358
nifi/pom.xml | 2 +-
3 files changed, 159 insertions(+), 362 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3ed0d13d/maven-plugins/nar-maven-plugin/pom.xml
--
diff --git a/maven-plugins/nar-maven-plugin/pom.xml
b/maven-plugins/nar-maven-plugin/pom.xml
index cb09ff8..dba4ca2 100644
--- a/maven-plugins/nar-maven-plugin/pom.xml
+++ b/maven-plugins/nar-maven-plugin/pom.xml
@@ -17,16 +17,167 @@
modelVersion4.0.0/modelVersion
parent
-groupIdorg.apache.nifi/groupId
-artifactIdmaven-plugins/artifactId
-version0.0.2-test-incubating-SNAPSHOT/version
+groupIdorg.apache/groupId
+artifactIdapache/artifactId
+version16/version
+relativePath /
/parent
+
artifactIdnar-maven-plugin/artifactId
version0.0.2-test-incubating-SNAPSHOT/version
packagingmaven-plugin/packaging
nameApache NiFi NAR Plugin/name
descriptionApache NiFi Nar Plugin. It is currently a part of the Apache
Incubator./description
+urlhttp://nifi.incubator.apache.org/maven-site//url
+organization
+nameApache NiFi (incubating) Project/name
+urlhttp://nifi.incubating.apache.org//url
+/organization
+licenses
+license
+nameApache License, Version 2.0/name
+urlhttp://www.apache.org/licenses/LICENSE-2.0/url
+/license
+/licenses
+mailingLists
+mailingList
+nameDev/name
+subscribedev-subscr...@nifi.incubator.apache.org/subscribe
+
unsubscribedev-unsubscr...@nifi.incubator.apache.org/unsubscribe
+postd...@nifi.incubator.apache.org/post
+
archivehttp://mail-archives.apache.org/mod_mbox/incubator-nifi-dev/archive
+/mailingList
+mailingList
+nameCommits/name
+subscribecommits-subscr...@nifi.incubator.apache.org/subscribe
+
unsubscribecommits-unsubscr...@nifi.incubator.apache.org/unsubscribe
+postcommits@nifi.incubator.apache.org/post
+
archivehttp://mail-archives.apache.org/mod_mbox/incubator-nifi-commits/archive
+/mailingList
+/mailingLists
+scm
+
connectionscm:git:git://git.apache.org/incubator-nifi.git/connection
+
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection
+urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url
+ tagHEAD/tag
+ /scm
+issueManagement
+systemJIRA/system
+urlhttps://issues.apache.org/jira/browse/NIFI/url
+/issueManagement
+properties
+maven.compiler.source1.7/maven.compiler.source
+maven.compiler.target1.7/maven.compiler.target
+maven.version3.0.5/maven.version
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+
project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
+/properties
+prerequisites
+maven${maven.min-version}/maven
+/prerequisites
build
+pluginManagement
+plugins
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-compiler-plugin/artifactId
+version3.2/version
+configuration
+forktrue/fork
+optimizetrue/optimize
+showDeprecationtrue/showDeprecation
+showWarningstrue/showWarnings
+/configuration
+/plugin
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-resources-plugin/artifactId
+version2.7/version
+/plugin
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+version2.18/version
[07/16] incubator-nifi git commit: NIFI-270: retreat to old maven plugin API version.
NIFI-270: retreat to old maven plugin API version. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/7a70a174 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/7a70a174 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/7a70a174 Branch: refs/heads/develop Commit: 7a70a1744e76b571d3ea2c94473e813b06d72bee Parents: d2160fe Author: Benson Margulies bimargul...@apache.org Authored: Fri Jan 16 08:23:44 2015 -0500 Committer: Benson Margulies bimargul...@apache.org Committed: Fri Jan 16 08:23:44 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7a70a174/maven-plugins/nar-maven-plugin/pom.xml -- diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 5b557c9..715503b 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -215,7 +215,7 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId -version3.0.5/version +version2.2.1/version /dependency dependency groupIdorg.apache.maven.plugins/groupId
[10/16] incubator-nifi git commit: NIFI-270: remove reference to nonexistent check-license profile.
NIFI-270: remove reference to nonexistent check-license profile.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/314241ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/314241ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/314241ba
Branch: refs/heads/develop
Commit: 314241ba81d5c0aec53d1df26b3d8d3e92544dba
Parents: ab2032e
Author: Benson Margulies bimargul...@apache.org
Authored: Fri Jan 16 08:40:47 2015 -0500
Committer: Benson Margulies bimargul...@apache.org
Committed: Fri Jan 16 08:40:47 2015 -0500
--
maven-plugins/nar-maven-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/314241ba/maven-plugins/nar-maven-plugin/pom.xml
--
diff --git a/maven-plugins/nar-maven-plugin/pom.xml
b/maven-plugins/nar-maven-plugin/pom.xml
index 124850d..b176de6 100644
--- a/maven-plugins/nar-maven-plugin/pom.xml
+++ b/maven-plugins/nar-maven-plugin/pom.xml
@@ -145,7 +145,7 @@
version2.5.1/version
configuration
useReleaseProfiletrue/useReleaseProfile
-
releaseProfilesapache-release,check-licenses/releaseProfiles
+ releaseProfilesapache-release/releaseProfiles
autoVersionSubmodulestrue/autoVersionSubmodules
goalsdeploy/goals
tagNameFormat@{project.artifactId}-@{project.version}/tagNameFormat
[13/16] incubator-nifi git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b1be36e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b1be36e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b1be36e6 Branch: refs/heads/develop Commit: b1be36e6221d1275cd81f160238f04ebf0c7dbe1 Parents: eb3d599 Author: joewitt joew...@apache.org Authored: Fri Jan 16 12:01:27 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 12:01:27 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1be36e6/maven-plugins/nar-maven-plugin/pom.xml -- diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 2bbfeb6..9e2ba97 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.3-test-incubating/version +version0.0.4-test-incubating-SNAPSHOT/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description @@ -59,7 +59,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagnar-maven-plugin-0.0.3-test-incubating/tag +tagHEAD/tag /scm issueManagement systemJIRA/system
[11/16] incubator-nifi git commit: NIFI-270 updating poms approaching release - about to practice another staging build
NIFI-270 updating poms approaching release - about to practice another staging
build
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a2f63c7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a2f63c7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a2f63c7c
Branch: refs/heads/develop
Commit: a2f63c7c886495ccee52a448e7a9625ad65ad1f9
Parents: 314241b
Author: joewitt joew...@apache.org
Authored: Fri Jan 16 11:59:49 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 16 11:59:49 2015 -0500
--
maven-plugins/nar-maven-plugin/pom.xml | 91 +++---
nifi/pom.xml | 114
2 files changed, 93 insertions(+), 112 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a2f63c7c/maven-plugins/nar-maven-plugin/pom.xml
--
diff --git a/maven-plugins/nar-maven-plugin/pom.xml
b/maven-plugins/nar-maven-plugin/pom.xml
index b176de6..5c9bc62 100644
--- a/maven-plugins/nar-maven-plugin/pom.xml
+++ b/maven-plugins/nar-maven-plugin/pom.xml
@@ -59,8 +59,8 @@
connectionscm:git:git://git.apache.org/incubator-nifi.git/connection
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection
urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url
- tagHEAD/tag
- /scm
+tagHEAD/tag
+/scm
issueManagement
systemJIRA/system
urlhttps://issues.apache.org/jira/browse/NIFI/url
@@ -68,7 +68,7 @@
properties
maven.compiler.source1.7/maven.compiler.source
maven.compiler.target1.7/maven.compiler.target
-maven.version3.0.5/maven.version
+maven.min-version3.0.5/maven.min-version
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
/properties
@@ -144,24 +144,24 @@
artifactIdmaven-release-plugin/artifactId
version2.5.1/version
configuration
- useReleaseProfiletrue/useReleaseProfile
- releaseProfilesapache-release/releaseProfiles
- autoVersionSubmodulestrue/autoVersionSubmodules
- goalsdeploy/goals
-
tagNameFormat@{project.artifactId}-@{project.version}/tagNameFormat
- pushChangesfalse/pushChanges
- localCheckouttrue/localCheckout
+useReleaseProfiletrue/useReleaseProfile
+releaseProfilesapache-release/releaseProfiles
+autoVersionSubmodulestrue/autoVersionSubmodules
+goalsdeploy/goals
+
tagNameFormat@{project.artifactId}-@{project.version}/tagNameFormat
+pushChangesfalse/pushChanges
+localCheckouttrue/localCheckout
/configuration
executions
- execution
-iddefault/id
-goals
- goalperform/goal
-/goals
-configuration
-
pomFileNamemaven-plugins/nar-maven-plugin/pom.xml/pomFileName
-/configuration
- /execution
+execution
+iddefault/id
+goals
+goalperform/goal
+/goals
+configuration
+
pomFileNamemaven-plugins/nar-maven-plugin/pom.xml/pomFileName
+/configuration
+/execution
/executions
/plugin
plugin
@@ -179,16 +179,16 @@
/plugins
/pluginManagement
plugins
- plugin
- groupIdorg.sonatype.plugins/groupId
- artifactIdnexus-staging-maven-plugin/artifactId
- version1.6.5/version
- extensionstrue/extensions
- configuration
- serverIdrepository.apache.org/serverId
- nexusUrlhttps://repository.apache.org//nexusUrl
- /configuration
- /plugin
+plugin
+groupIdorg.sonatype.plugins/groupId
+artifactIdnexus-staging-maven-plugin/artifactId
+version1.6.5/version
+extensionstrue/extensions
+configuration
[1/2] incubator-nifi git commit: NIFI-270prepare release nar-maven-plugin-0.0.1-incubating
Repository: incubator-nifi Updated Branches: refs/heads/develop ad1b768fc - 6f189266b NIFI-270prepare release nar-maven-plugin-0.0.1-incubating Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/dea2f0d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/dea2f0d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/dea2f0d7 Branch: refs/heads/develop Commit: dea2f0d71f8af645ef3958ef84b84ed983a9b3e4 Parents: ad1b768 Author: joewitt joew...@apache.org Authored: Fri Jan 16 13:02:38 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 13:02:38 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/dea2f0d7/maven-plugins/nar-maven-plugin/pom.xml -- diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 4d762e9..e8f658a 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description @@ -59,7 +59,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagHEAD/tag +tagnar-maven-plugin-0.0.1-incubating/tag /scm issueManagement systemJIRA/system
Git Push Summary
Repository: incubator-nifi Updated Tags: refs/tags/nar-maven-plugin-0.0.1-incubating [created] 6ac4b5e0b
[2/2] incubator-nifi git commit: NIFI-270prepare for next development iteration
NIFI-270prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6f189266 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6f189266 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6f189266 Branch: refs/heads/develop Commit: 6f189266b4c0603daf2e36c7ee2cf8a02709aaa3 Parents: dea2f0d Author: joewitt joew...@apache.org Authored: Fri Jan 16 13:02:48 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 16 13:02:48 2015 -0500 -- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6f189266/maven-plugins/nar-maven-plugin/pom.xml -- diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index e8f658a..8dea49c 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description @@ -59,7 +59,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagnar-maven-plugin-0.0.1-incubating/tag +tagHEAD/tag /scm issueManagement systemJIRA/system
Git Push Summary
Repository: incubator-nifi Updated Tags: refs/tags/nar-maven-plugin-0.0.1-incubating [deleted] 6ac4b5e0b
[6/6] incubator-nifi git commit: NIFI-270 sent an e-mail to dev explaining all the moving parts
NIFI-270 sent an e-mail to dev explaining all the moving parts Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/bc94f716 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/bc94f716 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/bc94f716 Branch: refs/heads/NIFI-270-2 Commit: bc94f716c6225122323aa82aa1daff93bdc14f93 Parents: 6f18926 Author: joewitt joew...@apache.org Authored: Sat Jan 17 03:18:50 2015 -0500 Committer: joewitt joew...@apache.org Committed: Sat Jan 17 03:18:50 2015 -0500 -- DISCLAIMER | 15 - LICENSE | 589 NOTICE | 14 - README.md | 55 +- maven-plugins/nar-maven-plugin/pom.xml | 273 -- .../src/main/java/nifi/NarMojo.java | 613 .../resources/META-INF/plexus/components.xml| 52 - nar-maven-plugin/DISCLAIMER | 15 + nar-maven-plugin/LICENSE| 202 nar-maven-plugin/NOTICE | 5 + nar-maven-plugin/README.md | 57 ++ nar-maven-plugin/pom.xml| 273 ++ .../src/main/java/nifi/NarMojo.java | 613 .../resources/META-INF/plexus/components.xml| 52 + nifi/DISCLAIMER | 15 + nifi/LICENSE| 589 nifi/NOTICE | 14 + nifi/README.md | 101 ++ nifi/assembly/pom.xml | 12 +- .../assembly/src/main/assembly/dependencies.xml | 8 +- nifi/commons/data-provenance-utils/pom.xml | 4 +- nifi/commons/flowfile-packager/pom.xml | 4 +- nifi/commons/nifi-expression-language/pom.xml | 4 +- nifi/commons/nifi-logging-utils/pom.xml | 4 +- nifi/commons/nifi-properties/pom.xml| 4 +- nifi/commons/nifi-security-utils/pom.xml| 4 +- nifi/commons/nifi-socket-utils/pom.xml | 4 +- nifi/commons/nifi-utils/pom.xml | 4 +- nifi/commons/nifi-web-utils/pom.xml | 4 +- nifi/commons/pom.xml| 2 +- nifi/commons/processor-utilities/pom.xml| 4 +- nifi/commons/wali/pom.xml | 4 +- .../execute-script-processors/pom.xml | 81 -- .../nifi/processors/script/ExecuteScript.java | 566 --- .../apache/nifi/scripting/ConverterScript.java | 131 --- .../nifi/scripting/JRubyScriptFactory.java | 46 - .../nifi/scripting/JavaScriptScriptFactory.java | 56 -- .../nifi/scripting/JythonScriptFactory.java | 45 - .../nifi/scripting/OutputStreamHandler.java | 24 - .../org/apache/nifi/scripting/ReaderScript.java | 79 -- .../java/org/apache/nifi/scripting/Script.java | 303 -- .../nifi/scripting/ScriptEngineFactory.java | 117 --- .../apache/nifi/scripting/ScriptFactory.java| 269 -- .../org/apache/nifi/scripting/WriterScript.java | 67 -- .../org.apache.nifi.processor.Processor | 15 - .../index.html | 264 -- .../processors/script/TestExecuteScript.java| 939 --- .../src/test/resources/alwaysFail.js| 24 - .../src/test/resources/alwaysFail.py| 19 - .../src/test/resources/alwaysFail.rb| 21 - .../src/test/resources/ffTest.js| 28 - .../src/test/resources/ffTest.py| 22 - .../src/test/resources/ffTest.rb| 30 - .../src/test/resources/lib/Sub.py | 18 - .../src/test/resources/lib/sub.js | 22 - .../src/test/resources/lib/sub.rb | 17 - .../src/test/resources/loadLocal.js | 30 - .../src/test/resources/loadLocal.py | 26 - .../src/test/resources/loadLocal.rb | 29 - .../src/test/resources/log4j.xml| 54 -- .../src/test/resources/optionalValidators.js| 28 - .../src/test/resources/optionalValidators.py| 22 - .../src/test/resources/optionalValidators.rb| 39 - .../src/test/resources/paramTest.js | 28 - .../src/test/resources/paramTest.py | 26 - .../src/test/resources/paramTest.rb | 31 - .../src/test/resources/parseXml.js | 36 - .../src/test/resources/readTest.js | 30 - .../src/test/resources/readTest.py | 32 - .../src/test/resources/readTest.rb | 30 - .../src/test/resources/readWithParams.js| 32 - .../src/test/resources/readWithParams.py| 32 - .../src/test/resources/readWithParams.rb| 33 - .../src/test/resources
[1/6] incubator-nifi git commit: NIFI-270 sent an e-mail to dev explaining all the moving parts
Repository: incubator-nifi Updated Branches: refs/heads/NIFI-270-2 [created] bc94f716c http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nifi/nar-bundles/kafka-bundle/kafka-processors/pom.xml -- diff --git a/nifi/nar-bundles/kafka-bundle/kafka-processors/pom.xml b/nifi/nar-bundles/kafka-bundle/kafka-processors/pom.xml index 8cad323..d863954 100644 --- a/nifi/nar-bundles/kafka-bundle/kafka-processors/pom.xml +++ b/nifi/nar-bundles/kafka-bundle/kafka-processors/pom.xml @@ -17,7 +17,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdkafka-bundle/artifactId -version0.0.1-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nifi/nar-bundles/kafka-bundle/pom.xml -- diff --git a/nifi/nar-bundles/kafka-bundle/pom.xml b/nifi/nar-bundles/kafka-bundle/pom.xml index 146db12..8c95ea8 100644 --- a/nifi/nar-bundles/kafka-bundle/pom.xml +++ b/nifi/nar-bundles/kafka-bundle/pom.xml @@ -17,7 +17,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnar-bundle-parent/artifactId -version0.0.1-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nifi/nar-bundles/monitor-threshold-bundle/nar/pom.xml -- diff --git a/nifi/nar-bundles/monitor-threshold-bundle/nar/pom.xml b/nifi/nar-bundles/monitor-threshold-bundle/nar/pom.xml index 480b5ee..3b50904 100644 --- a/nifi/nar-bundles/monitor-threshold-bundle/nar/pom.xml +++ b/nifi/nar-bundles/monitor-threshold-bundle/nar/pom.xml @@ -17,11 +17,11 @@ parent groupIdorg.apache.nifi/groupId artifactIdmonitor-threshold-bundle/artifactId -version0.0.1-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version /parent artifactIdmonitor-threshold-nar/artifactId -version0.0.1-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version nameMonitorThreshold-NAR/name packagingnar/packaging http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nifi/nar-bundles/monitor-threshold-bundle/pom.xml -- diff --git a/nifi/nar-bundles/monitor-threshold-bundle/pom.xml b/nifi/nar-bundles/monitor-threshold-bundle/pom.xml index a19153c..90ea105 100644 --- a/nifi/nar-bundles/monitor-threshold-bundle/pom.xml +++ b/nifi/nar-bundles/monitor-threshold-bundle/pom.xml @@ -17,11 +17,11 @@ parent groupIdorg.apache.nifi/groupId artifactIdnar-bundle-parent/artifactId -version0.0.1-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version /parent artifactIdmonitor-threshold-bundle/artifactId -version0.0.1-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version nameMonitorThreshold-Bundle/name packagingpom/packaging @@ -38,13 +38,13 @@ dependency groupIdorg.apache.nifi/groupId artifactIdmonitor-threshold-processor/artifactId -version0.0.1-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdmonitor-threshold-ui/artifactId typewar/type -version0.0.1-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version /dependency /dependencies /dependencyManagement http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nifi/nar-bundles/monitor-threshold-bundle/processor/pom.xml -- diff --git a/nifi/nar-bundles/monitor-threshold-bundle/processor/pom.xml b/nifi/nar-bundles/monitor-threshold-bundle/processor/pom.xml index 256f878..be840a0 100644 --- a/nifi/nar-bundles/monitor-threshold-bundle/processor/pom.xml +++ b/nifi/nar-bundles/monitor-threshold-bundle/processor/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdmonitor-threshold-bundle/artifactId -version0.0.1-SNAPSHOT/version +version0.0.1-incubating-SNAPSHOT/version /parent artifactIdmonitor-threshold-processor/artifactId nameMonitorThreshold-Processor/name http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nifi/nar-bundles/monitor-threshold-bundle/ui/pom.xml -- diff --git a/nifi/nar-bundles/monitor-threshold-bundle/ui/pom.xml
[5/6] incubator-nifi git commit: NIFI-270 sent an e-mail to dev explaining all the moving parts
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nar-maven-plugin/LICENSE -- diff --git a/nar-maven-plugin/LICENSE b/nar-maven-plugin/LICENSE new file mode 100644 index 000..7a4a3ea --- /dev/null +++ b/nar-maven-plugin/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + Contribution shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, submitted + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as Not a Contribution. + + Contributor shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any
[3/6] incubator-nifi git commit: NIFI-270 sent an e-mail to dev explaining all the moving parts
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
--
diff --git
a/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
deleted file mode 100644
index da18606..000
---
a/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.scripting;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import javax.script.Bindings;
-import javax.script.Compilable;
-import javax.script.CompiledScript;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-
-import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.io.BufferedInputStream;
-import org.apache.nifi.logging.ProcessorLog;
-
-import org.apache.commons.io.FileUtils;
-
-/**
- * While this is a 'factory', it is not a singleton because we want a factory
- * per processor. This factory has state, all of which belong to only one
- * processor.
- *
- */
-public class ScriptFactory {
-
-private final ScriptEngineFactory engineFactory = new
ScriptEngineFactory();
-private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-private final ReadLock readLock = lock.readLock();
-private final WriteLock writeLock = lock.writeLock();
-private final ProcessorLog logger;
-
-private volatile CompiledScript compiledScript;
-private volatile String scriptText;
-private volatile byte[] md5Hash;
-private volatile long lastTimeChecked;
-private volatile String scriptFileName;
-private volatile long scriptCheckIntervalMS = 15000;
-
-public ScriptFactory(ProcessorLog logger) {
-this.logger = logger;
-}
-
-public void setScriptCheckIntervalMS(long msecs) {
-this.scriptCheckIntervalMS = msecs;
-}
-
-/**
- * @param aScriptFileName
- * @param properties
- * @param flowFile
- * @return
- * @throws IOException
- * @throws ScriptException
- */
-public Script getScript(final String aScriptFileName, final MapString,
String properties, final FlowFile flowFile)
-throws IOException, ScriptException {
-final Script instance;
-long now = System.currentTimeMillis();
-readLock.lock();
-try {
-if (!aScriptFileName.equals(this.scriptFileName)) {
-readLock.unlock();
-writeLock.lock();
-try {
-if (!aScriptFileName.equals(this.scriptFileName)) {
-// need to get brand new engine
-compiledScript = null;
-this.md5Hash = getMD5Hash(aScriptFileName);
-this.lastTimeChecked = now;
-this.scriptFileName = aScriptFileName;
-updateEngine();
-} // else another thread beat me to the change...so just
get a script
-} finally {
-readLock.lock();
-writeLock.unlock();
-}
-} else if (lastTimeChecked + scriptCheckIntervalMS now) {
-readLock.unlock();
-writeLock.lock();
-try {
-if (lastTimeChecked +
svn commit: r1653176 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Tue Jan 20 01:40:17 2015 New Revision: 1653176 URL: http://svn.apache.org/r1653176 Log: slight edit Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1653176r1=1653175r2=1653176view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Tue Jan 20 01:40:17 2015 @@ -140,7 +140,7 @@ Ensure your settings.xml has been update Ensure the the full application build and tests all work by executing `mvn -T 2.5C clean install` for a parallel build. Once that completes you can -startup and test the application by `cd assembly/target' then run `bin/nifi.sh start` in the nifi build. +startup and test the application by `cd assembly/target` then run `bin/nifi.sh start` in the nifi build. The application should be up and running in a few seconds at `http://localhost:8080/nifi` Evaluate and ensure the appropriate license headers are present on all source files. Ensure LICENSE and NOTICE files are complete and accurate.
svn commit: r936885 - /websites/production/nifi/content/
Author: joewitt Date: Tue Jan 20 01:52:58 2015 New Revision: 936885 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r936884, websites/staging/nifi/trunk/content/
svn commit: r1652895 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 03:55:48 2015 New Revision: 1652895 URL: http://svn.apache.org/r1652895 Log: review Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652895r1=1652894r2=1652895view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 03:55:48 2015 @@ -70,11 +70,12 @@ The following is a list of the sorts of ## The mechanics of the release ### Prepare your environment - - Follow the steps outlined in the [Quickstart Guide][quickstart-guide] + +Follow the steps outlined in the [Quickstart Guide][quickstart-guide] -At this point you're on the latest 'develop' branch and are able to build the entire application + At this point you're on the latest 'develop' branch and are able to build the entire application - - Create a new branch based on a JIRA ticket for the release task +Create a new branch based on a JIRA ticket for the release task [quickstart-guide]: http://nifi.incubator.apache.org/development/quickstart.html
svn commit: r1652899 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 04:13:31 2015 New Revision: 1652899 URL: http://svn.apache.org/r1652899 Log: review Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652899r1=1652898r2=1652899view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 04:13:31 2015 @@ -87,6 +87,8 @@ Ensure your maven settings have been upd - Ensure your settings.xml has been updated as shown below. There are other ways to ensure your key is available for signing as well + + ``` profile idsigned_release/id
svn commit: r1652906 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 05:15:39 2015 New Revision: 1652906 URL: http://svn.apache.org/r1652906 Log: review Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652906r1=1652905r2=1652906view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 05:15:39 2015 @@ -75,17 +75,20 @@ Follow the steps outlined in the [Quicks At this point you're on the latest 'develop' branch and are able to build the entire application -Create a JIRA ticket for the release tasks and use that for the commit messages. For example we'll consider NIFI-XYZ as our ticket. +Create a JIRA ticket for the release tasks and use that ticket number for the commit messages. For example we'll consider NIFI-123 as our ticket. Also +have in mind the release version you are planning for. For example we'll consider '0.0.1-incubating'. Create the next version in JIRA if necessary so develop work can continue towards that release. Create new branch off develop named after the JIRA ticket or just use the develop branch itself +Change directory into that of the project you wish to release. For example either `cd nifi` or `cd nar-maven-plugin` + Verify that Maven has sufficient heap space to perform the build tasks. Some plugins and parts of the build consumes a surprisingly large amount of space. These settings have been shown to work `MAVEN_OPTS=-Xms1024m -Xmx3076m -XX:MaxPermSize=256m` -Ensure your settings.xml has been updated as shown below. There are other ways to ensure your key is available for signing as well +Ensure your settings.xml has been updated as shown below. There are other ways to ensure your PGP key is available for signing as well ... profile @@ -106,6 +109,35 @@ Ensure your settings.xml has been update /servers ... +Ensure the the full application build and tests all work by executing +`mvn -T 2.5C clean install` for a parallel build. Once that completes you can +startup and test the application by `cd assembly/target' then run `bin/nifi.sh start` in the nifi build. +The application should be up and running in a few seconds at `http://localhost:8080/nifi` + +Evaluate and ensure the appropriate license headers are present on all source files. Ensure LICENSE and NOTICE files are complete and accurate. +Developers should always be keeping these up to date as they go along adding source and modifying dependencies to keep this burden manageable. +This command `mvn install -Pcheck-licenses` should be run as well to help validate. If that doesn't complete cleanly it must be addressed. + +Now its time to have maven prepare the release so execute `mvn release:prepare -Psigned_release -DscmCommentPrefix=NIFI-123 -Darguments=-DskipTests`. +Maven will ask: +`What is the release version for Apache NiFi NAR Plugin? (org.apache.nifi:nar-maven-plugin) 0.0.1-incubating: :` +Just hit enter to accept the default. +Maven will then ask: +`What is SCM release tag or label for Apache NiFi NAR Plugin? (org.apache.nifi:nar-maven-plugin) nar-maven-plugin-0.0.1-incubating: : ` +Enter `nar-maven-plugin-0.0.1-incubating-RC1` or whatever the appropriate release candidate (RC) number is. +Maven will then ask: +`What is the new development version for Apache NiFi NAR Plugin? (org.apache.nifi:nar-maven-plugin) 0.0.2-incubating-SNAPSHOT: :` +Just hit enter to accept the default. + +Now that preparation went perfectly it is time to perform the release and deploy artifacts to staging. To do that execute +`mvn release:perform -Psigned_release -DscmCommentPrefix=NIFI-123 -Darguments=-DskipTests` + +That will complete successfully and this means the artifacts have been released to the Apache Nexus staging repository. You will see something like +`[INFO] * Closing staging repository with ID orgapachenifi-1010.` +So if you go in a browser to `https://repository.apache.org/#stagingRepositories` you should see `orgapachenifi-1010`. If you click on that you +can inspect the various staged artifacts. + + [quickstart-guide]: http://nifi.incubator.apache.org/development/quickstart.html [release-manager]: http://www.apache.org/dev/release-publishing.html#release_manager [apache-license]: http://apache.org/licenses/LICENSE-2.0
svn commit: r1652915 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 06:01:18 2015 New Revision: 1652915 URL: http://svn.apache.org/r1652915 Log: review Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652915r1=1652914r2=1652915view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 06:01:18 2015 @@ -161,41 +161,42 @@ If all looks good then push the branch t Now it's time to initiate a vote within the PPMC. The following template can be used. Send the vote request to `d...@nifi.incubator.apache.org` with a subject of `[VOTE] Release Apache NiFi nar-maven-plugin-0.0.2-incubating RC1` -Hello -I am pleased to be calling this vote for the source release of Apache NiFi -nar-maven-plugin-0.0.2-incubating. - -The source zip, including signatures, digests, etc can be found at: -https://repository.apache.org/content/repositories/orgapachenifi-1010 - -The Git tag is nar-maven-plugin-0.0.2-incubating-RC1 -The Git commit ID is 3e264c97449c921c7e0cbdec7eb94cb1d6868452 - https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=3e264c97449c921c7e0cbdec7eb94cb1d6868452 - -Checksums of nar-maven-plugin-0.0.2-incubating-source-release.zip: -MD5: 2728931f69fbb4503c689bd5b3f250b3 -SHA1: b32c55ad608d26987b49f6fd11fda1e1214c64fe - -Release artifacts are signed with the following key: -https://people.apache.org/keys/committer/joewitt.asc - -KEYS file available here: -https://dist.apache.org/repos/dist/release/incubator/nifi/KEYS - -Binaries have been published to Maven's staging repository, and -are available here: - -https://repository.apache.org/content/repositories/orgapachenifi-1000 - -8 issues were closed/resolved for this release: - https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329307 - -The vote will be open for 72 hours. -Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test. The please vote: - -[ ] +1 Release this package as nar-maven-plugin-0.0.2-incubating -[ ] +0 no opinion -[ ] -1 Do not release this package because because... + +Hello +I am pleased to be calling this vote for the source release of Apache NiFi +nar-maven-plugin-0.0.2-incubating. + +The source zip, including signatures, digests, etc can be found at: +https://repository.apache.org/content/repositories/orgapachenifi-1010 + +The Git tag is nar-maven-plugin-0.0.2-incubating-RC1 +The Git commit ID is 3e264c97449c921c7e0cbdec7eb94cb1d6868452 + https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=3e264c97449c921c7e0cbdec7eb94cb1d6868452 + +Checksums of nar-maven-plugin-0.0.2-incubating-source-release.zip: +MD5: 2728931f69fbb4503c689bd5b3f250b3 +SHA1: b32c55ad608d26987b49f6fd11fda1e1214c64fe + +Release artifacts are signed with the following key: +https://people.apache.org/keys/committer/joewitt.asc + +KEYS file available here: +https://dist.apache.org/repos/dist/release/incubator/nifi/KEYS + +Binaries have been published to Maven's staging repository, and +are available here: + +https://repository.apache.org/content/repositories/orgapachenifi-1000 + +8 issues were closed/resolved for this release: + https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329307 + +The vote will be open for 72 hours. +Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test. The please vote: + +[ ] +1 Release this package as nar-maven-plugin-0.0.2-incubating +[ ] +0 no opinion +[ ] -1 Do not release this package because because... Continue.
svn commit: r1652893 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 03:15:09 2015 New Revision: 1652893 URL: http://svn.apache.org/r1652893 Log: review Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652893r1=1652892r2=1652893view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 03:15:09 2015 @@ -72,7 +72,7 @@ The following is a list of the sorts of ### Prepare your environment - Follow the steps outlined in the [Quickstart Guide][quickstart-guide] -At this point you're on the latest 'develop' branch and are able to build the entire application +At this point you're on the latest 'develop' branch and are able to build the entire application - Create a new branch based on a JIRA ticket for the release task
svn commit: r1652919 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 06:10:24 2015 New Revision: 1652919 URL: http://svn.apache.org/r1652919 Log: review Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652919r1=1652918r2=1652919view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 06:10:24 2015 @@ -161,10 +161,41 @@ If all looks good then push the branch t Now it's time to initiate a vote within the PPMC. Send the vote request to `d...@nifi.incubator.apache.org` with a subject of `[VOTE] Release Apache NiFi nar-maven-plugin-0.0.2-incubating RC1`. The following template can be used: -Hello -I am pleased to be calling this vote for the source release of Apache NiFi -nar-maven-plugin-0.0.2-incubating. - + Hello + I am pleased to be calling this vote for the source release of Apache NiFi + nar-maven-plugin-0.0.2-incubating. + + The source zip, including signatures, digests, etc can be found at: + https://repository.apache.org/content/repositories/orgapachenifi-1010 + + The Git tag is nar-maven-plugin-0.0.2-incubating-RC1 + The Git commit ID is 3e264c97449c921c7e0cbdec7eb94cb1d6868452 + https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=3e264c97449c921c7e0cbdec7eb94cb1d6868452 + + Checksums of nar-maven-plugin-0.0.2-incubating-source-release.zip: + MD5: 2728931f69fbb4503c689bd5b3f250b3 + SHA1: b32c55ad608d26987b49f6fd11fda1e1214c64fe + + Release artifacts are signed with the following key: + https://people.apache.org/keys/committer/joewitt.asc + + KEYS file available here: + https://dist.apache.org/repos/dist/release/incubator/nifi/KEYS + + Binaries have been published to Maven's staging repository, and + are available here: + + https://repository.apache.org/content/repositories/orgapachenifi-1000 + + 8 issues were closed/resolved for this release: + https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329307 + + The vote will be open for 72 hours. + Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test. The please vote: + + [ ] +1 Release this package as nar-maven-plugin-0.0.2-incubating + [ ] +0 no opinion + [ ] -1 Do not release this package because because... [quickstart-guide]: http://nifi.incubator.apache.org/development/quickstart.html [release-manager]: http://www.apache.org/dev/release-publishing.html#release_manager
svn commit: r1652903 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt
Date: Mon Jan 19 04:18:35 2015
New Revision: 1652903
URL: http://svn.apache.org/r1652903
Log:
review
Modified:
incubator/nifi/site/trunk/content/development/release-guide.md
Modified: incubator/nifi/site/trunk/content/development/release-guide.md
URL:
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652903r1=1652902r2=1652903view=diff
==
--- incubator/nifi/site/trunk/content/development/release-guide.md (original)
+++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19
04:18:35 2015
@@ -87,7 +87,7 @@ work `MAVEN_OPTS=-Xms1024m -Xmx3076m -X
Ensure your settings.xml has been updated as shown below. There are other
ways to ensure your key is available for signing as well
-
+ ...
profile
idsigned_release/id
properties
@@ -96,7 +96,15 @@ Ensure your settings.xml has been update
gpg.passphraseYOUR GPG PASSPHRASE HERE/gpg.passphrase
/properties
/profile
-
+ ...
+servers
+server
+idrepository.apache.org/id
+usernamejoewitt/username
+
password{bPMKDb57vQEHvkLQBqJSqFh6tkjRaB38XA0HEEMWT38=}/password
+/server
+/servers
+...
[quickstart-guide]:
http://nifi.incubator.apache.org/development/quickstart.html
[release-manager]:
http://www.apache.org/dev/release-publishing.html#release_manager
svn commit: r1652904 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt
Date: Mon Jan 19 04:20:37 2015
New Revision: 1652904
URL: http://svn.apache.org/r1652904
Log:
review
Modified:
incubator/nifi/site/trunk/content/development/release-guide.md
Modified: incubator/nifi/site/trunk/content/development/release-guide.md
URL:
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652904r1=1652903r2=1652904view=diff
==
--- incubator/nifi/site/trunk/content/development/release-guide.md (original)
+++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19
04:20:37 2015
@@ -97,14 +97,14 @@ Ensure your settings.xml has been update
/properties
/profile
...
-servers
-server
-idrepository.apache.org/id
-usernamejoewitt/username
-
password{bPMKDb57vQEHvkLQBqJSqFh6tkjRaB38XA0HEEMWT38=}/password
-/server
-/servers
-...
+ servers
+server
+idrepository.apache.org/id
+usernameYOUR USER NAME HERE/username
+passwordYOUR MAVEN ENCRYPTED PASSWORD HERE/password
+/server
+ /servers
+ ...
[quickstart-guide]:
http://nifi.incubator.apache.org/development/quickstart.html
[release-manager]:
http://www.apache.org/dev/release-publishing.html#release_manager
svn commit: r1652901 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 04:16:21 2015 New Revision: 1652901 URL: http://svn.apache.org/r1652901 Log: review Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652901r1=1652900r2=1652901view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 04:16:21 2015 @@ -81,27 +81,21 @@ Create the next version in JIRA if neces Create new branch off develop named after the JIRA ticket or just use the develop branch itself -Ensure your maven settings have been updated. - -Verify that Maven has sufficient heap space to perform the build tasks. Some of them consume a surprising large amount of space. -These settings have been shown to work `MAVEN_OPTS=-Xms1024m -Xmx3076m -XX:MaxPermSize=256m` +Verify that Maven has sufficient heap space to perform the build tasks. Some plugins and parts of the build +consumes a surprisingly large amount of space. These settings have been shown to +work `MAVEN_OPTS=-Xms1024m -Xmx3076m -XX:MaxPermSize=256m` Ensure your settings.xml has been updated as shown below. There are other ways to ensure your key is available for signing as well - -``` - profile -idsigned_release/id -properties -mavenExecutorIdforked-path/mavenExecutorId -gpg.keynameYOUR GPG KEY ID HERE/gpg.keyname -gpg.passphraseYOUR GPG PASSPHRASE HERE/gpg.passphrase -/properties -/profile -``` - - + profile + idsigned_release/id + properties + mavenExecutorIdforked-path/mavenExecutorId + gpg.keynameYOUR GPG KEY ID HERE/gpg.keyname + gpg.passphraseYOUR GPG PASSPHRASE HERE/gpg.passphrase + /properties + /profile [quickstart-guide]: http://nifi.incubator.apache.org/development/quickstart.html
svn commit: r1652907 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 05:16:30 2015 New Revision: 1652907 URL: http://svn.apache.org/r1652907 Log: review Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652907r1=1652906r2=1652907view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 05:16:30 2015 @@ -120,20 +120,30 @@ This command `mvn install -Pcheck-licens Now its time to have maven prepare the release so execute `mvn release:prepare -Psigned_release -DscmCommentPrefix=NIFI-123 -Darguments=-DskipTests`. Maven will ask: + `What is the release version for Apache NiFi NAR Plugin? (org.apache.nifi:nar-maven-plugin) 0.0.1-incubating: :` + Just hit enter to accept the default. + Maven will then ask: + `What is SCM release tag or label for Apache NiFi NAR Plugin? (org.apache.nifi:nar-maven-plugin) nar-maven-plugin-0.0.1-incubating: : ` + Enter `nar-maven-plugin-0.0.1-incubating-RC1` or whatever the appropriate release candidate (RC) number is. Maven will then ask: + `What is the new development version for Apache NiFi NAR Plugin? (org.apache.nifi:nar-maven-plugin) 0.0.2-incubating-SNAPSHOT: :` + Just hit enter to accept the default. Now that preparation went perfectly it is time to perform the release and deploy artifacts to staging. To do that execute + `mvn release:perform -Psigned_release -DscmCommentPrefix=NIFI-123 -Darguments=-DskipTests` That will complete successfully and this means the artifacts have been released to the Apache Nexus staging repository. You will see something like + `[INFO] * Closing staging repository with ID orgapachenifi-1010.` + So if you go in a browser to `https://repository.apache.org/#stagingRepositories` you should see `orgapachenifi-1010`. If you click on that you can inspect the various staged artifacts.
svn commit: r1652911 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 05:51:12 2015 New Revision: 1652911 URL: http://svn.apache.org/r1652911 Log: review Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1652911r1=1652910r2=1652911view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 05:51:12 2015 @@ -80,7 +80,8 @@ have in mind the release version you are Create the next version in JIRA if necessary so develop work can continue towards that release. -Create new branch off develop named after the JIRA ticket or just use the develop branch itself +Create new branch off develop named after the JIRA ticket or just use the develop branch itself. Here we'll use a branch off of develop with +`git checkout -b NIFI-123` Change directory into that of the project you wish to release. For example either `cd nifi` or `cd nar-maven-plugin` @@ -144,9 +145,57 @@ That will complete successfully and this `[INFO] * Closing staging repository with ID orgapachenifi-1010.` -So if you go in a browser to `https://repository.apache.org/#stagingRepositories` you should see `orgapachenifi-1010`. If you click on that you -can inspect the various staged artifacts. +So if you browse to `https://repository.apache.org/#stagingRepositories` login with your Apache committer credentials and you should see `orgapachenifi-1010`. If you click on that you can inspect the various staged artifacts. +Validate that all the various aspects of the staged artifacts appear correct + - Download the sources. Do they compile cleanly? If the result is a build does it execute? + - Validate the hashes match. + - Validate that the sources contain no unexpected binaries. + - Validate the signature for the build and hashes. + - Validate the LICENSE/NOTICE/DISCLAIMER/Headers. + - Validate that the README is present and provides sufficient information to build and if necessary execute. + + If all looks good then push the branch to origin `git push origin NIFI-123` + + Now it's time to initiate a vote within the PPMC. The following template can be used. Send the vote request to `d...@nifi.incubator.apache.org` + with a subject of `[VOTE] Release Apache NiFi nar-maven-plugin-0.0.2-incubating RC1` + + Hello + I am pleased to be calling this vote for the source release of Apache NiFi + nar-maven-plugin-0.0.2-incubating. + + The source zip, including signatures, digests, etc can be found at: + https://repository.apache.org/content/repositories/orgapachenifi-1010 + + The Git tag is nar-maven-plugin-0.0.2-incubating-RC1 + The Git commit ID is 3e264c97449c921c7e0cbdec7eb94cb1d6868452 + https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=3e264c97449c921c7e0cbdec7eb94cb1d6868452 + + Checksums of nar-maven-plugin-0.0.2-incubating-source-release.zip: + MD5: 2728931f69fbb4503c689bd5b3f250b3 + SHA1: b32c55ad608d26987b49f6fd11fda1e1214c64fe + + Release artifacts are signed with the following key: + https://people.apache.org/keys/committer/joewitt.asc + + KEYS file available here: + https://dist.apache.org/repos/dist/release/incubator/nifi/KEYS + + Binaries have been published to Maven's staging repository, and + are available here: + + https://repository.apache.org/content/repositories/orgapachenifi-1000 + + 8 issues were closed/resolved for this release: + https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329307 + + The vote will be open for 72 hours. + Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test. The please vote: + + [ ] +1 Release this package as nar-maven-plugin-0.0.2-incubating + [ ] +0 no opinion + [ ] -1 Do not release this package because because... + [quickstart-guide]: http://nifi.incubator.apache.org/development/quickstart.html [release-manager]: http://www.apache.org/dev/release-publishing.html#release_manager
[2/2] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/23c3687e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/23c3687e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/23c3687e Branch: refs/heads/NIFI-270-5 Commit: 23c3687ec75aabc3815097c88553fda35ce29ee0 Parents: 3e264c9 Author: joewitt joew...@apache.org Authored: Mon Jan 19 00:07:44 2015 -0500 Committer: joewitt joew...@apache.org Committed: Mon Jan 19 00:07:44 2015 -0500 -- nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/23c3687e/nar-maven-plugin/pom.xml -- diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml index 0a5f674..ac755c3 100644 --- a/nar-maven-plugin/pom.xml +++ b/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.2-incubating/version +version0.0.3-incubating-SNAPSHOT/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description @@ -59,7 +59,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagnar-maven-plugin-0.0.2-incubating-RC1/tag +tagHEAD/tag /scm issueManagement systemJIRA/system
[1/2] incubator-nifi git commit: NIFI-270 prepare release nar-maven-plugin-0.0.2-incubating-RC1
Repository: incubator-nifi Updated Branches: refs/heads/NIFI-270-5 [created] 23c3687ec NIFI-270 prepare release nar-maven-plugin-0.0.2-incubating-RC1 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3e264c97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3e264c97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3e264c97 Branch: refs/heads/NIFI-270-5 Commit: 3e264c97449c921c7e0cbdec7eb94cb1d6868452 Parents: bc448e5 Author: joewitt joew...@apache.org Authored: Mon Jan 19 00:07:34 2015 -0500 Committer: joewitt joew...@apache.org Committed: Mon Jan 19 00:07:34 2015 -0500 -- nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3e264c97/nar-maven-plugin/pom.xml -- diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml index d7933cc..0a5f674 100644 --- a/nar-maven-plugin/pom.xml +++ b/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.2-incubating-SNAPSHOT/version +version0.0.2-incubating/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description @@ -59,7 +59,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagHEAD/tag +tagnar-maven-plugin-0.0.2-incubating-RC1/tag /scm issueManagement systemJIRA/system
Git Push Summary
Repository: incubator-nifi Updated Branches: refs/heads/NIFI-270-2 [deleted] bc94f716c
[4/6] incubator-nifi git commit: NIFI-270 sent an e-mail to dev explaining all the moving parts
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nifi/README.md -- diff --git a/nifi/README.md b/nifi/README.md new file mode 100644 index 000..d9f7e53 --- /dev/null +++ b/nifi/README.md @@ -0,0 +1,101 @@ +# Apache NiFi + +Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently apart of the Apache Incubator. + +## Table of Contents + +- [Features](#features) +- [Getting Started](#getting-started) +- [Getting Help](#getting-help) +- [Requirements](#requirements) +- [License](#license) +- [Disclaimer](#disclaimer) +- [Export Control] (#export-control) + +## Features + +Apache NiFi supports powerful and scalable directed graphs of data routing, transformation, and system mediation logic. Some of the high-level capabilities and objectives of Apache NiFi include: + +- Web-based user interface for seamless experience between design, control, feedback, and monitoring of data flows +- Highly configurable along several dimensions of quality of service such as loss tolerant versus guaranteed delivery, low latency versus high throughput, and priority based queuing +- Fine-grained data provenance for all data received, forked, joined, cloned, modified, sent, and ultimately dropped as data reaches its configured end-state +- Component-based extension model along well defined interfaces enabling rapid development and effective testing + +## Getting Started + +To build: +- Execute 'mvn clean install' or for parallel build execute 'mvn -T 2.0C clean install' + +To start NiFi: +- Change directory to 'assembly'. In the target directory there should be a build of nifi. +- Unpack the build wherever you like or use the already unpacked build. 'install_location/bin/nifi.sh start' +- Direct your browser to http://localhost:8080/nifi/ + +## Getting Help +If you have questions, you can reach out to our mailing list: d...@nifi.incubator.apache.org +([archive](http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev)). +We're also often available in IRC: #nifi on +[irc.freenode.net](http://webchat.freenode.net/?channels=#nifi). + +## Requirements +* JDK 1.7 or higher + +## License + +Except as otherwise noted this software is licensed under the +[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) + +Licensed 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. + +## Disclaimer + +Apache NiFi is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. + +## Export Control + +This distribution includes cryptographic software. The country in which you +currently reside may have restrictions on the import, possession, use, and/or +re-export to another country, of encryption software. BEFORE using any +encryption software, please check your country's laws, regulations and +policies concerning the import, possession, or use, and re-export of encryption +software, to see if this is permitted. See http://www.wassenaar.org/ for more +information. + +The U.S. Government Department of Commerce, Bureau of Industry and Security +(BIS), has classified this software as Export Commodity Control Number (ECCN) +5D002.C.1, which includes information security software using or performing +cryptographic functions with asymmetric algorithms. The form and manner of this +Apache Software Foundation distribution makes it eligible for export under the +License Exception ENC Technology Software Unrestricted (TSU) exception (see the +BIS Export Administration Regulations, Section 740.13) for both object code and +source code. + +The following provides more details on the included cryptographic software: + +Apache NiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in +java cryptography libraries for SSL, SSH, and the protection +of sensitive configuration parameters. See +http://bouncycastle.org/about.html +http://www.jasypt.org/faq.html +http://jcraft.com/c-info.html +http://www.oracle.com/us/products/export/export-regulations-345813.html +for
[6/6] incubator-nifi git commit: NIFI-270 sent an e-mail to dev explaining all the moving parts
NIFI-270 sent an e-mail to dev explaining all the moving parts Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/bc94f716 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/bc94f716 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/bc94f716 Branch: refs/heads/develop Commit: bc94f716c6225122323aa82aa1daff93bdc14f93 Parents: 6f18926 Author: joewitt joew...@apache.org Authored: Sat Jan 17 03:18:50 2015 -0500 Committer: joewitt joew...@apache.org Committed: Sat Jan 17 03:18:50 2015 -0500 -- DISCLAIMER | 15 - LICENSE | 589 NOTICE | 14 - README.md | 55 +- maven-plugins/nar-maven-plugin/pom.xml | 273 -- .../src/main/java/nifi/NarMojo.java | 613 .../resources/META-INF/plexus/components.xml| 52 - nar-maven-plugin/DISCLAIMER | 15 + nar-maven-plugin/LICENSE| 202 nar-maven-plugin/NOTICE | 5 + nar-maven-plugin/README.md | 57 ++ nar-maven-plugin/pom.xml| 273 ++ .../src/main/java/nifi/NarMojo.java | 613 .../resources/META-INF/plexus/components.xml| 52 + nifi/DISCLAIMER | 15 + nifi/LICENSE| 589 nifi/NOTICE | 14 + nifi/README.md | 101 ++ nifi/assembly/pom.xml | 12 +- .../assembly/src/main/assembly/dependencies.xml | 8 +- nifi/commons/data-provenance-utils/pom.xml | 4 +- nifi/commons/flowfile-packager/pom.xml | 4 +- nifi/commons/nifi-expression-language/pom.xml | 4 +- nifi/commons/nifi-logging-utils/pom.xml | 4 +- nifi/commons/nifi-properties/pom.xml| 4 +- nifi/commons/nifi-security-utils/pom.xml| 4 +- nifi/commons/nifi-socket-utils/pom.xml | 4 +- nifi/commons/nifi-utils/pom.xml | 4 +- nifi/commons/nifi-web-utils/pom.xml | 4 +- nifi/commons/pom.xml| 2 +- nifi/commons/processor-utilities/pom.xml| 4 +- nifi/commons/wali/pom.xml | 4 +- .../execute-script-processors/pom.xml | 81 -- .../nifi/processors/script/ExecuteScript.java | 566 --- .../apache/nifi/scripting/ConverterScript.java | 131 --- .../nifi/scripting/JRubyScriptFactory.java | 46 - .../nifi/scripting/JavaScriptScriptFactory.java | 56 -- .../nifi/scripting/JythonScriptFactory.java | 45 - .../nifi/scripting/OutputStreamHandler.java | 24 - .../org/apache/nifi/scripting/ReaderScript.java | 79 -- .../java/org/apache/nifi/scripting/Script.java | 303 -- .../nifi/scripting/ScriptEngineFactory.java | 117 --- .../apache/nifi/scripting/ScriptFactory.java| 269 -- .../org/apache/nifi/scripting/WriterScript.java | 67 -- .../org.apache.nifi.processor.Processor | 15 - .../index.html | 264 -- .../processors/script/TestExecuteScript.java| 939 --- .../src/test/resources/alwaysFail.js| 24 - .../src/test/resources/alwaysFail.py| 19 - .../src/test/resources/alwaysFail.rb| 21 - .../src/test/resources/ffTest.js| 28 - .../src/test/resources/ffTest.py| 22 - .../src/test/resources/ffTest.rb| 30 - .../src/test/resources/lib/Sub.py | 18 - .../src/test/resources/lib/sub.js | 22 - .../src/test/resources/lib/sub.rb | 17 - .../src/test/resources/loadLocal.js | 30 - .../src/test/resources/loadLocal.py | 26 - .../src/test/resources/loadLocal.rb | 29 - .../src/test/resources/log4j.xml| 54 -- .../src/test/resources/optionalValidators.js| 28 - .../src/test/resources/optionalValidators.py| 22 - .../src/test/resources/optionalValidators.rb| 39 - .../src/test/resources/paramTest.js | 28 - .../src/test/resources/paramTest.py | 26 - .../src/test/resources/paramTest.rb | 31 - .../src/test/resources/parseXml.js | 36 - .../src/test/resources/readTest.js | 30 - .../src/test/resources/readTest.py | 32 - .../src/test/resources/readTest.rb | 30 - .../src/test/resources/readWithParams.js| 32 - .../src/test/resources/readWithParams.py| 32 - .../src/test/resources/readWithParams.rb| 33 - .../src/test/resources
[3/6] incubator-nifi git commit: NIFI-270 sent an e-mail to dev explaining all the moving parts
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/bc94f716/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
--
diff --git
a/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
b/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
deleted file mode 100644
index da18606..000
---
a/nifi/nar-bundles/execute-script-bundle/execute-script-processors/src/main/java/org/apache/nifi/scripting/ScriptFactory.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.scripting;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import javax.script.Bindings;
-import javax.script.Compilable;
-import javax.script.CompiledScript;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-
-import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.io.BufferedInputStream;
-import org.apache.nifi.logging.ProcessorLog;
-
-import org.apache.commons.io.FileUtils;
-
-/**
- * While this is a 'factory', it is not a singleton because we want a factory
- * per processor. This factory has state, all of which belong to only one
- * processor.
- *
- */
-public class ScriptFactory {
-
-private final ScriptEngineFactory engineFactory = new
ScriptEngineFactory();
-private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-private final ReadLock readLock = lock.readLock();
-private final WriteLock writeLock = lock.writeLock();
-private final ProcessorLog logger;
-
-private volatile CompiledScript compiledScript;
-private volatile String scriptText;
-private volatile byte[] md5Hash;
-private volatile long lastTimeChecked;
-private volatile String scriptFileName;
-private volatile long scriptCheckIntervalMS = 15000;
-
-public ScriptFactory(ProcessorLog logger) {
-this.logger = logger;
-}
-
-public void setScriptCheckIntervalMS(long msecs) {
-this.scriptCheckIntervalMS = msecs;
-}
-
-/**
- * @param aScriptFileName
- * @param properties
- * @param flowFile
- * @return
- * @throws IOException
- * @throws ScriptException
- */
-public Script getScript(final String aScriptFileName, final MapString,
String properties, final FlowFile flowFile)
-throws IOException, ScriptException {
-final Script instance;
-long now = System.currentTimeMillis();
-readLock.lock();
-try {
-if (!aScriptFileName.equals(this.scriptFileName)) {
-readLock.unlock();
-writeLock.lock();
-try {
-if (!aScriptFileName.equals(this.scriptFileName)) {
-// need to get brand new engine
-compiledScript = null;
-this.md5Hash = getMD5Hash(aScriptFileName);
-this.lastTimeChecked = now;
-this.scriptFileName = aScriptFileName;
-updateEngine();
-} // else another thread beat me to the change...so just
get a script
-} finally {
-readLock.lock();
-writeLock.unlock();
-}
-} else if (lastTimeChecked + scriptCheckIntervalMS now) {
-readLock.unlock();
-writeLock.lock();
-try {
-if (lastTimeChecked +
Git Push Summary
Repository: incubator-nifi Updated Branches: refs/heads/NIFI-270-5 [deleted] 23c3687ec
[2/2] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a7fee787 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a7fee787 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a7fee787 Branch: refs/heads/NIFI-270-6 Commit: a7fee787d588c6dec12f0a4ed1cbe1055769a989 Parents: 72abf18 Author: joewitt joew...@apache.org Authored: Mon Jan 19 09:41:25 2015 -0500 Committer: joewitt joew...@apache.org Committed: Mon Jan 19 09:41:25 2015 -0500 -- nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a7fee787/nar-maven-plugin/pom.xml -- diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml index 282371f..d7933cc 100644 --- a/nar-maven-plugin/pom.xml +++ b/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnar-maven-plugin/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version packagingmaven-plugin/packaging nameApache NiFi NAR Plugin/name descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description @@ -59,7 +59,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagnar-maven-plugin-0.0.1-incubating-RC1/tag +tagHEAD/tag /scm issueManagement systemJIRA/system
svn commit: r1653017 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 14:48:05 2015 New Revision: 1653017 URL: http://svn.apache.org/r1653017 Log: updated to 0.0.1 since 0.0.2 cleared out of github Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1653017r1=1653016r2=1653017view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 14:48:05 2015 @@ -75,13 +75,13 @@ Follow the steps outlined in the [Quicks At this point you're on the latest 'develop' branch and are able to build the entire application -Create a JIRA ticket for the release tasks and use that ticket number for the commit messages. For example we'll consider NIFI-123 as our ticket. Also +Create a JIRA ticket for the release tasks and use that ticket number for the commit messages. For example we'll consider NIFI-270 as our ticket. Also have in mind the release version you are planning for. For example we'll consider '0.0.1-incubating'. Create the next version in JIRA if necessary so develop work can continue towards that release. Create new branch off develop named after the JIRA ticket or just use the develop branch itself. Here we'll use a branch off of develop with -`git checkout -b NIFI-123` +`git checkout -b NIFI-270` Change directory into that of the project you wish to release. For example either `cd nifi` or `cd nar-maven-plugin` @@ -119,7 +119,7 @@ Evaluate and ensure the appropriate lice Developers should always be keeping these up to date as they go along adding source and modifying dependencies to keep this burden manageable. This command `mvn install -Pcheck-licenses` should be run as well to help validate. If that doesn't complete cleanly it must be addressed. -Now its time to have maven prepare the release so execute `mvn release:prepare -Psigned_release -DscmCommentPrefix=NIFI-123 -Darguments=-DskipTests`. +Now its time to have maven prepare the release so execute `mvn release:prepare -Psigned_release -DscmCommentPrefix=NIFI-270 -Darguments=-DskipTests`. Maven will ask: `What is the release version for Apache NiFi NAR Plugin? (org.apache.nifi:nar-maven-plugin) 0.0.1-incubating: :` @@ -139,11 +139,11 @@ Just hit enter to accept the default. Now that preparation went perfectly it is time to perform the release and deploy artifacts to staging. To do that execute -`mvn release:perform -Psigned_release -DscmCommentPrefix=NIFI-123 -Darguments=-DskipTests` +`mvn release:perform -Psigned_release -DscmCommentPrefix=NIFI-270 -Darguments=-DskipTests` That will complete successfully and this means the artifacts have been released to the Apache Nexus staging repository. You will see something like -`[INFO] * Closing staging repository with ID orgapachenifi-1010.` +`[INFO] * Closing staging repository with ID orgapachenifi-1011.` So if you browse to `https://repository.apache.org/#stagingRepositories` login with your Apache committer credentials and you should see `orgapachenifi-1010`. If you click on that you can inspect the various staged artifacts. @@ -156,7 +156,7 @@ Validate that all the various aspects of - Validate the LICENSE/NOTICE/DISCLAIMER/Headers. - Validate that the README is present and provides sufficient information to build and if necessary execute. -If all looks good then push the branch to origin `git push origin NIFI-123` +If all looks good then push the branch to origin `git push origin NIFI-270` If anything isn't correct about the staged artifacts you can drop the staged repo from repository.apache.org and delete the local tag in git. If you also delete the local branch and clear your local maven repository under org/apache/nifi then it is @@ -165,22 +165,22 @@ that you can pretty easily test the rele commands can come in handy to help do this so you can set versions to something clearly release test related. Now it's time to initiate a vote within the PPMC. Send the vote request to `d...@nifi.incubator.apache.org` -with a subject of `[VOTE] Release Apache NiFi nar-maven-plugin-0.0.2-incubating`. The following template can be used: +with a subject of `[VOTE] Release Apache NiFi nar-maven-plugin-0.0.1-incubating`. The following template can be used: Hello I am pleased to be calling this vote for the source release of Apache NiFi - nar-maven-plugin-0.0.2-incubating. + nar-maven-plugin-0.0.1-incubating. The source zip, including signatures, digests, etc. can be found at: - https://repository.apache.org/content/repositories/orgapachenifi-1010 + https://repository.apache.org/content/repositories
svn commit: r1653019 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 14:49:22 2015 New Revision: 1653019 URL: http://svn.apache.org/r1653019 Log: updated to 0.0.1 since previous 0.0.1 cleared out of github Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1653019r1=1653018r2=1653019view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 14:49:22 2015 @@ -145,7 +145,7 @@ That will complete successfully and this `[INFO] * Closing staging repository with ID orgapachenifi-1011.` -So if you browse to `https://repository.apache.org/#stagingRepositories` login with your Apache committer credentials and you should see `orgapachenifi-1010`. If you click on that you can inspect the various staged artifacts. +So if you browse to `https://repository.apache.org/#stagingRepositories` login with your Apache committer credentials and you should see `orgapachenifi-1011`. If you click on that you can inspect the various staged artifacts. Validate that all the various aspects of the staged artifacts appear correct
svn commit: r936784 - /websites/production/nifi/content/
Author: joewitt Date: Mon Jan 19 14:55:52 2015 New Revision: 936784 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r936783, websites/staging/nifi/trunk/content/
svn commit: r936586 - /websites/production/nifi/content/
Author: joewitt Date: Sun Jan 18 02:39:48 2015 New Revision: 936586 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r936585, websites/staging/nifi/trunk/content/
svn commit: r1653108 - /incubator/nifi/site/trunk/content/development/release-guide.md
Author: joewitt Date: Mon Jan 19 20:22:23 2015 New Revision: 1653108 URL: http://svn.apache.org/r1653108 Log: provided some more information on how to verify the release...needs review for accuracy Modified: incubator/nifi/site/trunk/content/development/release-guide.md Modified: incubator/nifi/site/trunk/content/development/release-guide.md URL: http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1653108r1=1653107r2=1653108view=diff == --- incubator/nifi/site/trunk/content/development/release-guide.md (original) +++ incubator/nifi/site/trunk/content/development/release-guide.md Mon Jan 19 20:22:23 2015 @@ -50,7 +50,9 @@ The following is a list of the sorts of - Do the resulting artifacts have 'incubating' in the name? - Is the DISCLAIMER, LICENSE and NOTICE file present in the source root and complete? - Specifically look in the *-sources.zip artifact and ensure these items are present at the root of the archive. -- Here is an example path to a sources artifact: https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nar-maven-plugin/0.0.1-incubating/nar-maven-plugin-0.0.1-incubating-source-release.zip +- Evaluate the sources and dependencies. Does the overall LICENSE and NOTICE appear correct? Do all licenses fit within the ASF approved licenses? +- Here is an example path to a sources artifact: + - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nar-maven-plugin/0.0.1-incubating/nar-maven-plugin-0.0.1-incubating-source-release.zip` - Is there a README available that explains how to build the application and to execute it? - Look in the *-sources.zip artifact root for the readme. - Are the signatures and hashes correct for the source release?
[47/51] [partial] incubator-nifi git commit: Reworked overall directory structure to make releasing nifi vs maven plugis easier
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/300952a9/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java -- diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java b/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java deleted file mode 100644 index 420a8e2..000 --- a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java +++ /dev/null @@ -1,1186 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the License); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.nifi.attribute.expression.language; - -import static org.apache.nifi.attribute.expression.language.antlr.AttributeExpressionParser.*; - -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.nifi.attribute.expression.language.antlr.AttributeExpressionLexer; -import org.apache.nifi.attribute.expression.language.antlr.AttributeExpressionParser; -import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.Evaluator; -import org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.QueryResult; -import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.cast.BooleanCastEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.cast.DateCastEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.cast.NumberCastEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.cast.StringCastEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.AndEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.AppendEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.AttributeEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.ContainsEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.DateToNumberEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.DivideEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.EndsWithEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.EqualsEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.EqualsIgnoreCaseEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.FindEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.FormatEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.GreaterThanEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.GreaterThanOrEqualEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.HostnameEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.IPEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.IndexOfEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.IsEmptyEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.IsNullEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.LastIndexOfEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.LengthEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.LessThanEvaluator; -import
[42/51] [partial] incubator-nifi git commit: Reworked overall directory structure to make releasing nifi vs maven plugis easier
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/300952a9/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
--
diff --git
a/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
b/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
deleted file mode 100644
index 10e348d..000
---
a/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
+++ /dev/null
@@ -1,876 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.InetSocketAddress;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-public class NiFiProperties extends Properties {
-
-private static final long serialVersionUID = 2119177359005492702L;
-
-private static final Logger LOG =
LoggerFactory.getLogger(NiFiProperties.class);
-private static NiFiProperties instance = null;
-
-// core properties
-public static final String PROPERTIES_FILE_PATH =
nifi.properties.file.path;
-public static final String FLOW_CONFIGURATION_FILE =
nifi.flow.configuration.file;
-public static final String FLOW_CONFIGURATION_ARCHIVE_FILE =
nifi.flow.configuration.archive.file;
-public static final String TASK_CONFIGURATION_FILE =
nifi.reporting.task.configuration.file;
-public static final String SERVICE_CONFIGURATION_FILE =
nifi.controller.service.configuration.file;
-public static final String AUTHORITY_PROVIDER_CONFIGURATION_FILE =
nifi.authority.provider.configuration.file;
-public static final String REPOSITORY_DATABASE_DIRECTORY =
nifi.database.directory;
-public static final String RESTORE_DIRECTORY = nifi.restore.directory;
-public static final String VERSION = nifi.version;
-public static final String WRITE_DELAY_INTERVAL =
nifi.flowservice.writedelay.interval;
-public static final String AUTO_RESUME_STATE =
nifi.flowcontroller.autoResumeState;
-public static final String FLOW_CONTROLLER_GRACEFUL_SHUTDOWN_PERIOD =
nifi.flowcontroller.graceful.shutdown.period;
-public static final String NAR_LIBRARY_DIRECTORY =
nifi.nar.library.directory;
-public static final String NAR_WORKING_DIRECTORY =
nifi.nar.working.directory;
-public static final String COMPONENT_DOCS_DIRECTORY =
nifi.documentation.working.directory;
-public static final String SENSITIVE_PROPS_KEY =
nifi.sensitive.props.key;
-public static final String SENSITIVE_PROPS_ALGORITHM =
nifi.sensitive.props.algorithm;
-public static final String SENSITIVE_PROPS_PROVIDER =
nifi.sensitive.props.provider;
-public static final String H2_URL_APPEND = nifi.h2.url.append;
-public static final String REMOTE_INPUT_PORT =
nifi.remote.input.socket.port;
-public static final String SITE_TO_SITE_SECURE =
nifi.remote.input.secure;
-public static final String TEMPLATE_DIRECTORY = nifi.templates.directory;
-public static final String ADMINISTRATIVE_YIELD_DURATION =
nifi.administrative.yield.duration;
-public static final String PERSISTENT_STATE_DIRECTORY =
nifi.persistent.state.directory;
-
-// content repository properties
-public static final String REPOSITORY_CONTENT_PREFIX =
nifi.content.repository.directory.;
-public static final String CONTENT_REPOSITORY_IMPLEMENTATION =
nifi.content.repository.implementation;
-public static final String MAX_APPENDABLE_CLAIM_SIZE =
nifi.content.claim.max.appendable.size;
-public static final String MAX_FLOWFILES_PER_CLAIM =
nifi.content.claim.max.flow.files;
-public static final String CONTENT_ARCHIVE_MAX_RETENTION_PERIOD =
nifi.content.repository.archive.max.retention.period;
-public static final String CONTENT_ARCHIVE_MAX_USAGE_PERCENTAGE =
nifi.content.repository.archive.max.usage.percentage;
-public static final String
[46/51] [partial] incubator-nifi git commit: Reworked overall directory structure to make releasing nifi vs maven plugis easier
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/300952a9/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
--
diff --git
a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
b/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
deleted file mode 100644
index a88b72b..000
---
a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.attribute.expression.language.evaluation.cast;
-
-import java.util.Map;
-
-import
org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-import
org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
-
-public class BooleanCastEvaluator extends BooleanEvaluator {
-
-private final StringEvaluator subjectEvaluator;
-
-public BooleanCastEvaluator(final StringEvaluator subjectEvaluator) {
-this.subjectEvaluator = subjectEvaluator;
-}
-
-@Override
-public QueryResultBoolean evaluate(final MapString, String attributes)
{
-final QueryResultString result =
subjectEvaluator.evaluate(attributes);
-if (result.getValue() == null) {
-return new BooleanQueryResult(null);
-}
-
-return new
BooleanQueryResult(Boolean.valueOf(result.getValue().trim()));
-}
-
-@Override
-public Evaluator? getSubjectEvaluator() {
-return subjectEvaluator;
-}
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/300952a9/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
--
diff --git
a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
b/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
deleted file mode 100644
index 96e74ef..000
---
a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.attribute.expression.language.evaluation.cast;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.DateQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import
svn commit: r936385 - /websites/production/nifi/content/
Author: joewitt Date: Fri Jan 16 02:34:09 2015 New Revision: 936385 Log: Publishing svnmucc operation to nifi site by joewitt Added: websites/production/nifi/content/ - copied from r936384, websites/staging/nifi/trunk/content/
[04/51] [partial] incubator-nifi git commit: Reworked overall directory structure to make releasing nifi vs maven plugis easier
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/300952a9/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
deleted file mode 100644
index c67181a..000
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.controller;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.nifi.connectable.Size;
-import org.apache.nifi.encrypt.StringEncryptor;
-import org.apache.nifi.groups.RemoteProcessGroupPortDescriptor;
-import org.apache.nifi.remote.StandardRemoteProcessGroupPortDescriptor;
-import org.apache.nifi.scheduling.SchedulingStrategy;
-import org.apache.nifi.util.DomUtils;
-import org.apache.nifi.web.api.dto.ConnectableDTO;
-import org.apache.nifi.web.api.dto.ConnectionDTO;
-import org.apache.nifi.web.api.dto.FlowSnippetDTO;
-import org.apache.nifi.web.api.dto.FunnelDTO;
-import org.apache.nifi.web.api.dto.LabelDTO;
-import org.apache.nifi.web.api.dto.PortDTO;
-import org.apache.nifi.web.api.dto.PositionDTO;
-import org.apache.nifi.web.api.dto.ProcessGroupDTO;
-import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
-import org.apache.nifi.web.api.dto.ProcessorDTO;
-import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class FlowFromDOMFactory {
-
-public static PositionDTO getPosition(final Element positionElement) {
-if (positionElement == null) {
-throw new IllegalArgumentException(Invalid Flow: Found no
'position' element);
-}
-return new
PositionDTO(Double.parseDouble(positionElement.getAttribute(x)),
Double.parseDouble(positionElement.getAttribute(y)));
-}
-
-public static Size getSize(final Element sizeElement) {
-if (sizeElement == null) {
-throw new IllegalArgumentException(Invalid Flow: Found no 'size'
element);
-}
-
-return new Size(Double.parseDouble(sizeElement.getAttribute(width)),
Double.parseDouble(sizeElement.getAttribute(height)));
-}
-
-public static MapString, String getStyle(final Element stylesElement) {
-final MapString, String styles = new HashMap();
-if (stylesElement == null) {
-return styles;
-}
-
-for (final Element styleElement : getChildrenByTagName(stylesElement,
style)) {
-final String styleName = styleElement.getAttribute(name);
-final String styleValue = styleElement.getTextContent();
-styles.put(styleName, styleValue);
-}
-
-return styles;
-}
-
-public static ProcessGroupDTO getProcessGroup(final String parentId, final
Element element, final StringEncryptor encryptor) {
-final ProcessGroupDTO dto = new ProcessGroupDTO();
-final String groupId = getString(element, id);
-dto.setId(groupId);
-dto.setParentGroupId(parentId);
-dto.setName(getString(element, name));
-dto.setPosition(getPosition(DomUtils.getChild(element, position)));
-dto.setComments(getString(element, comment));
-
-final SetProcessorDTO processors = new HashSet();
-final SetConnectionDTO connections = new HashSet();
-final SetFunnelDTO funnels = new HashSet();
-final SetPortDTO inputPorts = new HashSet();
-final SetPortDTO outputPorts = new HashSet();
-final SetLabelDTO labels = new HashSet();
-final SetProcessGroupDTO processGroups = new HashSet();
-final SetRemoteProcessGroupDTO remoteProcessGroups = new HashSet();
-
-final
[02/51] [partial] incubator-nifi git commit: Reworked overall directory structure to make releasing nifi vs maven plugis easier
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/300952a9/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
deleted file mode 100644
index b60d187..000
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ /dev/null
@@ -1,1026 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.controller;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.zip.GZIPInputStream;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-
-import org.apache.nifi.cluster.protocol.DataFlow;
-import org.apache.nifi.cluster.protocol.StandardDataFlow;
-import org.apache.nifi.connectable.Connectable;
-import org.apache.nifi.connectable.ConnectableType;
-import org.apache.nifi.connectable.Connection;
-import org.apache.nifi.connectable.Funnel;
-import org.apache.nifi.connectable.Port;
-import org.apache.nifi.connectable.Position;
-import org.apache.nifi.connectable.Size;
-import org.apache.nifi.controller.exception.ProcessorInstantiationException;
-import org.apache.nifi.controller.label.Label;
-import org.apache.nifi.events.BulletinFactory;
-import org.apache.nifi.util.file.FileUtils;
-import org.apache.nifi.fingerprint.FingerprintException;
-import org.apache.nifi.fingerprint.FingerprintFactory;
-import org.apache.nifi.flowfile.FlowFilePrioritizer;
-import org.apache.nifi.groups.ProcessGroup;
-import org.apache.nifi.groups.RemoteProcessGroup;
-import org.apache.nifi.groups.RemoteProcessGroupPortDescriptor;
-import org.apache.nifi.logging.LogLevel;
-import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.remote.RemoteGroupPort;
-import org.apache.nifi.remote.RootGroupPort;
-import org.apache.nifi.reporting.Severity;
-import org.apache.nifi.scheduling.SchedulingStrategy;
-import org.apache.nifi.util.NiFiProperties;
-import org.apache.nifi.web.api.dto.ConnectableDTO;
-import org.apache.nifi.web.api.dto.ConnectionDTO;
-import org.apache.nifi.web.api.dto.FlowSnippetDTO;
-import org.apache.nifi.web.api.dto.FunnelDTO;
-import org.apache.nifi.web.api.dto.LabelDTO;
-import org.apache.nifi.web.api.dto.PortDTO;
-import org.apache.nifi.web.api.dto.PositionDTO;
-import org.apache.nifi.web.api.dto.ProcessGroupDTO;
-import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
-import org.apache.nifi.web.api.dto.ProcessorDTO;
-import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.nifi.encrypt.StringEncryptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * @author unattributed
- */
-public class StandardFlowSynchronizer implements FlowSynchronizer {
-
-private static final Logger logger =
LoggerFactory.getLogger(StandardFlowSynchronizer.class);
-public static final URL FLOW_XSD_RESOURCE =
StandardFlowSynchronizer.class.getResource(/FlowConfiguration.xsd);
-private final StringEncryptor encryptor;
-
-public StandardFlowSynchronizer(final StringEncryptor encryptor) {
-this.encryptor =
Git Push Summary
Repository: incubator-nifi Updated Tags: refs/tags/nifi-nar-maven-plugin-1.0.0-incubating-RC3 [created] 5e728e14c
[5/7] incubator-nifi git commit: NIFI-270 prepare release nifi-0.0.1-incubating-RC3
NIFI-270 prepare release nifi-0.0.1-incubating-RC3 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/84facc66 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/84facc66 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/84facc66 Branch: refs/heads/NIFI-270-RC3 Commit: 84facc6626d0682221a64df5d731fa9ece722589 Parents: 59d00b3 Author: joewitt joew...@apache.org Authored: Thu Jan 22 17:13:18 2015 -0500 Committer: joewitt joew...@apache.org Committed: Thu Jan 22 17:13:18 2015 -0500 -- nifi/nifi-api/pom.xml | 4 +- nifi/nifi-assembly/pom.xml | 6 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../nifi-data-provenance-utils/pom.xml | 4 +- .../nifi-expression-language/pom.xml| 4 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 4 +- nifi/nifi-commons/nifi-logging-utils/pom.xml| 4 +- .../nifi-processor-utilities/pom.xml| 4 +- nifi/nifi-commons/nifi-properties/pom.xml | 4 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-web-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 4 +- nifi/nifi-commons/pom.xml | 5 +- nifi/nifi-docs/pom.xml | 6 +- nifi/nifi-mock/pom.xml | 4 +- .../nifi-framework-nar/pom.xml | 4 +- .../nifi-framework/nifi-administration/pom.xml | 4 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-cluster-protocol/pom.xml | 2 +- .../nifi-framework/nifi-cluster-web/pom.xml | 2 +- .../nifi-framework/nifi-cluster/pom.xml | 2 +- .../nifi-file-authorization-provider/pom.xml| 4 +- .../nifi-framework-core-api/pom.xml | 4 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/pom.xml | 2 +- .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml| 4 +- .../nifi-framework/nifi-site-to-site/pom.xml| 4 +- .../nifi-framework/nifi-user-actions/pom.xml| 4 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-framework/nifi-web/pom.xml | 10 +-- .../nifi-framework/pom.xml | 4 +- .../nifi-framework-bundle/pom.xml | 36 +-- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 4 +- .../nifi-hdfs-processors/pom.xml| 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 +- .../nifi-hadoop-libraries-nar/pom.xml | 4 +- .../nifi-hadoop-libraries-bundle/pom.xml| 4 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 4 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml| 4 +- .../nifi-kafka-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml | 4 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 8 +-- .../nifi-standard-nar/pom.xml | 4 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml| 2 +- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml| 10 +-- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 4 +- .../pom.xml | 4 +- .../nifi-load-distribution-service-api/pom.xml | 4 +- .../nifi-ssl-context-nar/pom.xml| 4 +- .../nifi-ssl-context-service/pom.xml| 2 +- .../nifi-ssl-context-bundle/pom.xml | 4 +- .../nifi-ssl-context-service-api/pom.xml| 2 +- .../nifi-standard-services-api-nar/pom.xml | 4 +- .../nifi-standard-services/pom.xml | 4 +- .../nifi-update-attribute-model
[2/7] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f4303e3e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f4303e3e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f4303e3e Branch: refs/heads/NIFI-270-RC3 Commit: f4303e3e76489883cd33c4058e15c75b6cc79ba9 Parents: b6bca25 Author: joewitt joew...@apache.org Authored: Thu Jan 22 16:54:57 2015 -0500 Committer: joewitt joew...@apache.org Committed: Thu Jan 22 16:54:57 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f4303e3e/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index 310541b..091248f 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-maven-plugin/artifactId -version1.0.0-incubating/version +version1.0.1-incubating-SNAPSHOT/version packagingmaven-plugin/packaging descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description urlhttp://nifi.incubator.apache.org/maven-site//url @@ -58,7 +58,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag +tagHEAD/tag /scm issueManagement systemJIRA/system
[7/7] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/265eaf01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/265eaf01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/265eaf01 Branch: refs/heads/NIFI-270-RC3 Commit: 265eaf01c152d2be7c539a712f9021ad198bf5c8 Parents: 84facc6 Author: joewitt joew...@apache.org Authored: Thu Jan 22 17:13:31 2015 -0500 Committer: joewitt joew...@apache.org Committed: Thu Jan 22 17:13:31 2015 -0500 -- nifi/nifi-api/pom.xml | 4 +- nifi/nifi-assembly/pom.xml | 4 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../nifi-data-provenance-utils/pom.xml | 4 +- .../nifi-expression-language/pom.xml| 4 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 4 +- nifi/nifi-commons/nifi-logging-utils/pom.xml| 4 +- .../nifi-processor-utilities/pom.xml| 4 +- nifi/nifi-commons/nifi-properties/pom.xml | 4 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-web-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 4 +- nifi/nifi-commons/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- nifi/nifi-mock/pom.xml | 4 +- .../nifi-framework-nar/pom.xml | 4 +- .../nifi-framework/nifi-administration/pom.xml | 4 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-cluster-protocol/pom.xml | 2 +- .../nifi-framework/nifi-cluster-web/pom.xml | 2 +- .../nifi-framework/nifi-cluster/pom.xml | 2 +- .../nifi-file-authorization-provider/pom.xml| 4 +- .../nifi-framework-core-api/pom.xml | 4 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/pom.xml | 2 +- .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml| 4 +- .../nifi-framework/nifi-site-to-site/pom.xml| 4 +- .../nifi-framework/nifi-user-actions/pom.xml| 4 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-framework/nifi-web/pom.xml | 10 +-- .../nifi-framework/pom.xml | 4 +- .../nifi-framework-bundle/pom.xml | 36 +-- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 4 +- .../nifi-hdfs-processors/pom.xml| 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 +- .../nifi-hadoop-libraries-nar/pom.xml | 4 +- .../nifi-hadoop-libraries-bundle/pom.xml| 4 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 4 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml| 4 +- .../nifi-kafka-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml | 4 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 8 +-- .../nifi-standard-nar/pom.xml | 4 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml| 2 +- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml| 10 +-- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 4 +- .../pom.xml | 4 +- .../nifi-load-distribution-service-api/pom.xml | 4 +- .../nifi-ssl-context-nar/pom.xml| 4 +- .../nifi-ssl-context-service/pom.xml| 2 +- .../nifi-ssl-context-bundle/pom.xml | 4 +- .../nifi-ssl-context-service-api/pom.xml| 2 +- .../nifi-standard-services-api-nar/pom.xml | 4 +- .../nifi-standard-services/pom.xml | 4 +- .../nifi-update-attribute-model/pom.xml
[6/7] incubator-nifi git commit: NIFI-270 prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/265eaf01/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml index 64215c6..deb787f 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/265eaf01/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml index 70aefc6..04b9ad6 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent artifactIdnifi-update-attribute-ui/artifactId packagingwar/packaging http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/265eaf01/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml index e20e77b..dcb63e4 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml @@ -18,11 +18,11 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-bundles/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version packagingpom/packaging modules @@ -37,18 +37,18 @@ dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-model/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-ui/artifactId typewar/type -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency /dependencies /dependencyManagement http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/265eaf01/nifi/nifi-nar-bundles/pom.xml -- diff --git a/nifi/nifi-nar-bundles/pom.xml b/nifi/nifi-nar-bundles/pom.xml index fa65abe..4ee6875 100644 --- a/nifi/nifi-nar-bundles/pom.xml +++ b/nifi/nifi-nar-bundles/pom.xml @@ -19,12 +19,12 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-bundles/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version packagingpom/packaging modules @@ -43,70 +43,70 @@ dependency groupIdorg.apache.nifi/groupId artifactIdnifi-distributed-cache-client-service/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-distributed-cache-client-service-api/artifactId -version0.0.1-incubating/version +
[1/7] incubator-nifi git commit: NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3
Repository: incubator-nifi Updated Branches: refs/heads/NIFI-270-RC3 [created] 265eaf01c NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b6bca254 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b6bca254 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b6bca254 Branch: refs/heads/NIFI-270-RC3 Commit: b6bca2548c09222a374ac873a226d94cac3fadcf Parents: 2f4727d Author: joewitt joew...@apache.org Authored: Thu Jan 22 16:54:46 2015 -0500 Committer: joewitt joew...@apache.org Committed: Thu Jan 22 16:54:46 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b6bca254/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index cb59c13..310541b 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-maven-plugin/artifactId -version1.0.0-incubating-SNAPSHOT/version +version1.0.0-incubating/version packagingmaven-plugin/packaging descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description urlhttp://nifi.incubator.apache.org/maven-site//url @@ -58,7 +58,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagHEAD/tag +tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag /scm issueManagement systemJIRA/system
Git Push Summary
Repository: incubator-nifi Updated Tags: refs/tags/nifi-0.0.1-incubating-RC3 [deleted] 9a4932dee
Git Push Summary
Repository: incubator-nifi Updated Tags: refs/tags/nifi-0.0.1-incubating-RC2 [deleted] 1042fadd6
Git Push Summary
Repository: incubator-nifi Updated Tags: refs/tags/nifi-nar-maven-plugin-1.0.0-incubating-RC2 [deleted] 6de9cd7ce
Git Push Summary
Repository: incubator-nifi Updated Tags: refs/tags/nifi-nar-maven-plugin-1.0.0-incubating-RC3 [deleted] 5e728e14c
Git Push Summary
Repository: incubator-nifi Updated Branches: refs/heads/NIFI-270-RC3 [deleted] 265eaf01c
[1/2] incubator-nifi git commit: NIFI 270 fixed organization and excluded DEPENDENCIES from rat check
Repository: incubator-nifi Updated Branches: refs/heads/develop 2f4727db5 - 43e646e68 NIFI 270 fixed organization and excluded DEPENDENCIES from rat check Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f85b8714 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f85b8714 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f85b8714 Branch: refs/heads/develop Commit: f85b8714a10dd314c07de8f2150945c0b6191e88 Parents: 2f4727d Author: joewitt joew...@apache.org Authored: Fri Jan 23 01:25:59 2015 -0500 Committer: joewitt joew...@apache.org Committed: Fri Jan 23 01:25:59 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f85b8714/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index cb59c13..c0f3583 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -29,8 +29,8 @@ descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description urlhttp://nifi.incubator.apache.org/maven-site//url organization -nameApache NiFi (incubating) Project/name -urlhttp://nifi.incubating.apache.org//url +nameApache NiFi (incubating)/name +urlhttp://nifi.incubator.apache.org//url /organization licenses license @@ -208,6 +208,7 @@ excludes excludenb-configuration.xml/exclude excludenbactions.xml/exclude +excludeDEPENDENCIES/exclude /excludes /configuration /plugin
[41/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
--
diff --git
a/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
b/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
deleted file mode 100644
index 10e348d..000
---
a/nifi/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
+++ /dev/null
@@ -1,876 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.InetSocketAddress;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-public class NiFiProperties extends Properties {
-
-private static final long serialVersionUID = 2119177359005492702L;
-
-private static final Logger LOG =
LoggerFactory.getLogger(NiFiProperties.class);
-private static NiFiProperties instance = null;
-
-// core properties
-public static final String PROPERTIES_FILE_PATH =
nifi.properties.file.path;
-public static final String FLOW_CONFIGURATION_FILE =
nifi.flow.configuration.file;
-public static final String FLOW_CONFIGURATION_ARCHIVE_FILE =
nifi.flow.configuration.archive.file;
-public static final String TASK_CONFIGURATION_FILE =
nifi.reporting.task.configuration.file;
-public static final String SERVICE_CONFIGURATION_FILE =
nifi.controller.service.configuration.file;
-public static final String AUTHORITY_PROVIDER_CONFIGURATION_FILE =
nifi.authority.provider.configuration.file;
-public static final String REPOSITORY_DATABASE_DIRECTORY =
nifi.database.directory;
-public static final String RESTORE_DIRECTORY = nifi.restore.directory;
-public static final String VERSION = nifi.version;
-public static final String WRITE_DELAY_INTERVAL =
nifi.flowservice.writedelay.interval;
-public static final String AUTO_RESUME_STATE =
nifi.flowcontroller.autoResumeState;
-public static final String FLOW_CONTROLLER_GRACEFUL_SHUTDOWN_PERIOD =
nifi.flowcontroller.graceful.shutdown.period;
-public static final String NAR_LIBRARY_DIRECTORY =
nifi.nar.library.directory;
-public static final String NAR_WORKING_DIRECTORY =
nifi.nar.working.directory;
-public static final String COMPONENT_DOCS_DIRECTORY =
nifi.documentation.working.directory;
-public static final String SENSITIVE_PROPS_KEY =
nifi.sensitive.props.key;
-public static final String SENSITIVE_PROPS_ALGORITHM =
nifi.sensitive.props.algorithm;
-public static final String SENSITIVE_PROPS_PROVIDER =
nifi.sensitive.props.provider;
-public static final String H2_URL_APPEND = nifi.h2.url.append;
-public static final String REMOTE_INPUT_PORT =
nifi.remote.input.socket.port;
-public static final String SITE_TO_SITE_SECURE =
nifi.remote.input.secure;
-public static final String TEMPLATE_DIRECTORY = nifi.templates.directory;
-public static final String ADMINISTRATIVE_YIELD_DURATION =
nifi.administrative.yield.duration;
-public static final String PERSISTENT_STATE_DIRECTORY =
nifi.persistent.state.directory;
-
-// content repository properties
-public static final String REPOSITORY_CONTENT_PREFIX =
nifi.content.repository.directory.;
-public static final String CONTENT_REPOSITORY_IMPLEMENTATION =
nifi.content.repository.implementation;
-public static final String MAX_APPENDABLE_CLAIM_SIZE =
nifi.content.claim.max.appendable.size;
-public static final String MAX_FLOWFILES_PER_CLAIM =
nifi.content.claim.max.flow.files;
-public static final String CONTENT_ARCHIVE_MAX_RETENTION_PERIOD =
nifi.content.repository.archive.max.retention.period;
-public static final String CONTENT_ARCHIVE_MAX_USAGE_PERCENTAGE =
nifi.content.repository.archive.max.usage.percentage;
-public static
[49/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
--
diff --git a/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
b/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
new file mode 100644
index 000..da03182
--- /dev/null
+++ b/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
@@ -0,0 +1,613 @@
+/*
+ * 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;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.installer.ArtifactInstaller;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
+import org.apache.maven.plugin.dependency.utils.DependencyUtil;
+import org.apache.maven.plugin.dependency.utils.filters.DestFileFilter;
+import org.apache.maven.plugin.dependency.utils.resolvers.ArtifactsResolver;
+import
org.apache.maven.plugin.dependency.utils.resolvers.DefaultArtifactsResolver;
+import org.apache.maven.plugin.dependency.utils.translators.ArtifactTranslator;
+import
org.apache.maven.plugin.dependency.utils.translators.ClassifierTypeTranslator;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.project.MavenProjectHelper;
+import
org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
+import org.apache.maven.shared.artifact.filter.collection.ClassifierFilter;
+import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
+import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
+import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
+import
org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter;
+import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
+import org.codehaus.plexus.archiver.jar.ManifestException;
+import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * Packages the current project as an Apache NiFi Archive (NAR).
+ *
+ * The following code is derived from maven-dependencies-plugin and
+ * maven-jar-plugin. The functionality of CopyDependenciesMojo and JarMojo was
+ * simplified to the use case of NarMojo.
+ *
+ */
+@Mojo(name = nar, defaultPhase = LifecyclePhase.PACKAGE, threadSafe = false,
requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class NarMojo extends AbstractMojo {
+
+private static final String[] DEFAULT_EXCLUDES = new
String[]{**/package.html};
+private static
[29/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
deleted file mode 100644
index 3d2081b..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/test/java/org/apache/nifi/admin/service/action/CreateUserActionTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.admin.service.action;
-
-import java.util.EnumSet;
-import java.util.Set;
-import org.apache.nifi.admin.dao.AuthorityDAO;
-import org.apache.nifi.admin.dao.DAOFactory;
-import org.apache.nifi.admin.dao.DataAccessException;
-import org.apache.nifi.admin.dao.UserDAO;
-import org.apache.nifi.authorization.Authority;
-import org.apache.nifi.user.NiFiUser;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-/**
- * Test cases for creating a user.
- */
-public class CreateUserActionTest {
-
-private String USER_ID_2 = 2;
-private String USER_ID_3 = 3;
-
-private String USER_DN_1 = data access exception when creating user;
-private String USER_DN_3 = general create user case;
-
-private DAOFactory daoFactory;
-private UserDAO userDao;
-private AuthorityDAO authorityDao;
-
-@Before
-public void setup() throws Exception {
-// mock the user dao
-userDao = Mockito.mock(UserDAO.class);
-Mockito.doAnswer(new AnswerVoid() {
-@Override
-public Void answer(InvocationOnMock invocation) throws Throwable {
-Object[] args = invocation.getArguments();
-NiFiUser user = (NiFiUser) args[0];
-
-if (USER_DN_1.equals(user.getDn())) {
-throw new DataAccessException();
-} else if (USER_DN_3.equals(user.getDn())) {
-user.setId(USER_ID_3);
-}
-
-// do nothing
-return null;
-}
-}).when(userDao).createUser(Mockito.any(NiFiUser.class));
-
-// mock the authority dao
-authorityDao = Mockito.mock(AuthorityDAO.class);
-Mockito.doAnswer(new AnswerVoid() {
-@Override
-public Void answer(InvocationOnMock invocation) throws Throwable {
-Object[] args = invocation.getArguments();
-SetAuthority authorities = (SetAuthority) args[0];
-String id = (String) args[1];
-
-if (USER_ID_2.equals(id)) {
-throw new DataAccessException(StringUtils.EMPTY);
-}
-
-// do nothing
-return null;
-}
-
}).when(authorityDao).createAuthorities(Mockito.anySetOf(Authority.class),
Mockito.anyString());
-
-// mock the dao factory
-daoFactory = Mockito.mock(DAOFactory.class);
-Mockito.when(daoFactory.getUserDAO()).thenReturn(userDao);
-Mockito.when(daoFactory.getAuthorityDAO()).thenReturn(authorityDao);
-}
-
-/**
- * Tests DataAccessExceptions that occur while creating user accounts.
- *
- * @throws Exception
- */
-@Test(expected = DataAccessException.class)
-public void testExceptionCreatingUser() throws Exception {
-NiFiUser user = new NiFiUser();
-user.setDn(USER_DN_1);
-
-CreateUserAction createUser = new CreateUserAction(user);
-createUser.execute(daoFactory, null);
-}
-
-/**
- * Tests DataAccessExceptions that occur while create user authorities.
- *
- * @throws Exception
- */
-@Test(expected = DataAccessException.class)
[19/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
deleted file mode 100644
index ec1f26d..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.cluster.protocol.impl;
-
-import org.apache.nifi.cluster.protocol.impl.ClusterServicesBroadcaster;
-import org.apache.nifi.cluster.protocol.impl.MulticastProtocolListener;
-import java.net.InetSocketAddress;
-import org.apache.nifi.cluster.protocol.ProtocolContext;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
-import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.message.ServiceBroadcastMessage;
-import org.apache.nifi.io.socket.multicast.DiscoverableService;
-import org.apache.nifi.io.socket.multicast.DiscoverableServiceImpl;
-import org.apache.nifi.io.socket.multicast.MulticastConfiguration;
-import org.junit.After;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author unattributed
- */
-public class ClusterServicesBroadcasterTest {
-
-private ClusterServicesBroadcaster broadcaster;
-
-private MulticastProtocolListener listener;
-
-private DummyProtocolHandler handler;
-
-private InetSocketAddress multicastAddress;
-
-private DiscoverableService broadcastedService;
-
-private ProtocolContext protocolContext;
-
-private MulticastConfiguration configuration;
-
-@Before
-public void setup() throws Exception {
-
-broadcastedService = new DiscoverableServiceImpl(some-service, new
InetSocketAddress(localhost, 1));
-
-multicastAddress = new InetSocketAddress(225.1.1.1, 2);
-
-configuration = new MulticastConfiguration();
-
-protocolContext = new
JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
-
-broadcaster = new ClusterServicesBroadcaster(multicastAddress,
configuration, protocolContext, 500 ms);
-broadcaster.addService(broadcastedService);
-
-handler = new DummyProtocolHandler();
-listener = new MulticastProtocolListener(5, multicastAddress,
configuration, protocolContext);
-listener.addHandler(handler);
-}
-
-@After
-public void teardown() {
-
-if(broadcaster.isRunning()) {
-broadcaster.stop();
-}
-
-try {
-if(listener.isRunning()) {
-listener.stop();
-}
-} catch(Exception ex) {
-ex.printStackTrace(System.out);
-}
-
-}
-
-@Ignore(fails needs to be fixed)
-@Test
-public void testBroadcastReceived() throws Exception {
-
-broadcaster.start();
-listener.start();
-
-Thread.sleep(1000);
-
-listener.stop();
-
-assertNotNull(handler.getProtocolMessage());
-assertEquals(ProtocolMessage.MessageType.SERVICE_BROADCAST,
handler.getProtocolMessage().getType());
-final ServiceBroadcastMessage msg = (ServiceBroadcastMessage)
handler.getProtocolMessage();
-assertEquals(broadcastedService.getServiceName(),
msg.getServiceName());
-
[18/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
deleted file mode 100644
index 339d904..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.cluster.flow;
-
-import java.util.Set;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-
-/**
- * A service for managing the cluster's flow. The service will attempt to keep
- * the cluster's dataflow current while respecting the value of the configured
- * retrieval delay.
- *
- * The eligible retrieval time is reset with the configured delay every time
the
- * flow state is set to STALE. If the state is set to UNKNOWN or CURRENT, then
- * the flow will not be retrieved.
- *
- * Clients must call start() and stop() to initialize and stop the instance.
- *
- * @author unattributed
- */
-public interface DataFlowManagementService {
-
-/**
- * Starts the instance. Start may only be called if the instance is not
- * running.
- */
-void start();
-
-/**
- * Stops the instance. Stop may only be called if the instance is running.
- */
-void stop();
-
-/**
- * @return true if the instance is started; false otherwise.
- */
-boolean isRunning();
-
-/**
- * Loads the dataflow.
- *
- * @return the dataflow or null if no dataflow exists
- */
-ClusterDataFlow loadDataFlow();
-
-/**
- * Updates the dataflow with the given primary node identifier.
- *
- * @param nodeId the node identifier
- *
- * @throws DaoException if the update failed
- */
-void updatePrimaryNode(NodeIdentifier nodeId) throws DaoException;
-
-/**
- * Sets the state of the flow.
- *
- * @param flowState the state
- *
- * @see PersistedFlowState
- */
-void setPersistedFlowState(PersistedFlowState flowState);
-
-/**
- * @return the state of the flow
- */
-PersistedFlowState getPersistedFlowState();
-
-/**
- * @return true if the flow is current; false otherwise.
- */
-boolean isFlowCurrent();
-
-/**
- * Sets the node identifiers to use when attempting to retrieve the flow.
- *
- * @param nodeIds the node identifiers
- */
-void setNodeIds(SetNodeIdentifier nodeIds);
-
-/**
- * Returns the set of node identifiers the service is using to retrieve the
- * flow.
- *
- * @return the set of node identifiers the service is using to retrieve the
- * flow.
- */
-SetNodeIdentifier getNodeIds();
-
-/**
- * @return the retrieval delay in seconds
- */
-int getRetrievalDelaySeconds();
-
-/**
- * Sets the retrieval delay.
- *
- * @param delay the retrieval delay in seconds
- */
-void setRetrievalDelay(String delay);
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
deleted file mode 100644
index b3afc6e..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See
[25/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
deleted file mode 100644
index 387cce5..000
---
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto.status;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * DTO for serializing the status of a connection.
- */
-@XmlType(name = connectionStatus)
-public class ConnectionStatusDTO {
-
-private String id;
-private String groupId;
-private String name;
-private String input;
-private String queuedCount;
-private String queuedSize;
-private String queued;
-private String output;
-
-private String sourceId;
-private String sourceName;
-private String destinationId;
-private String destinationName;
-
-/* getters / setters */
-/**
- * The id for the connection.
- *
- * @return The connection id
- */
-public String getId() {
-return id;
-}
-
-public void setId(String id) {
-this.id = id;
-}
-
-/**
- * The ID of the Process Group to which this processor belongs.
- *
- * @return the ID of the Process Group to which this processor belongs.
- */
-public String getGroupId() {
-return groupId;
-}
-
-public void setGroupId(final String groupId) {
-this.groupId = groupId;
-}
-
-/**
- * The name of this connection.
- *
- * @return
- */
-public String getName() {
-return name;
-}
-
-public void setName(String name) {
-this.name = name;
-}
-
-/**
- * The total count of flow files that are queued.
- *
- * @return
- */
-public String getQueuedCount() {
-return queuedCount;
-}
-
-public void setQueuedCount(String queuedCount) {
-this.queuedCount = queuedCount;
-}
-
-/**
- * The total size of flow files that are queued.
- *
- * @return
- */
-public String getQueuedSize() {
-return queuedSize;
-}
-
-public void setQueuedSize(String queuedSize) {
-this.queuedSize = queuedSize;
-}
-
-/**
- * The total count and size of flow files that are queued.
- *
- * @return The total count and size of queued flow files
- */
-public String getQueued() {
-return queued;
-}
-
-public void setQueued(String queued) {
-this.queued = queued;
-}
-
-/**
- * The id of the source of this connection.
- *
- * @return
- */
-public String getSourceId() {
-return sourceId;
-}
-
-public void setSourceId(String sourceId) {
-this.sourceId = sourceId;
-}
-
-/**
- * The name of the source of this connection.
- *
- * @return
- */
-public String getSourceName() {
-return sourceName;
-}
-
-public void setSourceName(String sourceName) {
-this.sourceName = sourceName;
-}
-
-/**
- * The id of the destination of this connection.
- *
- * @return
- */
-public String getDestinationId() {
-return destinationId;
-}
-
-public void setDestinationId(String destinationId) {
-this.destinationId = destinationId;
-}
-
-/**
- * The name of the destination of this connection.
- *
- * @return
- */
-public String getDestinationName() {
-return destinationName;
-}
-
-public void setDestinationName(String destinationName) {
-this.destinationName = destinationName;
-}
-
-/**
- * The input for this connection.
- *
- * @return
[30/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
deleted file mode 100644
index edd214b..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.admin.service.transaction;
-
-import java.io.Closeable;
-import org.apache.nifi.admin.service.action.AdministrationAction;
-
-/**
- * Defines a transaction.
- */
-public interface Transaction extends Closeable {
-
-/**
- * Executes the specified action within the current transaction.
- *
- * @param T
- * @param action
- * @return
- * @throws IllegalStateException - if there is no current transaction
- */
-T T execute(AdministrationActionT action);
-
-/**
- * Commits the current transaction.
- *
- * @throws TransactionException - if the transaction is unable to be
- * committed
- */
-void commit() throws TransactionException;
-
-/**
- * Rolls back the current transaction.
- */
-void rollback();
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
deleted file mode 100644
index 2d2ef82..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.admin.service.transaction;
-
-/**
- *
- */
-public interface TransactionBuilder {
-
-Transaction start() throws TransactionException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
deleted file mode 100644
index 924e01f..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
[27/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
deleted file mode 100644
index df59b13..000
---
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.dto;
-
-import java.util.Date;
-import java.util.List;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * Details of a remote process group in this NiFi.
- */
-@XmlType(name = remoteProcessGroup)
-public class RemoteProcessGroupDTO extends NiFiComponentDTO {
-
-private String targetUri;
-private Boolean targetSecure;
-
-private String name;
-private String comments;
-private String communicationsTimeout;
-private String yieldDuration;
-
-private ListString authorizationIssues;
-private Boolean transmitting;
-
-private Integer inputPortCount;
-private Integer outputPortCount;
-
-private Integer activeRemoteInputPortCount;
-private Integer inactiveRemoteInputPortCount;
-private Integer activeRemoteOutputPortCount;
-private Integer inactiveRemoteOutputPortCount;
-
-private Date flowRefreshed;
-
-private RemoteProcessGroupContentsDTO contents;
-
-public RemoteProcessGroupDTO() {
-super();
-}
-
-public RemoteProcessGroupDTO(final RemoteProcessGroupDTO toCopy) {
-setId(toCopy.getId());
-setPosition(toCopy.getPosition());
-targetUri = toCopy.getTargetUri();
-name = toCopy.getName();
-}
-
-public void setTargetUri(final String targetUri) {
-this.targetUri = targetUri;
-}
-
-/**
- * The target uri of this remote process group.
- *
- * @return
- */
-public String getTargetUri() {
-return this.targetUri;
-}
-
-/**
- * The name of this remote process group.
- *
- * @param name
- */
-public void setName(final String name) {
-this.name = name;
-}
-
-public String getName() {
-return this.name;
-}
-
-/**
- * Comments for this remote process group.
- *
- * @return
- */
-public String getComments() {
-return comments;
-}
-
-public void setComments(String comments) {
-this.comments = comments;
-}
-
-/**
- * Returns any remote authorization issues for this remote process group.
- *
- * @return
- */
-public ListString getAuthorizationIssues() {
-return authorizationIssues;
-}
-
-public void setAuthorizationIssues(ListString authorizationIssues) {
-this.authorizationIssues = authorizationIssues;
-}
-
-/**
- * Whether or not this remote process group is actively transmitting.
- *
- * @return
- */
-public Boolean isTransmitting() {
-return transmitting;
-}
-
-public void setTransmitting(Boolean transmitting) {
-this.transmitting = transmitting;
-}
-
-/**
- * Whether or not the target is running securely.
- *
- * @return
- */
-public Boolean isTargetSecure() {
-return targetSecure;
-}
-
-public void setTargetSecure(Boolean targetSecure) {
-this.targetSecure = targetSecure;
-}
-
-/**
- * Returns the time period used for the timeout when communicating with
this
- * RemoteProcessGroup.
- *
- * @return
- */
-public String getCommunicationsTimeout() {
-return communicationsTimeout;
-}
-
-public void setCommunicationsTimeout(String communicationsTimeout) {
-
[06/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
deleted file mode 100644
index c67181a..000
---
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.controller;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.nifi.connectable.Size;
-import org.apache.nifi.encrypt.StringEncryptor;
-import org.apache.nifi.groups.RemoteProcessGroupPortDescriptor;
-import org.apache.nifi.remote.StandardRemoteProcessGroupPortDescriptor;
-import org.apache.nifi.scheduling.SchedulingStrategy;
-import org.apache.nifi.util.DomUtils;
-import org.apache.nifi.web.api.dto.ConnectableDTO;
-import org.apache.nifi.web.api.dto.ConnectionDTO;
-import org.apache.nifi.web.api.dto.FlowSnippetDTO;
-import org.apache.nifi.web.api.dto.FunnelDTO;
-import org.apache.nifi.web.api.dto.LabelDTO;
-import org.apache.nifi.web.api.dto.PortDTO;
-import org.apache.nifi.web.api.dto.PositionDTO;
-import org.apache.nifi.web.api.dto.ProcessGroupDTO;
-import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
-import org.apache.nifi.web.api.dto.ProcessorDTO;
-import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class FlowFromDOMFactory {
-
-public static PositionDTO getPosition(final Element positionElement) {
-if (positionElement == null) {
-throw new IllegalArgumentException(Invalid Flow: Found no
'position' element);
-}
-return new
PositionDTO(Double.parseDouble(positionElement.getAttribute(x)),
Double.parseDouble(positionElement.getAttribute(y)));
-}
-
-public static Size getSize(final Element sizeElement) {
-if (sizeElement == null) {
-throw new IllegalArgumentException(Invalid Flow: Found no 'size'
element);
-}
-
-return new Size(Double.parseDouble(sizeElement.getAttribute(width)),
Double.parseDouble(sizeElement.getAttribute(height)));
-}
-
-public static MapString, String getStyle(final Element stylesElement) {
-final MapString, String styles = new HashMap();
-if (stylesElement == null) {
-return styles;
-}
-
-for (final Element styleElement : getChildrenByTagName(stylesElement,
style)) {
-final String styleName = styleElement.getAttribute(name);
-final String styleValue = styleElement.getTextContent();
-styles.put(styleName, styleValue);
-}
-
-return styles;
-}
-
-public static ProcessGroupDTO getProcessGroup(final String parentId, final
Element element, final StringEncryptor encryptor) {
-final ProcessGroupDTO dto = new ProcessGroupDTO();
-final String groupId = getString(element, id);
-dto.setId(groupId);
-dto.setParentGroupId(parentId);
-dto.setName(getString(element, name));
-dto.setPosition(getPosition(DomUtils.getChild(element, position)));
-dto.setComments(getString(element, comment));
-
-final SetProcessorDTO processors = new HashSet();
-final SetConnectionDTO connections = new HashSet();
-final SetFunnelDTO funnels = new HashSet();
-final SetPortDTO inputPorts = new HashSet();
-final SetPortDTO outputPorts = new HashSet();
-final SetLabelDTO labels = new HashSet();
-final SetProcessGroupDTO processGroups = new HashSet();
-final SetRemoteProcessGroupDTO remoteProcessGroups = new HashSet();
-
-
[33/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/AuditDataSourceFactoryBean.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/AuditDataSourceFactoryBean.java
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/AuditDataSourceFactoryBean.java
deleted file mode 100644
index aeb2755..000
---
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/AuditDataSourceFactoryBean.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.admin;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import org.apache.commons.lang3.StringUtils;
-import org.h2.jdbcx.JdbcConnectionPool;
-import org.apache.nifi.util.NiFiProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.FactoryBean;
-
-/**
- *
- */
-public class AuditDataSourceFactoryBean implements FactoryBean {
-
-private static final Logger logger =
LoggerFactory.getLogger(AuditDataSourceFactoryBean.class);
-private static final String NF_USERNAME_PASSWORD = nf;
-private static final int MAX_CONNECTIONS = 5;
-
-// database file name
-private static final String AUDIT_DATABASE_FILE_NAME = nifi-audit;
-
-//
-// action table
-//
-private static final String CREATE_ACTION_TABLE = CREATE TABLE ACTION (
-+ ID INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
-+ USER_DN VARCHAR2(255) NOT NULL,
-+ USER_NAME VARCHAR2(100) NOT NULL,
-+ SOURCE_ID VARCHAR2(100) NOT NULL,
-+ SOURCE_NAME VARCHAR2(1000) NOT NULL,
-+ SOURCE_TYPE VARCHAR2(1000) NOT NULL,
-+ OPERATION VARCHAR2(50) NOT NULL,
-+ ACTION_TIMESTAMP TIMESTAMP NOT NULL
-+ );
-
-// -
-// component details
-// -
-private static final String CREATE_PROCESSOR_DETAILS_TABLE = CREATE TABLE
PROCESSOR_DETAILS (
-+ ACTION_ID INT NOT NULL PRIMARY KEY,
-+ TYPE VARCHAR2(1000) NOT NULL,
-+ FOREIGN KEY (ACTION_ID) REFERENCES ACTION(ID)
-+ );
-
-private static final String CREATE_REMOTE_PROCESS_GROUP_DETAILS_TABLE =
CREATE TABLE REMOTE_PROCESS_GROUP_DETAILS (
-+ ACTION_ID INT NOT NULL PRIMARY KEY,
-+ URI VARCHAR2(2500) NOT NULL,
-+ FOREIGN KEY (ACTION_ID) REFERENCES ACTION(ID)
-+ );
-
-// --
-// action details
-// --
-private static final String CREATE_MOVE_DETAILS_TABLE = CREATE TABLE
MOVE_DETAILS (
-+ ACTION_ID INT NOT NULL PRIMARY KEY,
-+ GROUP_ID VARCHAR2(100) NOT NULL,
-+ GROUP_NAME VARCHAR2(1000) NOT NULL,
-+ PREVIOUS_GROUP_ID VARCHAR2(100) NOT NULL,
-+ PREVIOUS_GROUP_NAME VARCHAR2(1000) NOT NULL,
-+ FOREIGN KEY (ACTION_ID) REFERENCES ACTION(ID)
-+ );
-
-private static final String CREATE_CONFIGURE_DETAILS_TABLE = CREATE TABLE
CONFIGURE_DETAILS (
-+ ACTION_ID INT NOT NULL PRIMARY KEY,
-+ NAME VARCHAR2(1000) NOT NULL,
-+ VALUE VARCHAR2(5000),
-+ PREVIOUS_VALUE VARCHAR2(5000),
-+ FOREIGN KEY (ACTION_ID) REFERENCES ACTION(ID)
-+ );
-
-private static final String CREATE_CONNECT_DETAILS_TABLE = CREATE TABLE
CONNECT_DETAILS (
-+ ACTION_ID INT NOT NULL PRIMARY KEY,
-+ SOURCE_ID VARCHAR2(100) NOT NULL,
-+ SOURCE_NAME VARCHAR2(1000),
-+ SOURCE_TYPE VARCHAR2(1000) NOT NULL,
-+ RELATIONSHIP VARCHAR2(1000),
-+ DESTINATION_ID VARCHAR2(100) NOT NULL,
-+ DESTINATION_NAME VARCHAR2(1000),
-+ DESTINATION_TYPE VARCHAR2(1000) NOT NULL,
-
[03/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
deleted file mode 100644
index 071be4d..000
---
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ /dev/null
@@ -1,1243 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.controller;
-
-import org.apache.nifi.controller.ProcessScheduler;
-import org.apache.nifi.controller.ValidationContextFactory;
-import org.apache.nifi.controller.ProcessorNode;
-import static java.util.Objects.requireNonNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import org.apache.nifi.components.ValidationContext;
-import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.connectable.Connectable;
-import org.apache.nifi.connectable.ConnectableType;
-import org.apache.nifi.connectable.Connection;
-import org.apache.nifi.connectable.Position;
-import org.apache.nifi.controller.service.ControllerServiceProvider;
-import org.apache.nifi.groups.ProcessGroup;
-import org.apache.nifi.logging.LogLevel;
-import org.apache.nifi.logging.LogRepositoryFactory;
-import org.apache.nifi.nar.NarCloseable;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSessionFactory;
-import org.apache.nifi.processor.Processor;
-import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.processor.annotation.CapabilityDescription;
-import org.apache.nifi.processor.annotation.EventDriven;
-import org.apache.nifi.processor.annotation.SideEffectFree;
-import org.apache.nifi.processor.annotation.SupportsBatching;
-import org.apache.nifi.processor.annotation.TriggerSerially;
-import org.apache.nifi.processor.annotation.TriggerWhenAnyDestinationAvailable;
-import org.apache.nifi.processor.annotation.TriggerWhenEmpty;
-import org.apache.nifi.scheduling.SchedulingStrategy;
-import org.apache.nifi.util.FormatUtils;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.quartz.CronExpression;
-import org.slf4j.LoggerFactory;
-
-/**
- * ProcessorNode provides thread-safe access to a FlowFileProcessor as it
exists
- * within a controlled flow. This node keeps track of the processor, its
- * scheduling information and its relationships to other processors and
whatever
- * scheduled futures exist for it. Must be thread safe.
- *
- * @author none
- */
-public class StandardProcessorNode extends ProcessorNode implements
Connectable {
-
-public static final String BULLETIN_OBSERVER_ID = bulletin-observer;
-
-public static final TimeUnit DEFAULT_TIME_UNIT = TimeUnit.MILLISECONDS;
-public static final String DEFAULT_YIELD_PERIOD = 1 sec;
-public static final String DEFAULT_PENALIZATION_PERIOD = 30 sec;
-private final AtomicReferenceProcessGroup processGroup;
-private final Processor processor;
-private final AtomicReferenceString identifier;
-private final MapConnection, Connectable destinations;
-private final MapRelationship, SetConnection connections;
-private final AtomicReferenceSetRelationship
undefinedRelationshipsToTerminate;
-private final AtomicReferenceListConnection incomingConnectionsRef;
-
[36/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
--
diff --git
a/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
deleted file mode 100644
index 41a0557..000
---
a/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.util.file;
-
-import java.io.BufferedInputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Random;
-
-import org.slf4j.Logger;
-
-/**
- * A utility class containing a few useful static methods to do typical IO
- * operations.
- *
- * @author unattributed
- */
-public class FileUtils {
-
-public static final long TRANSFER_CHUNK_SIZE_BYTES = 1024 * 1024 * 8; //8
MB chunks
-public static final long MILLIS_BETWEEN_ATTEMPTS = 50L;
-
-/**
- * Closes the given closeable quietly - no logging, no exceptions...
- *
- * @param closeable
- */
-public static void closeQuietly(final Closeable closeable) {
-if (null != closeable) {
-try {
-closeable.close();
-} catch (final IOException io) {/*IGNORE*/
-
-}
-}
-}
-
-/**
- * Releases the given lock quietly - no logging, no exception
- *
- * @param lock
- */
-public static void releaseQuietly(final FileLock lock) {
-if (null != lock) {
-try {
-lock.release();
-} catch (final IOException io) {
-/*IGNORE*/
-}
-}
-}
-
-public static void ensureDirectoryExistAndCanAccess(final File dir) throws
IOException {
-if (dir.exists() !dir.isDirectory()) {
-throw new IOException(dir.getAbsolutePath() + is not a
directory);
-} else if (!dir.exists()) {
-final boolean made = dir.mkdirs();
-if (!made) {
-throw new IOException(dir.getAbsolutePath() + could not be
created);
-}
-}
-if (!(dir.canRead() dir.canWrite())) {
-throw new IOException(dir.getAbsolutePath() + directory does not
have read/write privilege);
-}
-}
-
-/**
- * Deletes the given file. If the given file exists but could not be
deleted
- * this will be printed as a warning to the given logger
- *
- * @param file
- * @param logger
- * @return
- */
-public static boolean deleteFile(final File file, final Logger logger) {
-return FileUtils.deleteFile(file, logger, 1);
-}
-
-/**
- * Deletes the given file. If the given file exists but could not be
deleted
- * this will be printed as a warning to the given logger
- *
- * @param file
- * @param logger
- * @param attempts indicates how many times an attempt to delete should be
- * made
- * @return true if given file no longer exists
- */
-public static boolean deleteFile(final File file, final Logger logger,
final int attempts) {
-if (file == null) {
-return false;
-}
-boolean isGone = false;
-try {
-if (file.exists()) {
-final int effectiveAttempts = Math.max(1, attempts);
-for (int i = 0; i effectiveAttempts !isGone; i++) {
-isGone = file.delete() || !file.exists();
-if (!isGone (effectiveAttempts - i) 1)
[45/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
--
diff --git
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
deleted file mode 100644
index a88b72b..000
---
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.attribute.expression.language.evaluation.cast;
-
-import java.util.Map;
-
-import
org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-import
org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
-
-public class BooleanCastEvaluator extends BooleanEvaluator {
-
-private final StringEvaluator subjectEvaluator;
-
-public BooleanCastEvaluator(final StringEvaluator subjectEvaluator) {
-this.subjectEvaluator = subjectEvaluator;
-}
-
-@Override
-public QueryResultBoolean evaluate(final MapString, String attributes)
{
-final QueryResultString result =
subjectEvaluator.evaluate(attributes);
-if (result.getValue() == null) {
-return new BooleanQueryResult(null);
-}
-
-return new
BooleanQueryResult(Boolean.valueOf(result.getValue().trim()));
-}
-
-@Override
-public Evaluator? getSubjectEvaluator() {
-return subjectEvaluator;
-}
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
--
diff --git
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
deleted file mode 100644
index 96e74ef..000
---
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.attribute.expression.language.evaluation.cast;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator;
-import
org.apache.nifi.attribute.expression.language.evaluation.DateQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
[13/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
deleted file mode 100644
index 35380dd..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.cluster.manager.testutils;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.MediaType;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * Encapsulates an HTTP request. The toString method returns the
- * specification-compliant request.
- *
- * @author unattributed
- */
-public class HttpRequest {
-
-private String method;
-private String uri;
-private String rawUri;
-private String version;
-private String body;
-private String rawRequest;
-private MapString, String headers = new HashMap();
-private MapString, ListString parameters = new HashMap();
-
-public static HttpRequestBuilder createFromRequestLine(final String
requestLine) {
-return new HttpRequestBuilder(requestLine);
-}
-
-public String getBody() {
-return body;
-}
-
-public MapString, String getHeaders() {
-return Collections.unmodifiableMap(headers);
-}
-
-public String getHeaderValue(final String header) {
-for (final Map.EntryString, String entry : getHeaders().entrySet()) {
-if (entry.getKey().equalsIgnoreCase(header)) {
-return entry.getValue();
-}
-}
-return null;
-}
-
-public String getMethod() {
-return method;
-}
-
-public MapString, ListString getParameters() {
-final MapString, ListString result = new HashMap();
-for (final Map.EntryString, ListString entry :
parameters.entrySet()) {
-result.put(entry.getKey(),
Collections.unmodifiableList(entry.getValue()));
-}
-return Collections.unmodifiableMap(result);
-}
-
-public String getUri() {
-return uri;
-}
-
-public String getRawUri() {
-return rawUri;
-}
-
-public String getVersion() {
-return version;
-}
-
-@Override
-public String toString() {
-return rawRequest;
-}
-
-/**
- * A builder for constructing basic HTTP requests. It handles only enough
of
- * the HTTP specification to support basic unit testing, and it should not
- * be used otherwise.
- */
-public static class HttpRequestBuilder {
-
-private String method;
-private String uri;
-private String rawUri;
-private String version;
-private MapString, String headers = new HashMap();
-private MapString, ListString parameters = new HashMap();
-private int contentLength = 0;
-private String contentType;
-private String body = ;
-private StringBuilder rawRequest = new StringBuilder();
-
-private HttpRequestBuilder(final String requestLine) {
-
-final String[] tokens = requestLine.split( );
-if (tokens.length != 3) {
-throw new IllegalArgumentException(Invalid HTTP Request Line:
+ requestLine);
-}
-
-method = tokens[0];
-if (HttpMethod.GET.equalsIgnoreCase(method) ||
HttpMethod.HEAD.equalsIgnoreCase(method) ||
HttpMethod.DELETE.equalsIgnoreCase(method) ||
HttpMethod.OPTIONS.equalsIgnoreCase(method)) {
-final int
[20/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
deleted file mode 100644
index fe2d8a4..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.cluster.protocol.jaxb.message;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-
-/**
- * @author unattributed
- */
-public class NodeIdentifierAdapter extends XmlAdapterAdaptedNodeIdentifier,
NodeIdentifier {
-
-@Override
-public AdaptedNodeIdentifier marshal(final NodeIdentifier ni) {
-if(ni == null) {
-return null;
-} else {
-final AdaptedNodeIdentifier aNi = new AdaptedNodeIdentifier();
-aNi.setId(ni.getId());
-aNi.setApiAddress(ni.getApiAddress());
-aNi.setApiPort(ni.getApiPort());
-aNi.setSocketAddress(ni.getSocketAddress());
-aNi.setSocketPort(ni.getSocketPort());
-return aNi;
-}
-}
-
-@Override
-public NodeIdentifier unmarshal(final AdaptedNodeIdentifier aNi) {
-if(aNi == null) {
-return null;
-} else {
-return new NodeIdentifier(aNi.getId(), aNi.getApiAddress(),
aNi.getApiPort(), aNi.getSocketAddress(), aNi.getSocketPort());
-}
-}
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
deleted file mode 100644
index 1613536..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.cluster.protocol.jaxb.message;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-import org.apache.nifi.cluster.protocol.message.ConnectionRequestMessage;
-import org.apache.nifi.cluster.protocol.message.ConnectionResponseMessage;
-import
org.apache.nifi.cluster.protocol.message.ControllerStartupFailureMessage;
-import org.apache.nifi.cluster.protocol.message.DisconnectMessage;
-import org.apache.nifi.cluster.protocol.message.FlowRequestMessage;
-import org.apache.nifi.cluster.protocol.message.FlowResponseMessage;
-import
[22/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml -- diff --git a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml deleted file mode 100644 index bad5a29..000 --- a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -!-- - 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. --- -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; -modelVersion4.0.0/modelVersion -parent -groupIdorg.apache.nifi/groupId -artifactIdnifi-framework-parent/artifactId -version0.0.1-incubating-SNAPSHOT/version -/parent -artifactIdframework-cluster-protocol/artifactId -packagingjar/packaging -nameNiFi Framework Cluster Protocol/name -descriptionThe messaging protocol for clustered NiFi/description -dependencies - -!-- application dependencies -- -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-api/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-properties/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-logging-utils/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-socket-utils/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdnifi-security/artifactId -/dependency -dependency -groupIdorg.apache.nifi/groupId -artifactIdcore-api/artifactId -/dependency - -!-- spring dependencies -- -dependency -groupIdorg.springframework/groupId -artifactIdspring-core/artifactId -/dependency -dependency -groupIdorg.springframework/groupId -artifactIdspring-beans/artifactId -/dependency -dependency -groupIdorg.springframework/groupId -artifactIdspring-context/artifactId -/dependency -/dependencies -/project http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java -- diff --git a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java deleted file mode 100644 index fa1547f..000 --- a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the License); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.nifi.cluster.protocol; - -import
[21/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
deleted file mode 100644
index e9e7d5b..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.cluster.protocol.impl;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.InetSocketAddress;
-import java.net.MulticastSocket;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.nifi.io.socket.multicast.DiscoverableService;
-import org.apache.nifi.io.socket.multicast.MulticastConfiguration;
-import org.apache.nifi.io.socket.multicast.MulticastServicesBroadcaster;
-import org.apache.nifi.io.socket.multicast.MulticastUtils;
-import org.apache.nifi.logging.NiFiLog;
-import org.apache.nifi.util.FormatUtils;
-import org.apache.nifi.cluster.protocol.ProtocolContext;
-import org.apache.nifi.cluster.protocol.ProtocolMessageMarshaller;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.message.ServiceBroadcastMessage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Broadcasts services used by the clustering software using multicast
communication.
- * A configurable delay occurs after broadcasting the collection of services.
- *
- * The client caller is responsible for starting and stopping the broadcasting.
- * The instance must be stopped before termination of the JVM to ensure proper
- * resource clean-up.
- *
- * @author unattributed
- */
-public class ClusterServicesBroadcaster implements
MulticastServicesBroadcaster {
-
-private static final Logger logger = new
NiFiLog(LoggerFactory.getLogger(ClusterServicesBroadcaster.class));
-
-private final SetDiscoverableService services = new
CopyOnWriteArraySet();
-
-private final InetSocketAddress multicastAddress;
-
-private final MulticastConfiguration multicastConfiguration;
-
-private final ProtocolContextProtocolMessage protocolContext;
-
-private final int broadcastDelayMs;
-
-private Timer broadcaster;
-
-private MulticastSocket multicastSocket;
-
-public ClusterServicesBroadcaster(final InetSocketAddress
multicastAddress,
-final MulticastConfiguration multicastConfiguration,
-final ProtocolContextProtocolMessage protocolContext, final
String broadcastDelay) {
-
-if(multicastAddress == null) {
-throw new IllegalArgumentException(Multicast address may not be
null.);
-} else if(multicastAddress.getAddress().isMulticastAddress() == false)
{
-throw new IllegalArgumentException(Multicast group address is not
a Class D IP address.);
-} else if(protocolContext == null) {
-throw new IllegalArgumentException(Protocol Context may not be
null.);
-} else if(multicastConfiguration == null) {
-throw new IllegalArgumentException(Multicast configuration may
not be null.);
-}
-
-this.services.addAll(services);
-this.multicastAddress = multicastAddress;
-this.multicastConfiguration = multicastConfiguration;
-this.protocolContext = protocolContext;
-this.broadcastDelayMs = (int)
FormatUtils.getTimeDuration(broadcastDelay, TimeUnit.MILLISECONDS);
-}
-
-public void start() throws IOException {
-
-if(isRunning()) {
-throw new
[10/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/RepositoryStatusReport.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/RepositoryStatusReport.java
b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/RepositoryStatusReport.java
deleted file mode 100644
index e434905..000
---
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/repository/RepositoryStatusReport.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.controller.repository;
-
-import java.util.Map;
-
-public interface RepositoryStatusReport {
-
-void addReportEntry(FlowFileEvent entry);
-
-MapString, FlowFileEvent getReportEntries();
-
-FlowFileEvent getReportEntry(String componentId);
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
deleted file mode 100644
index 6f9c237..000
---
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.controller.service;
-
-import org.apache.nifi.controller.Availability;
-import org.apache.nifi.controller.ConfiguredComponent;
-import org.apache.nifi.controller.ControllerService;
-
-public interface ControllerServiceNode extends ConfiguredComponent {
-
-ControllerService getControllerService();
-
-Availability getAvailability();
-
-void setAvailability(Availability availability);
-
-boolean isDisabled();
-
-void setDisabled(boolean disabled);
-
-ControllerServiceReference getReferences();
-
-void addReference(ConfiguredComponent referringComponent);
-
-void removeReference(ConfiguredComponent referringComponent);
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
deleted file mode 100644
index 35a255d..000
---
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor
[16/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
deleted file mode 100644
index 81bb7a7..000
---
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.cluster.manager.impl;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
-import org.apache.nifi.cluster.manager.HttpRequestReplicator;
-import org.apache.nifi.cluster.manager.NodeResponse;
-import org.apache.nifi.cluster.manager.exception.UriConstructionException;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.logging.NiFiLog;
-import org.apache.nifi.util.FormatUtils;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * An implementation of the codeHttpRequestReplicator/code interface. This
- * implementation parallelizes the node HTTP requests using the given
- * codeExecutorService/code instance. Individual requests may have
- * connection and read timeouts set, which may be set during instance
- * construction. Otherwise, the default is not to timeout.
- *
- * If a node protocol scheme is provided during construction, then all requests
- * will be replicated using the given scheme. If null is provided as the scheme
- * (the default), then the requests will be replicated using the scheme of the
- * original URI.
- *
- * Clients must call start() and stop() to initialize and shutdown the
instance.
- * The instance must be started before issuing any replication requests.
- *
- * @author unattributed
- */
-public class HttpRequestReplicatorImpl implements HttpRequestReplicator {
-
-// defaults
-private static final int DEFAULT_SHUTDOWN_REPLICATOR_SECONDS = 30;
-
-// logger
-private static final Logger logger = new
NiFiLog(LoggerFactory.getLogger(HttpRequestReplicatorImpl.class));
-
-// final members
-private final Client client;// the client to use for issuing
requests
-private final int numThreads; // number of threads to use for
request replication
-private final int connectionTimeoutMs; // connection timeout per node
request
-private final int readTimeoutMs;// read timeout per node request
-
-// members
-private ExecutorService executorService;
-private int shutdownReplicatorSeconds =
DEFAULT_SHUTDOWN_REPLICATOR_SECONDS;
-
-// guarded by synchronized method access in support of multithreaded
replication
-private String nodeProtocolScheme = null;
-
-/**
- * Creates an instance.
[42/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
--
diff --git
a/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
b/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
deleted file mode 100644
index 8dfbaf1..000
---
a/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
+++ /dev/null
@@ -1,1143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.attribute.expression.language;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.nifi.attribute.expression.language.Query.Range;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-import
org.apache.nifi.attribute.expression.language.exception.AttributeExpressionLanguageException;
-import
org.apache.nifi.attribute.expression.language.exception.AttributeExpressionLanguageParsingException;
-import org.apache.nifi.expression.AttributeExpression.ResultType;
-import org.apache.nifi.flowfile.FlowFile;
-import org.antlr.runtime.tree.Tree;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-public class TestQuery {
-
-@Test
-public void testCompilation() {
-assertInvalid(${attr:uuid()});
-assertInvalid(${attr:indexOf(length())});
-assertValid(${UUID()});
-assertInvalid(${UUID():nextInt()});
-assertValid(${nextInt()});
-assertValid(${now():format('/MM/dd')});
-assertInvalid(${attr:times(3)});
-assertValid(${attr:toNumber():multiply(3)});
-// left here because it's convenient for looking at the output
-//System.out.println(Query.compile().evaluate(null));
-}
-
-private void assertValid(final String query) {
-try {
-Query.compile(query);
-} catch (final Exception e) {
-e.printStackTrace();
-Assert.fail(Expected query to be valid, but it failed to compile
due to + e);
-}
-}
-
-private void assertInvalid(final String query) {
-try {
-Query.compile(query);
-Assert.fail(Expected query to be invalid, but it did compile);
-} catch (final Exception e) {
-}
-}
-
-@Test
-public void testIsValidExpression() {
-Query.validateExpression(${abc:substring(${xyz:length()})}, false);
-Query.isValidExpression(${now():format('-MM-dd')});
-
-
-try {
-Query.validateExpression($${attr}, false);
-Assert.fail(invalid query validated);
-} catch (final AttributeExpressionLanguageParsingException e) {
-}
-
-Query.validateExpression($${attr}, true);
-
-Query.validateExpression(${filename:startsWith('T8MTXBC')\n
-+ :or( ${filename:startsWith('C4QXABC')} )\n
-+ :or( ${filename:startsWith('U6CXEBC')} )
-+ :or( ${filename:startsWith('KYM3ABC')} )}, false);
-}
-
-
-@Test
-public void testCompileEmbedded() {
-final String expression = ${x:equals( ${y} )};
-final Query query = Query.compile(expression);
-final Tree tree = query.getTree();
-System.out.println( printTree(tree) );
-
-final MapString, String attributes = new HashMap();
-attributes.put(x, x);
-attributes.put(y, x);
-final String result = Query.evaluateExpressions(expression,
attributes, null);
-assertEquals(true, result);
-
-Query.validateExpression(expression, false);
-}
-
-private String printTree(final Tree
[04/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
deleted file mode 100644
index b60d187..000
---
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ /dev/null
@@ -1,1026 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.controller;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.zip.GZIPInputStream;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-
-import org.apache.nifi.cluster.protocol.DataFlow;
-import org.apache.nifi.cluster.protocol.StandardDataFlow;
-import org.apache.nifi.connectable.Connectable;
-import org.apache.nifi.connectable.ConnectableType;
-import org.apache.nifi.connectable.Connection;
-import org.apache.nifi.connectable.Funnel;
-import org.apache.nifi.connectable.Port;
-import org.apache.nifi.connectable.Position;
-import org.apache.nifi.connectable.Size;
-import org.apache.nifi.controller.exception.ProcessorInstantiationException;
-import org.apache.nifi.controller.label.Label;
-import org.apache.nifi.events.BulletinFactory;
-import org.apache.nifi.util.file.FileUtils;
-import org.apache.nifi.fingerprint.FingerprintException;
-import org.apache.nifi.fingerprint.FingerprintFactory;
-import org.apache.nifi.flowfile.FlowFilePrioritizer;
-import org.apache.nifi.groups.ProcessGroup;
-import org.apache.nifi.groups.RemoteProcessGroup;
-import org.apache.nifi.groups.RemoteProcessGroupPortDescriptor;
-import org.apache.nifi.logging.LogLevel;
-import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.remote.RemoteGroupPort;
-import org.apache.nifi.remote.RootGroupPort;
-import org.apache.nifi.reporting.Severity;
-import org.apache.nifi.scheduling.SchedulingStrategy;
-import org.apache.nifi.util.NiFiProperties;
-import org.apache.nifi.web.api.dto.ConnectableDTO;
-import org.apache.nifi.web.api.dto.ConnectionDTO;
-import org.apache.nifi.web.api.dto.FlowSnippetDTO;
-import org.apache.nifi.web.api.dto.FunnelDTO;
-import org.apache.nifi.web.api.dto.LabelDTO;
-import org.apache.nifi.web.api.dto.PortDTO;
-import org.apache.nifi.web.api.dto.PositionDTO;
-import org.apache.nifi.web.api.dto.ProcessGroupDTO;
-import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
-import org.apache.nifi.web.api.dto.ProcessorDTO;
-import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.nifi.encrypt.StringEncryptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * @author unattributed
- */
-public class StandardFlowSynchronizer implements FlowSynchronizer {
-
-private static final Logger logger =
LoggerFactory.getLogger(StandardFlowSynchronizer.class);
-public static final URL FLOW_XSD_RESOURCE =
StandardFlowSynchronizer.class.getResource(/FlowConfiguration.xsd);
-private final StringEncryptor encryptor;
-
-public StandardFlowSynchronizer(final StringEncryptor encryptor) {
-
[46/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java -- diff --git a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java deleted file mode 100644 index 420a8e2..000 --- a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java +++ /dev/null @@ -1,1186 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the License); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.nifi.attribute.expression.language; - -import static org.apache.nifi.attribute.expression.language.antlr.AttributeExpressionParser.*; - -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.nifi.attribute.expression.language.antlr.AttributeExpressionLexer; -import org.apache.nifi.attribute.expression.language.antlr.AttributeExpressionParser; -import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.Evaluator; -import org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.QueryResult; -import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.cast.BooleanCastEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.cast.DateCastEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.cast.NumberCastEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.cast.StringCastEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.AndEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.AppendEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.AttributeEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.ContainsEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.DateToNumberEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.DivideEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.EndsWithEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.EqualsEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.EqualsIgnoreCaseEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.FindEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.FormatEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.GreaterThanEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.GreaterThanOrEqualEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.HostnameEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.IPEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.IndexOfEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.IsEmptyEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.IsNullEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.LastIndexOfEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.LengthEvaluator; -import org.apache.nifi.attribute.expression.language.evaluation.functions.LessThanEvaluator; -import
[37/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
--
diff --git
a/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
b/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
deleted file mode 100644
index ae075b5..000
---
a/nifi/commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/LeakyBucketStreamThrottler.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.stream.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class LeakyBucketStreamThrottler implements StreamThrottler {
-
-private final int maxBytesPerSecond;
-private final BlockingQueueRequest requestQueue = new
LinkedBlockingQueueRequest();
-private final ScheduledExecutorService executorService;
-private final AtomicBoolean shutdown = new AtomicBoolean(false);
-
-public LeakyBucketStreamThrottler(final int maxBytesPerSecond) {
-this.maxBytesPerSecond = maxBytesPerSecond;
-
-executorService = Executors.newSingleThreadScheduledExecutor();
-final Runnable task = new Drain();
-executorService.scheduleAtFixedRate(task, 0, 1000,
TimeUnit.MILLISECONDS);
-}
-
-@Override
-public void close() {
-this.shutdown.set(true);
-
-executorService.shutdown();
-try {
-// Should not take more than 2 seconds because we run every
second. If it takes more than
-// 2 seconds, it is because the Runnable thread is blocking on a
write; in this case,
-// we will just ignore it and return
-executorService.awaitTermination(2, TimeUnit.SECONDS);
-} catch (InterruptedException e) {
-}
-}
-
-@Override
-public OutputStream newThrottledOutputStream(final OutputStream toWrap) {
-return new OutputStream() {
-@Override
-public void write(final int b) throws IOException {
-write(new byte[]{(byte) b}, 0, 1);
-}
-
-@Override
-public void write(byte[] b) throws IOException {
-write(b, 0, b.length);
-}
-
-@Override
-public void write(byte[] b, int off, int len) throws IOException {
-final InputStream in = new ByteArrayInputStream(b, off, len);
-LeakyBucketStreamThrottler.this.copy(in, toWrap);
-}
-
-@Override
-public void close() throws IOException {
-toWrap.close();
-}
-
-@Override
-public void flush() throws IOException {
-toWrap.flush();
-}
-};
-}
-
-@Override
-public InputStream newThrottledInputStream(final InputStream toWrap) {
-return new InputStream() {
-final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-@Override
-public int read() throws IOException {
-final ByteArrayOutputStream baos = new
ByteArrayOutputStream(1);
-LeakyBucketStreamThrottler.this.copy(toWrap, baos, 1L);
-if (baos.getBufferLength() 1) {
-return -1;
-}
-
-return baos.getUnderlyingBuffer()[0] 0xFF;
-}
-
-@Override
-public int read(final byte[] b) throws IOException {
-if(b.length == 0){
-return 0;
-}
-return read(b, 0, b.length);
-}
-
-@Override
-public int read(byte[] b, int off, int len) throws IOException {
-if ( len 0 ) {
-
[24/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterPortStatusEntity.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterPortStatusEntity.java
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterPortStatusEntity.java
deleted file mode 100644
index 16a2497..000
---
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterPortStatusEntity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.entity;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.nifi.web.api.dto.status.ClusterPortStatusDTO;
-
-/**
- * A serialized representation of this class can be placed in the entity body
of
- * a request or response to or from the API. This particular entity holds a
- * reference to a ClusterPortStatusDTO.
- */
-@XmlRootElement(name = clusterPortStatusEntity)
-public class ClusterPortStatusEntity extends Entity {
-
-private ClusterPortStatusDTO clusterPortStatus;
-
-/**
- * The ClusterPortStatusDTO that is being serialized.
- *
- * @return The ClusterPortStatusDTO object
- */
-public ClusterPortStatusDTO getClusterPortStatus() {
-return clusterPortStatus;
-}
-
-public void setClusterPortStatus(ClusterPortStatusDTO clusterPortStatus) {
-this.clusterPortStatus = clusterPortStatus;
-}
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterProcessorStatusEntity.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterProcessorStatusEntity.java
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterProcessorStatusEntity.java
deleted file mode 100644
index 68e5c5c..000
---
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusterProcessorStatusEntity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.api.entity;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.nifi.web.api.dto.status.ClusterProcessorStatusDTO;
-
-/**
- * A serialized representation of this class can be placed in the entity body
of
- * a request or response to or from the API. This particular entity holds a
- * reference to a ClusterProcessorStatusDTO.
- */
-@XmlRootElement(name = clusterProcessorStatusEntity)
-public class ClusterProcessorStatusEntity extends Entity {
-
-private ClusterProcessorStatusDTO clusterProcessorStatus;
-
-/**
- * The ClusterProcessorStatusDTO that is being serialized.
- *
- * @return The ClusterProcessorStatusDTO object
- */
-public ClusterProcessorStatusDTO getClusterProcessorStatus() {
-return clusterProcessorStatus;
-}
-
-public void setClusterProcessorStatus(ClusterProcessorStatusDTO
clusterProcessorStatus) {
-
[07/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java -- diff --git a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java deleted file mode 100644 index 346e801..000 --- a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java +++ /dev/null @@ -1,3579 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the License); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.nifi.controller; - -import static java.util.Objects.requireNonNull; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import javax.net.ssl.SSLContext; - -import org.apache.nifi.admin.service.UserService; -import org.apache.nifi.cluster.BulletinsPayload; -import org.apache.nifi.cluster.HeartbeatPayload; -import org.apache.nifi.cluster.protocol.DataFlow; -import org.apache.nifi.cluster.protocol.Heartbeat; -import org.apache.nifi.cluster.protocol.NodeBulletins; -import org.apache.nifi.cluster.protocol.NodeIdentifier; -import org.apache.nifi.cluster.protocol.NodeProtocolSender; -import org.apache.nifi.cluster.protocol.UnknownServiceAddressException; -import org.apache.nifi.cluster.protocol.message.HeartbeatMessage; -import org.apache.nifi.cluster.protocol.message.NodeBulletinsMessage; -import org.apache.nifi.connectable.Connectable; -import org.apache.nifi.connectable.ConnectableType; -import org.apache.nifi.connectable.Connection; -import org.apache.nifi.connectable.Funnel; -import org.apache.nifi.connectable.LocalPort; -import org.apache.nifi.connectable.Port; -import org.apache.nifi.connectable.Position; -import org.apache.nifi.connectable.Size; -import org.apache.nifi.connectable.StandardConnection; -import org.apache.nifi.controller.exception.CommunicationsException; -import org.apache.nifi.controller.exception.ProcessorInstantiationException; -import org.apache.nifi.controller.exception.ProcessorLifeCycleException; -import org.apache.nifi.controller.label.Label; -import org.apache.nifi.controller.label.StandardLabel; -import org.apache.nifi.controller.reporting.ReportingTaskInstantiationException; -import org.apache.nifi.controller.reporting.StandardReportingTaskNode; -import org.apache.nifi.controller.repository.ContentRepository; -import org.apache.nifi.controller.repository.CounterRepository; -import org.apache.nifi.controller.repository.FlowFileEvent; -import org.apache.nifi.controller.repository.FlowFileEventRepository; -import org.apache.nifi.controller.repository.FlowFileRecord; -import org.apache.nifi.controller.repository.FlowFileRepository; -import org.apache.nifi.controller.repository.FlowFileSwapManager; -import org.apache.nifi.controller.repository.QueueProvider; -import org.apache.nifi.controller.repository.RepositoryRecord; -import org.apache.nifi.controller.repository.RepositoryStatusReport; -import org.apache.nifi.controller.repository.StandardCounterRepository; -import org.apache.nifi.controller.repository.StandardFlowFileRecord; -import
[05/51] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
--
diff --git
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
deleted file mode 100644
index d459b00..000
---
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
+++ /dev/null
@@ -1,875 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.controller;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-import java.util.concurrent.ScheduledExecutorService;
-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.ReentrantReadWriteLock;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.nifi.cluster.ConnectionException;
-import org.apache.nifi.cluster.protocol.ConnectionRequest;
-import org.apache.nifi.cluster.protocol.ConnectionResponse;
-import org.apache.nifi.cluster.protocol.DataFlow;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.StandardDataFlow;
-import org.apache.nifi.cluster.protocol.UnknownServiceAddressException;
-import org.apache.nifi.cluster.protocol.impl.NodeProtocolSenderListener;
-import org.apache.nifi.cluster.protocol.message.ConnectionRequestMessage;
-import
org.apache.nifi.cluster.protocol.message.ControllerStartupFailureMessage;
-import org.apache.nifi.cluster.protocol.message.DisconnectMessage;
-import org.apache.nifi.cluster.protocol.message.FlowRequestMessage;
-import org.apache.nifi.cluster.protocol.message.FlowResponseMessage;
-import org.apache.nifi.cluster.protocol.message.PrimaryRoleAssignmentMessage;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionFailureMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionRequestMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionResponseMessage;
-import org.apache.nifi.engine.FlowEngine;
-import org.apache.nifi.events.BulletinFactory;
-import org.apache.nifi.util.file.FileUtils;
-import org.apache.nifi.groups.ProcessGroup;
-import org.apache.nifi.lifecycle.LifeCycleStartException;
-import org.apache.nifi.logging.LogLevel;
-import org.apache.nifi.persistence.FlowConfigurationDAO;
-import org.apache.nifi.persistence.StandardXMLFlowConfigurationDAO;
-import org.apache.nifi.reporting.Bulletin;
-import org.apache.nifi.services.FlowService;
-import org.apache.nifi.util.FormatUtils;
-import org.apache.nifi.util.NiFiProperties;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.nifi.encrypt.StringEncryptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class StandardFlowService implements FlowService, ProtocolHandler {
-
-private static final String EVENT_CATEGORY = Controller;
-
-private final FlowController controller;
-private final Path flowXml;
-private final Path taskConfigXml;
-private final Path serviceConfigXml;
-private final FlowConfigurationDAO dao;
-private final int gracefulShutdownSeconds;
-private final boolean autoResumeState;
-private final int connectionRetryMillis;
-private final StringEncryptor encryptor;
-
-// Lock is used to protect the flow.xml file.
-private final
Git Push Summary
Repository: incubator-nifi Updated Tags: refs/tags/nifi-nar-maven-plugin-1.0.0-incubating-RC1 [created] faa150cf8
[5/7] incubator-nifi git commit: NIFI-270 prepare release nifi-0.0.1-incubating-RC1
NIFI-270 prepare release nifi-0.0.1-incubating-RC1 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/aa87c78c Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/aa87c78c Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/aa87c78c Branch: refs/heads/NIFI-270-RC1 Commit: aa87c78c6f852adc98ccc8261bb692f122e54429 Parents: 31509c2 Author: joewitt joew...@apache.org Authored: Wed Jan 21 02:44:20 2015 -0500 Committer: joewitt joew...@apache.org Committed: Wed Jan 21 02:44:20 2015 -0500 -- nifi/nifi-api/pom.xml | 4 +- nifi/nifi-assembly/pom.xml | 6 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../nifi-data-provenance-utils/pom.xml | 4 +- .../nifi-expression-language/pom.xml| 4 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 4 +- nifi/nifi-commons/nifi-logging-utils/pom.xml| 4 +- .../nifi-processor-utilities/pom.xml| 4 +- nifi/nifi-commons/nifi-properties/pom.xml | 4 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-web-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 4 +- nifi/nifi-commons/pom.xml | 5 +- nifi/nifi-docs/pom.xml | 6 +- nifi/nifi-mock/pom.xml | 4 +- .../nifi-framework-nar/pom.xml | 4 +- .../nifi-framework/nifi-administration/pom.xml | 4 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-cluster-protocol/pom.xml | 2 +- .../nifi-framework/nifi-cluster-web/pom.xml | 2 +- .../nifi-framework/nifi-cluster/pom.xml | 2 +- .../nifi-file-authorization-provider/pom.xml| 4 +- .../nifi-framework-core-api/pom.xml | 4 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/pom.xml | 2 +- .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml| 4 +- .../nifi-framework/nifi-site-to-site/pom.xml| 4 +- .../nifi-framework/nifi-user-actions/pom.xml| 4 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-framework/nifi-web/pom.xml | 10 +-- .../nifi-framework/pom.xml | 4 +- .../nifi-framework-bundle/pom.xml | 36 +-- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 4 +- .../nifi-hdfs-processors/pom.xml| 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 +- .../nifi-hadoop-libraries-nar/pom.xml | 4 +- .../nifi-hadoop-libraries-bundle/pom.xml| 4 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 4 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml| 4 +- .../nifi-kafka-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml | 4 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 8 +-- .../nifi-standard-nar/pom.xml | 4 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml| 2 +- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml| 10 +-- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 4 +- .../pom.xml | 4 +- .../nifi-load-distribution-service-api/pom.xml | 4 +- .../nifi-ssl-context-nar/pom.xml| 4 +- .../nifi-ssl-context-service/pom.xml| 2 +- .../nifi-ssl-context-bundle/pom.xml | 4 +- .../nifi-ssl-context-service-api/pom.xml| 2 +- .../nifi-standard-services-api-nar/pom.xml | 4 +- .../nifi-standard-services/pom.xml | 4 +- .../nifi-update-attribute-model
[4/7] incubator-nifi git commit: NIFI-270 prepare release nifi-0.0.1-incubating-RC1
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/aa87c78c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml index 0941cd9..a3e3fc9 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml @@ -17,10 +17,10 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /parent artifactIdnifi-update-attribute-nar/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version packagingnar/packaging dependencies http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/aa87c78c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml index a39ab34..64215c6 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/aa87c78c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml index e1962d2..70aefc6 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /parent artifactIdnifi-update-attribute-ui/artifactId packagingwar/packaging http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/aa87c78c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml index ef74687..e20e77b 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml @@ -18,11 +18,11 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-bundles/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /parent artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version packagingpom/packaging modules @@ -37,18 +37,18 @@ dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-model/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-ui/artifactId typewar/type -version0.0.1-incubating-SNAPSHOT/version +version0.0.1-incubating/version /dependency /dependencies /dependencyManagement http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/aa87c78c/nifi/nifi-nar-bundles/pom.xml -- diff --git a/nifi/nifi-nar-bundles/pom.xml
[7/7] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/7ad2b21c Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/7ad2b21c Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/7ad2b21c Branch: refs/heads/NIFI-270-RC1 Commit: 7ad2b21c8f3f694cd3c8ec3bd07c732f363e8d9b Parents: aa87c78 Author: joewitt joew...@apache.org Authored: Wed Jan 21 02:44:31 2015 -0500 Committer: joewitt joew...@apache.org Committed: Wed Jan 21 02:44:31 2015 -0500 -- nifi/nifi-api/pom.xml | 4 +- nifi/nifi-assembly/pom.xml | 4 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../nifi-data-provenance-utils/pom.xml | 4 +- .../nifi-expression-language/pom.xml| 4 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 4 +- nifi/nifi-commons/nifi-logging-utils/pom.xml| 4 +- .../nifi-processor-utilities/pom.xml| 4 +- nifi/nifi-commons/nifi-properties/pom.xml | 4 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-web-utils/pom.xml| 4 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 4 +- nifi/nifi-commons/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- nifi/nifi-mock/pom.xml | 4 +- .../nifi-framework-nar/pom.xml | 4 +- .../nifi-framework/nifi-administration/pom.xml | 4 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-cluster-protocol/pom.xml | 2 +- .../nifi-framework/nifi-cluster-web/pom.xml | 2 +- .../nifi-framework/nifi-cluster/pom.xml | 2 +- .../nifi-file-authorization-provider/pom.xml| 4 +- .../nifi-framework-core-api/pom.xml | 4 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/pom.xml | 2 +- .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml| 4 +- .../nifi-framework/nifi-site-to-site/pom.xml| 4 +- .../nifi-framework/nifi-user-actions/pom.xml| 4 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-framework/nifi-web/pom.xml | 10 +-- .../nifi-framework/pom.xml | 4 +- .../nifi-framework-bundle/pom.xml | 36 +-- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 4 +- .../nifi-hdfs-processors/pom.xml| 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 +- .../nifi-hadoop-libraries-nar/pom.xml | 4 +- .../nifi-hadoop-libraries-bundle/pom.xml| 4 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 4 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml| 4 +- .../nifi-kafka-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml | 4 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 8 +-- .../nifi-standard-nar/pom.xml | 4 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml| 2 +- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml| 10 +-- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 4 +- .../pom.xml | 4 +- .../nifi-load-distribution-service-api/pom.xml | 4 +- .../nifi-ssl-context-nar/pom.xml| 4 +- .../nifi-ssl-context-service/pom.xml| 2 +- .../nifi-ssl-context-bundle/pom.xml | 4 +- .../nifi-ssl-context-service-api/pom.xml| 2 +- .../nifi-standard-services-api-nar/pom.xml | 4 +- .../nifi-standard-services/pom.xml | 4 +- .../nifi-update-attribute-model/pom.xml
[6/7] incubator-nifi git commit: NIFI-270 prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7ad2b21c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml index 64215c6..deb787f 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7ad2b21c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml index 70aefc6..04b9ad6 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml @@ -18,7 +18,7 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent artifactIdnifi-update-attribute-ui/artifactId packagingwar/packaging http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7ad2b21c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml -- diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml index e20e77b..dcb63e4 100644 --- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml @@ -18,11 +18,11 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-bundles/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent artifactIdnifi-update-attribute-bundle/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version packagingpom/packaging modules @@ -37,18 +37,18 @@ dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-model/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-processor/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-update-attribute-ui/artifactId typewar/type -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency /dependencies /dependencyManagement http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7ad2b21c/nifi/nifi-nar-bundles/pom.xml -- diff --git a/nifi/nifi-nar-bundles/pom.xml b/nifi/nifi-nar-bundles/pom.xml index fa65abe..4ee6875 100644 --- a/nifi/nifi-nar-bundles/pom.xml +++ b/nifi/nifi-nar-bundles/pom.xml @@ -19,12 +19,12 @@ parent groupIdorg.apache.nifi/groupId artifactIdnifi/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-bundles/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version packagingpom/packaging modules @@ -43,70 +43,70 @@ dependency groupIdorg.apache.nifi/groupId artifactIdnifi-distributed-cache-client-service/artifactId -version0.0.1-incubating/version +version0.0.2-incubating-SNAPSHOT/version /dependency dependency groupIdorg.apache.nifi/groupId artifactIdnifi-distributed-cache-client-service-api/artifactId -version0.0.1-incubating/version +
[2/7] incubator-nifi git commit: NIFI-270 prepare for next development iteration
NIFI-270 prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e9331afd Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e9331afd Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e9331afd Branch: refs/heads/NIFI-270-RC1 Commit: e9331afd011321ae209a8fc4b71d80e1e43a7bf1 Parents: 2a1f485 Author: joewitt joew...@apache.org Authored: Wed Jan 21 02:17:39 2015 -0500 Committer: joewitt joew...@apache.org Committed: Wed Jan 21 02:17:39 2015 -0500 -- nifi-nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9331afd/nifi-nar-maven-plugin/pom.xml -- diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index c8c9fdb..091248f 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ /parent groupIdorg.apache.nifi/groupId artifactIdnifi-nar-maven-plugin/artifactId -version1.0.0-incubating/version +version1.0.1-incubating-SNAPSHOT/version packagingmaven-plugin/packaging descriptionApache NiFi Nar Plugin. It is currently a part of the Apache Incubator./description urlhttp://nifi.incubator.apache.org/maven-site//url @@ -58,7 +58,7 @@ connectionscm:git:git://git.apache.org/incubator-nifi.git/connection developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url -tagnifi-nar-maven-plugin-1.0.0-incubating-RC1/tag +tagHEAD/tag /scm issueManagement systemJIRA/system
