You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/02/18 04:48:51 UTC
[1/7] incubator-nifi git commit: NIFI-355 removed all extraneous
version references
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-353 cd0a1bd42 -> 78bab591d
NIFI-355 removed all extraneous version references
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fa5a4f26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fa5a4f26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fa5a4f26
Branch: refs/heads/NIFI-353
Commit: fa5a4f26cef8da876a9555becade0a5a20d1506e
Parents: b8ade5b
Author: joewitt <jo...@apache.org>
Authored: Mon Feb 16 23:55:36 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Mon Feb 16 23:55:36 2015 -0500
----------------------------------------------------------------------
nifi/nifi-api/pom.xml | 1 -
nifi/nifi-assembly/pom.xml | 1 -
nifi/nifi-commons/nifi-data-provenance-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-expression-language/pom.xml | 1 -
nifi/nifi-commons/nifi-flowfile-packager/pom.xml | 1 -
nifi/nifi-commons/nifi-logging-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-processor-utilities/pom.xml | 1 -
nifi/nifi-commons/nifi-properties/pom.xml | 1 -
nifi/nifi-commons/nifi-security-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-socket-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-web-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 1 -
nifi/nifi-mock/pom.xml | 1 -
.../nifi-framework-bundle/nifi-framework-nar/pom.xml | 1 -
.../nifi-framework/nifi-administration/pom.xml | 1 -
.../nifi-framework/nifi-cluster-protocol/pom.xml | 1 -
.../nifi-framework/nifi-file-authorization-provider/pom.xml | 1 -
.../nifi-framework/nifi-framework-core-api/pom.xml | 1 -
.../nifi-framework-bundle/nifi-framework/nifi-security/pom.xml | 1 -
.../nifi-framework/nifi-site-to-site/pom.xml | 1 -
.../nifi-framework/nifi-user-actions/pom.xml | 1 -
.../nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 1 -
.../nifi-hadoop-libraries-nar/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 --
nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 2 +-
.../nifi-provenance-repository-nar/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml | 1 -
.../nifi-standard-bundle/nifi-standard-nar/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml | 1 -
.../nifi-distributed-cache-services-nar/pom.xml | 1 -
.../nifi-distributed-cache-services-bundle/pom.xml | 1 -
.../nifi-load-distribution-service-api/pom.xml | 1 -
.../nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml | 1 -
.../nifi-standard-services/nifi-ssl-context-bundle/pom.xml | 1 -
.../nifi-standard-services/nifi-standard-services-api-nar/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-standard-services/pom.xml | 1 -
.../nifi-update-attribute-nar/pom.xml | 2 --
nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml | 3 ---
nifi/nifi-nar-bundles/pom.xml | 3 ---
44 files changed, 1 insertion(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/pom.xml b/nifi/nifi-api/pom.xml
index 7789ac4..ec746a5 100644
--- a/nifi/nifi-api/pom.xml
+++ b/nifi/nifi-api/pom.xml
@@ -21,6 +21,5 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-api</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml
index 617ca75..8d16d5e 100644
--- a/nifi/nifi-assembly/pom.xml
+++ b/nifi/nifi-assembly/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-assembly</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>This is the assembly Apache NiFi (incubating)</description>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
index a967df9..580a8e7 100644
--- a/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-data-provenance-utils</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-expression-language/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-expression-language/pom.xml b/nifi/nifi-commons/nifi-expression-language/pom.xml
index db384bb..d41c788 100644
--- a/nifi/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi/nifi-commons/nifi-expression-language/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-expression-language</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
index cb08ba1..576780a 100644
--- a/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
+++ b/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-flowfile-packager</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-logging-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-logging-utils/pom.xml b/nifi/nifi-commons/nifi-logging-utils/pom.xml
index 71cc500..b431254 100644
--- a/nifi/nifi-commons/nifi-logging-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-logging-utils/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-logging-utils</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<description>Utilities for logging</description>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-processor-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-processor-utilities/pom.xml b/nifi/nifi-commons/nifi-processor-utilities/pom.xml
index a239af2..2e7318d 100644
--- a/nifi/nifi-commons/nifi-processor-utilities/pom.xml
+++ b/nifi/nifi-commons/nifi-processor-utilities/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-processor-utils</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-properties/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-properties/pom.xml b/nifi/nifi-commons/nifi-properties/pom.xml
index 9c7dccb..48c1321 100644
--- a/nifi/nifi-commons/nifi-properties/pom.xml
+++ b/nifi/nifi-commons/nifi-properties/pom.xml
@@ -21,5 +21,4 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-properties</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-security-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-security-utils/pom.xml b/nifi/nifi-commons/nifi-security-utils/pom.xml
index 4f8f2d1..b2b34b1 100644
--- a/nifi/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-security-utils/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-security-utils</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<description>Contains security functionality.</description>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-socket-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/pom.xml b/nifi/nifi-commons/nifi-socket-utils/pom.xml
index fd9629d..06f7109 100644
--- a/nifi/nifi-commons/nifi-socket-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-socket-utils/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-socket-utils</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<description>Utilities for socket communication</description>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-web-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-web-utils/pom.xml b/nifi/nifi-commons/nifi-web-utils/pom.xml
index fe70cfc..140c2f1 100644
--- a/nifi/nifi-commons/nifi-web-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-web-utils/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-web-utils</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-write-ahead-log/pom.xml b/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
index eb1e023..3424a48 100644
--- a/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
+++ b/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-write-ahead-log</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-mock/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/pom.xml b/nifi/nifi-mock/pom.xml
index 37daa06..2b1e534 100644
--- a/nifi/nifi-mock/pom.xml
+++ b/nifi/nifi-mock/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-mock</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
index 87503ad..1b92270 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-nar</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
<description>NiFi: Framework Nar</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
index e047f3e..1f26280 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-administration</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<build>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/pom.xml
index 476d060..afca65a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/pom.xml
@@ -24,7 +24,6 @@
<packaging>jar</packaging>
<description>The messaging protocol for clustered NiFi</description>
<dependencies>
-
<!-- application dependencies -->
<dependency>
<groupId>org.apache.nifi</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
index 523c3bb..9cc4339 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-file-authorization-provider</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<build>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
index d088c5c..a294c68 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-core-api</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
index b967f98..bc01d8b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-security</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<description>Contains security functionality common to NiFi.</description>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
index f989f66..49823b8 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-site-to-site</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<dependencies>
<dependency> <!-- This can be removed after testing.... -->
<groupId>org.apache.nifi</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
index b73ae9a..0bbd4ce 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
@@ -21,5 +21,4 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-user-actions</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
index c386128..30d6b03 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>nifi-framework-core-api</module>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 413bfca..d65771f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-bundle</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>NiFi: Framework Bundle</description>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
index 9cc8196..5baf87c 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hadoop-nar</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
index be32bff..3c7680a 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hadoop-bundle</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>A bundle of processors that work with Hadoop</description>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
index e0dc940..1b90a52 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
@@ -21,7 +21,6 @@
</parent>
<artifactId>nifi-hadoop-libraries-nar</artifactId>
<packaging>nar</packaging>
- <version>0.0.2-incubating-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
index 85cd279..7bc4f9a 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
@@ -21,7 +21,6 @@
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-libraries-bundle</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>A bundle which provides the Hadoop libraries</description>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
index aaa9964..a4e3944 100644
--- a/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
@@ -20,10 +20,8 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-jetty-bundle</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
<description>NiFi: Jetty Bundle</description>
-
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
index 33acde3..4ce7c35 100644
--- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-kafka-nar</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
<description>NiFi NAR for interacting with Apache Kafka</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
index f96d4e0..6828e58 100644
--- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
@@ -13,12 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>nifi-kafka-bundle</artifactId>
<packaging>pom</packaging>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
index 647c4ec..fcacb3d 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-provenance-repository-nar</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
index 8a835d6..bdad811 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-provenance-repository-bundle</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>nifi-persistent-provenance-repository</module>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
index 64ad45e..8a7e768 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-nar</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
<description>NiFi Standard Extensions NAR</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 14d076c..8574f05 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>NiFi Standard Extensions Bundle</description>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
index 5a5ea75..660dff4 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-distributed-cache-services-nar</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
index 5c93ceb..2cf9e3b 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>nifi-distributed-cache-protocol</module>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
index 12a5380..079ac60 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-load-distribution-service-api</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
index 57b8049..a9d62d6 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-ssl-context-service-nar</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
index 8728408..67d84a4 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-ssl-context-bundle</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>nifi-ssl-context-service</module>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
index a60c508..0da53fc 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
@@ -20,7 +20,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
index 08e26a8..449170c 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
@@ -21,7 +21,6 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-services</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>nifi-distributed-cache-client-service-api</module>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/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 ebbd901..89762ea 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
@@ -20,9 +20,7 @@
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-update-attribute-nar</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>nar</packaging>
-
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/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 dcb63e4..aac3685 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
@@ -20,11 +20,8 @@
<artifactId>nifi-nar-bundles</artifactId>
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
-
<artifactId>nifi-update-attribute-bundle</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
-
<modules>
<module>nifi-update-attribute-model</module>
<module>nifi-update-attribute-processor</module>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa5a4f26/nifi/nifi-nar-bundles/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/pom.xml b/nifi/nifi-nar-bundles/pom.xml
index 4ee6875..229353f 100644
--- a/nifi/nifi-nar-bundles/pom.xml
+++ b/nifi/nifi-nar-bundles/pom.xml
@@ -21,12 +21,9 @@
<artifactId>nifi</artifactId>
<version>0.0.2-incubating-SNAPSHOT</version>
</parent>
-
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
-
<modules>
<module>nifi-framework-bundle</module>
<module>nifi-hadoop-bundle</module>
[3/7] incubator-nifi git commit: Merge branch 'NIFI-356' of
https://github.com/apiri/incubator-nifi into develop
Posted by mc...@apache.org.
Merge branch 'NIFI-356' of https://github.com/apiri/incubator-nifi 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/dde5fd51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/dde5fd51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/dde5fd51
Branch: refs/heads/NIFI-353
Commit: dde5fd51a406862331c0fecc13fb1dde8d712fbe
Parents: fa5a4f2 24be4a1
Author: joewitt <jo...@apache.org>
Authored: Tue Feb 17 00:24:58 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Feb 17 00:24:58 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/processors/standard/EvaluateXPath.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/7] incubator-nifi git commit: NIFI-325: - Code clean up. -
Ensuring the fill color action is available in toolbar and context menu under
the same conditions. - Only applying the new color if different.
Posted by mc...@apache.org.
NIFI-325:
- Code clean up.
- Ensuring the fill color action is available in toolbar and context menu under the same conditions.
- Only applying the new color if different.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4239797b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4239797b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4239797b
Branch: refs/heads/NIFI-353
Commit: 4239797b9f26f3e7be5746b55d5cac9cb7128172
Parents: dde5fd5
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Feb 17 11:44:15 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Feb 17 11:44:15 2015 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-actions.js | 16 ++---
.../webapp/js/nf/canvas/nf-canvas-header.js | 62 +++++++++++---------
.../webapp/js/nf/canvas/nf-canvas-toolbar.js | 15 +----
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 21 +++++++
.../main/webapp/js/nf/canvas/nf-context-menu.js | 7 +--
5 files changed, 62 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4239797b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index 6624d52..f2dc9b3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -843,17 +843,11 @@ nf.Actions = (function () {
* @param {type} selection The selection
*/
fillColor: function (selection) {
- var selectedProcessors = selection.filter(function(d) {
- return nf.CanvasUtils.isProcessor(d3.select(this));
- });
- var selectedLabels = selection.filter(function(d) {
- return nf.CanvasUtils.isLabel(d3.select(this));
- });
-
- var allProcessors = selectedProcessors.size() === selection.size();
- var allLabels = selectedLabels.size() === selection.size();
-
- if (allProcessors || allLabels) {
+ if (nf.CanvasUtils.isColorable(selection)) {
+ // we know that the entire selection is processors or labels... this
+ // checks if the first item is a processor... if true, all processors
+ var allProcessors = nf.CanvasUtils.isProcessor(selection);
+
var color;
if (allProcessors) {
color = nf.Processor.defaultColor();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4239797b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
index 5daf415..335b145 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
@@ -182,34 +182,37 @@ nf.CanvasHeader = (function () {
// get the color and update the styles
var color = $('#fill-color').minicolors('value');
- // update the style for the specified component
- $.ajax({
- type: 'PUT',
- url: selectedData.component.uri,
- data: {
- 'version': revision.version,
- 'clientId': revision.clientId,
- 'style[background-color]': color
- },
- dataType: 'json'
- }).done(function (response) {
- // update the revision
- nf.Client.setRevision(response.revision);
-
- // update the processor
- if (nf.CanvasUtils.isProcessor(selected)) {
- nf.Processor.set(response.processor);
- } else {
- nf.Label.set(response.label);
- }
- }).fail(function (xhr, status, error) {
- if (xhr.status === 400 || xhr.status === 404 || xhr.status === 409) {
- nf.Dialog.showOkDialog({
- dialogContent: nf.Common.escapeHtml(xhr.responseText),
- overlayBackground: true
- });
- }
- });
+ // ensure the color actually changed
+ if (color !== selectedData.component.style['background-color']) {
+ // update the style for the specified component
+ $.ajax({
+ type: 'PUT',
+ url: selectedData.component.uri,
+ data: {
+ 'version': revision.version,
+ 'clientId': revision.clientId,
+ 'style[background-color]': color
+ },
+ dataType: 'json'
+ }).done(function (response) {
+ // update the revision
+ nf.Client.setRevision(response.revision);
+
+ // update the processor
+ if (nf.CanvasUtils.isProcessor(selected)) {
+ nf.Processor.set(response.processor);
+ } else {
+ nf.Label.set(response.label);
+ }
+ }).fail(function (xhr, status, error) {
+ if (xhr.status === 400 || xhr.status === 404 || xhr.status === 409) {
+ nf.Dialog.showOkDialog({
+ dialogContent: nf.Common.escapeHtml(xhr.responseText),
+ overlayBackground: true
+ });
+ }
+ });
+ }
});
// close the dialog
@@ -255,12 +258,13 @@ nf.CanvasHeader = (function () {
var hex = $('#fill-color-value').val();
// only update the fill color when its a valid hex color string
+ // #[six hex characters|three hex characters] case insensitive
if (/(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(hex)) {
$('#fill-color').minicolors('value', hex);
}
};
- // initialize the fill color value
+ // apply fill color from field on blur and enter press
$('#fill-color-value').on('blur', updateColor).on('keyup', function(e) {
var code = e.keyCode ? e.keyCode : e.which;
if (code === $.ui.keyCode.ENTER) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4239797b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
index 1031c6c..e2ec53e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
@@ -141,19 +141,8 @@ nf.CanvasToolbar = (function () {
actions['group'].disable();
}
- // determine if the current selection is entirely processors or labels
- var selectedProcessors = selection.filter(function(d) {
- return nf.CanvasUtils.isProcessor(d3.select(this));
- });
- var selectedLabels = selection.filter(function(d) {
- return nf.CanvasUtils.isLabel(d3.select(this));
- });
-
- var allProcessors = selectedProcessors.size() === selection.size();
- var allLabels = selectedLabels.size() === selection.size();
-
- // if there are any colorable components enable the button
- if (allProcessors || allLabels) {
+ // if there are any colorable components enable the fill button
+ if (nf.CanvasUtils.isColorable(selection)) {
actions['fill'].enable();
} else {
actions['fill'].disable();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4239797b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
index c9211b2..796ffdf 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
@@ -475,6 +475,27 @@ nf.CanvasUtils = (function () {
},
/**
+ * Determines if the specified selection is colorable (in a single action).
+ *
+ * @param {selection} selection The selection
+ * @returns {boolean}
+ */
+ isColorable: function(selection) {
+ // determine if the current selection is entirely processors or labels
+ var selectedProcessors = selection.filter(function(d) {
+ return nf.CanvasUtils.isProcessor(d3.select(this));
+ });
+ var selectedLabels = selection.filter(function(d) {
+ return nf.CanvasUtils.isLabel(d3.select(this));
+ });
+
+ var allProcessors = selectedProcessors.size() === selection.size();
+ var allLabels = selectedLabels.size() === selection.size();
+
+ return allProcessors || allLabels;
+ },
+
+ /**
* Determines if the specified selection is a connection.
*
* @argument {selection} selection The selection
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4239797b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
index dfb8d7a..d9b63cd 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
@@ -179,12 +179,7 @@ nf.ContextMenu = (function () {
* @param {selection} selection The selection
*/
var isColorable = function (selection) {
- // ensure the correct number of components are selected
- if (selection.size() !== 1) {
- return false;
- }
-
- return nf.Common.isDFM() && (nf.CanvasUtils.isProcessor(selection) || nf.CanvasUtils.isLabel(selection));
+ return nf.Common.isDFM() && nf.CanvasUtils.isColorable(selection);
};
/**
[5/7] incubator-nifi git commit: NIFI-326: - Enabling the
Enable/Disable button whenever the selection is not empty. - On
Enable/Disable click,
the components that support the desired action are filtered. The action
(Enable/Disable) is then applied to th
Posted by mc...@apache.org.
NIFI-326:
- Enabling the Enable/Disable button whenever the selection is not empty.
- On Enable/Disable click, the components that support the desired action are filtered. The action (Enable/Disable) is then applied to the filtered selection.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/0047fa45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0047fa45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0047fa45
Branch: refs/heads/NIFI-353
Commit: 0047fa4502223fbaff858f885496dd00fe035353
Parents: 4239797
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Feb 17 12:34:01 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Feb 17 12:34:01 2015 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-actions.js | 15 ++++++++++++---
.../main/webapp/js/nf/canvas/nf-canvas-toolbar.js | 8 +-------
2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/0047fa45/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index f2dc9b3..0af6198 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -349,7 +349,12 @@ nf.Actions = (function () {
enable: function () {
var components = d3.selectAll('g.component.selected').filter(function (d) {
var selected = d3.select(this);
- return (nf.CanvasUtils.isProcessor(selected) || nf.CanvasUtils.isInputPort(selected) || nf.CanvasUtils.isOutputPort(selected)) && nf.CanvasUtils.supportsModification(selected);
+ var selectedData = selected.datum();
+
+ // processors and ports that support modification and are not currently stopped
+ return (nf.CanvasUtils.isProcessor(selected) || nf.CanvasUtils.isInputPort(selected) || nf.CanvasUtils.isOutputPort(selected)) &&
+ nf.CanvasUtils.supportsModification(selected) &&
+ selectedData.component.state !== 'STOPPED';
});
if (components.empty()) {
nf.Dialog.showOkDialog({
@@ -379,7 +384,12 @@ nf.Actions = (function () {
disable: function () {
var components = d3.selectAll('g.component.selected').filter(function (d) {
var selected = d3.select(this);
- return (nf.CanvasUtils.isProcessor(selected) || nf.CanvasUtils.isInputPort(selected) || nf.CanvasUtils.isOutputPort(selected)) && nf.CanvasUtils.supportsModification(selected);
+ var selectedData = selected.datum();
+
+ // processors and ports that support modification and are not currently disabled
+ return (nf.CanvasUtils.isProcessor(selected) || nf.CanvasUtils.isInputPort(selected) || nf.CanvasUtils.isOutputPort(selected)) &&
+ nf.CanvasUtils.supportsModification(selected) &&
+ selectedData.component.state !== 'DISABLED';
});
if (components.empty()) {
nf.Dialog.showOkDialog({
@@ -435,7 +445,6 @@ nf.Actions = (function () {
data['running'] = true;
}
- // update the resource
updateResource(d.component.uri, data).done(function (response) {
if (nf.CanvasUtils.isProcessor(selected)) {
nf.Processor.set(response.processor);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/0047fa45/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
index e2ec53e..b5702af 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
@@ -148,14 +148,8 @@ nf.CanvasToolbar = (function () {
actions['fill'].disable();
}
- // determine if there are any selected components that support enable/disable
- var supportsEnable = selection.filter(function(d) {
- var selected = d3.select(this);
- return nf.CanvasUtils.isProcessor(selected) || nf.CanvasUtils.isInputPort(selected) || nf.CanvasUtils.isOutputPort(selected);
- });
-
// ensure the entire selection supports enable/disable
- if (!supportsEnable.empty() && supportsEnable.size() === selection.size()) {
+ if (!selection.empty()) {
actions['enable'].enable();
actions['disable'].enable();
} else {
[6/7] incubator-nifi git commit: NIFI-353: - Creating an interface
for retrieving content. - Creating an interface for reading content bytes. -
Integrating these concepts into the exiting content viewer controller.
Posted by mc...@apache.org.
NIFI-353:
- Creating an interface for retrieving content.
- Creating an interface for reading content bytes.
- Integrating these concepts into the exiting content viewer controller.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b1b2eafe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b1b2eafe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b1b2eafe
Branch: refs/heads/NIFI-353
Commit: b1b2eafe807c8f2e6cccb1a51736db8badd5d03b
Parents: cd0a1bd
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Feb 17 22:47:26 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Feb 17 22:47:26 2015 -0500
----------------------------------------------------------------------
.../org/apache/nifi/web/ViewableContent.java | 39 +++++++++++++
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 5 ++
.../nifi-web/nifi-web-api/pom.xml | 5 ++
.../org/apache/nifi/web/NiFiServiceFacade.java | 1 -
.../nifi/web/StandardNiFiContentAccess.java | 38 +++++++++++++
.../nifi/web/StandardNiFiServiceFacade.java | 3 -
.../apache/nifi/web/StandardNiFiWebContext.java | 2 +-
.../apache/nifi/web/api/ProvenanceResource.java | 2 +-
.../nifi/web/controller/ControllerFacade.java | 2 +-
.../nifi/web/util/DownloadableContent.java | 47 ----------------
.../nifi-web/nifi-web-content-access/pom.xml | 35 ++++++++++++
.../java/org/apache/nifi/web/ContentAccess.java | 32 +++++++++++
.../apache/nifi/web/DownloadableContent.java | 47 ++++++++++++++++
.../nifi-web/nifi-web-content-viewer/pom.xml | 8 +++
.../nifi/web/ContentViewerController.java | 58 +++++++++++++++++++-
.../nifi-framework/nifi-web/pom.xml | 1 +
.../nifi-framework-bundle/pom.xml | 5 ++
17 files changed, 273 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-api/src/main/java/org/apache/nifi/web/ViewableContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/web/ViewableContent.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/ViewableContent.java
new file mode 100644
index 0000000..4558aa8
--- /dev/null
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/web/ViewableContent.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.web;
+
+import java.io.InputStream;
+
+/**
+ * Interface for obtaining content from the NiFi content repository.
+ */
+public interface ViewableContent {
+
+ /**
+ * The stream to the viewable content.
+ *
+ * @return
+ */
+ InputStream getContent();
+
+ /**
+ * The contents file name.
+ *
+ * @return
+ */
+ String getFileName();
+}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
index 0a2f8a4..f8097c6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -115,6 +115,11 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-web-content-access</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
<artifactId>nifi-custom-ui-utilities</artifactId>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index 64a61fc..900ecba 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -104,6 +104,11 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-web-content-access</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
<artifactId>nifi-client-dto</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
index ae6bf28..63d302c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
@@ -65,7 +65,6 @@ import org.apache.nifi.web.api.dto.status.ControllerStatusDTO;
import org.apache.nifi.web.api.dto.status.NodeStatusDTO;
import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO;
import org.apache.nifi.web.api.dto.status.StatusHistoryDTO;
-import org.apache.nifi.web.util.DownloadableContent;
/**
* Defines the NiFiServiceFacade interface.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiContentAccess.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiContentAccess.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiContentAccess.java
new file mode 100644
index 0000000..c95f671
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiContentAccess.java
@@ -0,0 +1,38 @@
+/*
+ * 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;
+
+import org.apache.nifi.controller.repository.claim.ContentDirection;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+/**
+ *
+ */
+public class StandardNiFiContentAccess implements ContentAccess {
+
+ private NiFiServiceFacade serviceFacade;
+
+ @Override
+ @PreAuthorize("hasRole('ROLE_DFM')")
+ public DownloadableContent getContent(final String ref) {
+ // if clustered, send request to cluster manager
+
+ // otherwise defer locally
+// return serviceFacade.getContent(eventId, uri, contentDirection);
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index c8683b0..14640d8 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -16,8 +16,6 @@
*/
package org.apache.nifi.web;
-import org.apache.nifi.web.OptimisticLockingManager;
-import org.apache.nifi.web.ConfigurationSnapshot;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
@@ -150,7 +148,6 @@ import org.apache.nifi.web.dao.ProcessorDAO;
import org.apache.nifi.web.dao.RemoteProcessGroupDAO;
import org.apache.nifi.web.dao.SnippetDAO;
import org.apache.nifi.web.dao.TemplateDAO;
-import org.apache.nifi.web.util.DownloadableContent;
import org.apache.nifi.web.util.SnippetUtils;
import org.apache.commons.collections4.CollectionUtils;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java
index c1b1993..d9fa9e3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java
@@ -89,7 +89,7 @@ public class StandardNiFiWebContext implements NiFiWebContext {
}
@Override
- @PreAuthorize("hasAnyRole('ROLE_DFM')")
+ @PreAuthorize("hasRole('ROLE_DFM')")
public void saveActions(final Collection<ProcessorConfigurationAction> processorActions) {
Objects.requireNonNull(processorActions, "Actions cannot be null.");
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java
index f0b38a1..5fef27f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java
@@ -74,7 +74,7 @@ import org.apache.nifi.web.api.request.ClientIdParameter;
import org.apache.nifi.web.api.request.DateTimeParameter;
import org.apache.nifi.web.api.request.IntegerParameter;
import org.apache.nifi.web.api.request.LongParameter;
-import org.apache.nifi.web.util.DownloadableContent;
+import org.apache.nifi.web.DownloadableContent;
import org.apache.commons.lang3.StringUtils;
import org.codehaus.enunciate.jaxrs.TypeHint;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
index b009581..117555a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
@@ -108,7 +108,7 @@ import org.apache.nifi.web.api.dto.search.SearchResultsDTO;
import org.apache.nifi.web.api.dto.status.ControllerStatusDTO;
import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO;
import org.apache.nifi.web.api.dto.status.StatusHistoryDTO;
-import org.apache.nifi.web.util.DownloadableContent;
+import org.apache.nifi.web.DownloadableContent;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.admin.service.UserService;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/DownloadableContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/DownloadableContent.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/DownloadableContent.java
deleted file mode 100644
index 9bb54f1..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/DownloadableContent.java
+++ /dev/null
@@ -1,47 +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.util;
-
-import java.io.InputStream;
-
-/**
- *
- */
-public final class DownloadableContent {
-
- private final String filename;
- private final String type;
- private final InputStream content;
-
- public DownloadableContent(String filename, String type, InputStream content) {
- this.filename = filename;
- this.type = type;
- this.content = content;
- }
-
- public String getFilename() {
- return filename;
- }
-
- public String getType() {
- return type;
- }
-
- public InputStream getContent() {
- return content;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
new file mode 100644
index 0000000..de2e21d
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -0,0 +1,35 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-web</artifactId>
+ <version>0.0.2-incubating-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-web-content-access</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-framework-core</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
new file mode 100644
index 0000000..2e0da70
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author unattributed
+ */
+public interface ContentAccess {
+
+ /**
+ * Gets the content for the specified claim.
+ *
+ * @param ref
+ * @return
+ */
+ DownloadableContent getContent(String ref);
+}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
new file mode 100644
index 0000000..1d4a7ce
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
@@ -0,0 +1,47 @@
+/*
+ * 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;
+
+import java.io.InputStream;
+
+/**
+ *
+ */
+public final class DownloadableContent {
+
+ private final String filename;
+ private final String type;
+ private final InputStream content;
+
+ public DownloadableContent(String filename, String type, InputStream content) {
+ this.filename = filename;
+ this.type = type;
+ this.content = content;
+ }
+
+ public String getFilename() {
+ return filename;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public InputStream getContent() {
+ return content;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index 47c6b08..b8edd61 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -24,6 +24,14 @@
<packaging>war</packaging>
<dependencies>
<dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-web-content-access</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java
index bace318..5855e6d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java
@@ -17,6 +17,7 @@
package org.apache.nifi.web;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Map;
import javax.servlet.RequestDispatcher;
@@ -27,6 +28,9 @@ import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -34,6 +38,19 @@ import javax.servlet.http.HttpServletResponse;
@WebServlet(name = "ContentViewerController", urlPatterns = {"/viewer"})
public class ContentViewerController extends HttpServlet {
+ private static final Logger logger = LoggerFactory.getLogger(ContentViewerController.class);
+
+ private static final String CONTENT_REQUEST_ATTRIBUTE = "org.apache.nifi.web.content";
+
+ // context for accessing the extension mapping
+// private ServletContext servletContext;
+//
+// @Override
+// public void init(final ServletConfig config) throws ServletException {
+// super.init(config);
+// servletContext = config.getServletContext();
+// }
+
/**
*
* @param request servlet request
@@ -43,19 +60,54 @@ public class ContentViewerController extends HttpServlet {
*/
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ logger.info(request.getServletPath());
+
+ // get the content
final ServletContext servletContext = request.getServletContext();
+ final ContentAccess contentAccess = (ContentAccess) servletContext.getAttribute("nifi-content-access");
+ final DownloadableContent downloadableContent = contentAccess.getContent(request.getParameter("ref"));
+
+ // ensure the content is found
+ if (downloadableContent == null) {
+
+ }
+
+ // detect the content type
+
+ // lookup a viewer for the content
final String contentViewerUri = servletContext.getInitParameter("application/xml");
- // header
+ // handle no viewer for content type
+ if (contentViewerUri == null) {
+
+ }
+
+ // generate the header
final RequestDispatcher header = request.getRequestDispatcher("/WEB-INF/jsp/header.jsp");
header.include(request, response);
- // content
+ // create a request attribute for accessing the content
+ request.setAttribute(CONTENT_REQUEST_ATTRIBUTE, new ViewableContent() {
+ @Override
+ public InputStream getContent() {
+ return downloadableContent.getContent();
+ }
+
+ @Override
+ public String getFileName() {
+ return downloadableContent.getFilename();
+ }
+ });
+
+ // generate the content
final ServletContext viewerContext = servletContext.getContext(contentViewerUri);
final RequestDispatcher content = viewerContext.getRequestDispatcher("/view-content");
content.include(request, response);
- // footer
+ // remove the request attribute
+ request.removeAttribute(CONTENT_REQUEST_ATTRIBUTE);
+
+ // generate footer
final RequestDispatcher footer = request.getRequestDispatcher("/WEB-INF/jsp/footer.jsp");
footer.include(request, response);
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
index 18b365a..5f3c7ce 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
@@ -32,6 +32,7 @@
<module>nifi-web-content-viewer</module>
<module>nifi-web-ui</module>
<module>nifi-jetty</module>
+ <module>nifi-web-content-access</module>
</modules>
<dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b1b2eafe/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 413bfca..9dcffb8 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -66,6 +66,11 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-web-content-access</artifactId>
+ <version>0.0.2-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
<artifactId>nifi-security</artifactId>
<version>0.0.2-incubating-SNAPSHOT</version>
</dependency>
[2/7] incubator-nifi git commit: Correcting the capability
description which states that the property is ignored when destination is
flowfile attribute instead of content. This closes NIFI-356.
Posted by mc...@apache.org.
Correcting the capability description which states that the property is ignored when destination is flowfile attribute instead of content. This closes NIFI-356.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/24be4a1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/24be4a1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/24be4a1d
Branch: refs/heads/NIFI-353
Commit: 24be4a1dfdd1dd513e39915c5db8939d4806cdd8
Parents: b8ade5b
Author: Aldrin Piri <al...@gmail.com>
Authored: Tue Feb 17 00:20:23 2015 -0500
Committer: Aldrin Piri <al...@gmail.com>
Committed: Tue Feb 17 00:20:23 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/processors/standard/EvaluateXPath.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/24be4a1d/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
index 4827ee3..f4d2d34 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
@@ -84,7 +84,7 @@ import org.xml.sax.InputSource;
@CapabilityDescription("Evaluates one or more XPaths against the content of a FlowFile. The results of those XPaths are assigned to "
+ "FlowFile Attributes or are written to the content of the FlowFile itself, depending on configuration of the "
+ "Processor. XPaths are entered by adding user-defined properties; the name of the property maps to the Attribute "
- + "Name into which the result will be placed (if the Destination is flowfile-content; otherwise, the property name is ignored). "
+ + "Name into which the result will be placed (if the Destination is flowfile-attribute; otherwise, the property name is ignored). "
+ "The value of the property must be a valid XPath expression. If the XPath evaluates to more than one node and the Return Type is "
+ "set to 'nodeset' (either directly, or via 'auto-detect' with a Destination of "
+ "'flowfile-content', the FlowFile will be unmodified and will be routed to failure. If the XPath does not "
[7/7] incubator-nifi git commit: Merge branch 'develop' into NIFI-353
Posted by mc...@apache.org.
Merge branch 'develop' into NIFI-353
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/78bab591
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/78bab591
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/78bab591
Branch: refs/heads/NIFI-353
Commit: 78bab591d1c717077c7ee975c5ab4cf17c02d139
Parents: b1b2eaf 0047fa4
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Feb 17 22:48:33 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Feb 17 22:48:33 2015 -0500
----------------------------------------------------------------------
nifi/nifi-api/pom.xml | 1 -
nifi/nifi-assembly/pom.xml | 1 -
.../nifi-data-provenance-utils/pom.xml | 1 -
.../nifi-expression-language/pom.xml | 1 -
.../nifi-commons/nifi-flowfile-packager/pom.xml | 1 -
nifi/nifi-commons/nifi-logging-utils/pom.xml | 1 -
.../nifi-processor-utilities/pom.xml | 1 -
nifi/nifi-commons/nifi-properties/pom.xml | 1 -
nifi/nifi-commons/nifi-security-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-socket-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-web-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 1 -
nifi/nifi-mock/pom.xml | 1 -
.../nifi-framework-nar/pom.xml | 1 -
.../nifi-framework/nifi-administration/pom.xml | 1 -
.../nifi-cluster-protocol/pom.xml | 1 -
.../nifi-file-authorization-provider/pom.xml | 1 -
.../nifi-framework-core-api/pom.xml | 1 -
.../nifi-framework/nifi-security/pom.xml | 1 -
.../nifi-framework/nifi-site-to-site/pom.xml | 1 -
.../nifi-framework/nifi-user-actions/pom.xml | 1 -
.../src/main/webapp/js/nf/canvas/nf-actions.js | 31 +++++-----
.../webapp/js/nf/canvas/nf-canvas-header.js | 62 +++++++++++---------
.../webapp/js/nf/canvas/nf-canvas-toolbar.js | 23 +-------
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 21 +++++++
.../main/webapp/js/nf/canvas/nf-context-menu.js | 7 +--
.../nifi-framework/pom.xml | 1 -
.../nifi-framework-bundle/pom.xml | 1 -
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 1 -
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 1 -
.../nifi-hadoop-libraries-nar/pom.xml | 1 -
.../nifi-hadoop-libraries-bundle/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 -
.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 2 +-
.../nifi-provenance-repository-nar/pom.xml | 1 -
.../nifi-provenance-repository-bundle/pom.xml | 1 -
.../nifi-standard-nar/pom.xml | 1 -
.../nifi/processors/standard/EvaluateXPath.java | 2 +-
.../nifi-standard-bundle/pom.xml | 3 +-
.../nifi-distributed-cache-services-nar/pom.xml | 1 -
.../pom.xml | 1 -
.../nifi-load-distribution-service-api/pom.xml | 1 -
.../nifi-ssl-context-nar/pom.xml | 1 -
.../nifi-ssl-context-bundle/pom.xml | 1 -
.../nifi-standard-services-api-nar/pom.xml | 1 -
.../nifi-standard-services/pom.xml | 1 -
.../nifi-update-attribute-nar/pom.xml | 2 -
.../nifi-update-attribute-bundle/pom.xml | 3 -
nifi/nifi-nar-bundles/pom.xml | 3 -
50 files changed, 78 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/78bab591/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/78bab591/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/78bab591/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
----------------------------------------------------------------------