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/01/23 15:32:09 UTC
[1/4] incubator-nifi git commit: NIFI-294: - Ensuring the sensitive
flag is always respected.
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-250 e604cafe7 -> cb4c654c7
NIFI-294:
- Ensuring the sensitive flag is always respected.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2f4727db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2f4727db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2f4727db
Branch: refs/heads/NIFI-250
Commit: 2f4727db5df97fc9bced2ec4c08800ab63abb8c3
Parents: cff8b0d
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Jan 22 15:41:26 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Jan 22 15:41:26 2015 -0500
----------------------------------------------------------------------
.../apache/nifi/web/controller/ControllerFacade.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2f4727db/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 dbc4b3c..2a68016 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
@@ -1175,13 +1175,19 @@ public class ControllerFacade implements ControllerServiceProvider {
for (final Map.Entry<PropertyDescriptor, String> entry : procNode.getProperties().entrySet()) {
final PropertyDescriptor descriptor = entry.getKey();
+
+ addIfAppropriate(searchStr, descriptor.getName(), "Property", matches);
+ addIfAppropriate(searchStr, descriptor.getDescription(), "Property", matches);
+
+ // never include sensitive properties values in search results
+ if (descriptor.isSensitive()) {
+ continue;
+ }
+
final String value = entry.getValue();
if (StringUtils.containsIgnoreCase(value, searchStr)) {
matches.add("Property: " + descriptor.getName() + " - " + value);
}
-
- addIfAppropriate(searchStr, descriptor.getName(), "Property", matches);
- addIfAppropriate(searchStr, descriptor.getDescription(), "Property", matches);
}
// consider searching the processor directly
[4/4] incubator-nifi git commit: Merge branch 'develop' into NIFI-250
Posted by mc...@apache.org.
Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cb4c654c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cb4c654c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cb4c654c
Branch: refs/heads/NIFI-250
Commit: cb4c654c7f244ee7222fb444ccca096b8f56e164
Parents: e604caf 43e646e
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Jan 23 09:30:27 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Jan 23 09:30:27 2015 -0500
----------------------------------------------------------------------
nifi-nar-maven-plugin/pom.xml | 5 +++--
.../apache/nifi/web/controller/ControllerFacade.java | 12 +++++++++---
nifi/pom.xml | 5 +++--
3 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cb4c654c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
----------------------------------------------------------------------
[2/4] incubator-nifi git commit: NIFI 270 fixed organization and
excluded DEPENDENCIES from rat check
Posted by mc...@apache.org.
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/NIFI-250
Commit: f85b8714a10dd314c07de8f2150945c0b6191e88
Parents: 2f4727d
Author: joewitt <jo...@apache.org>
Authored: Fri Jan 23 01:25:59 2015 -0500
Committer: joewitt <jo...@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 @@
<description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
<url>http://nifi.incubator.apache.org/maven-site/</url>
<organization>
- <name>Apache NiFi (incubating) Project</name>
- <url>http://nifi.incubating.apache.org/</url>
+ <name>Apache NiFi (incubating)</name>
+ <url>http://nifi.incubator.apache.org/</url>
</organization>
<licenses>
<license>
@@ -208,6 +208,7 @@
<excludes>
<exclude>nb-configuration.xml</exclude>
<exclude>nbactions.xml</exclude>
+ <exclude>DEPENDENCIES</exclude>
</excludes>
</configuration>
</plugin>
[3/4] incubator-nifi git commit: NIFI 270 fixed organization and
excluded DEPENDENCIES from rat check
Posted by mc...@apache.org.
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/43e646e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/43e646e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/43e646e6
Branch: refs/heads/NIFI-250
Commit: 43e646e68e4871325124f9978f24733f717036c3
Parents: f85b871
Author: joewitt <jo...@apache.org>
Authored: Fri Jan 23 01:26:58 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Fri Jan 23 01:26:58 2015 -0500
----------------------------------------------------------------------
nifi/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/43e646e6/nifi/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/pom.xml b/nifi/pom.xml
index 4237cc2..9dac476 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -28,8 +28,8 @@
<description>Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator.</description>
<url>http://nifi.incubator.apache.org/maven-site/</url>
<organization>
- <name>Apache NiFi (incubating) Project</name>
- <url>http://nifi.incubating.apache.org/</url>
+ <name>Apache NiFi (incubating)</name>
+ <url>http://nifi.incubator.apache.org/</url>
</organization>
<licenses>
<license>
@@ -966,6 +966,7 @@
<exclude>src/test/resources/</exclude> <!-- Test datasets -->
<exclude>nb-configuration.xml</exclude>
<exclude>nbactions.xml</exclude>
+ <exclude>DEPENDENCIES</exclude>
</excludes>
</configuration>
</plugin>