Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

This commit is contained in:
Mark Payne 2015-01-23 11:13:31 -05:00
parent a0b70fa9c6 43e646e68e
commit 8b3f3c75cd
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nifi-nar-maven-plugin/pom.xml
View File

@ -29,8 +29,8 @@
<description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description> <description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
<url>http://nifi.incubator.apache.org/maven-site/</url> <url>http://nifi.incubator.apache.org/maven-site/</url>
<organization> <organization>
<name>Apache NiFi (incubating) Project</name> <name>Apache NiFi (incubating)</name>
<url>http://nifi.incubating.apache.org/</url> <url>http://nifi.incubator.apache.org/</url>
</organization> </organization>
<licenses> <licenses>
<license> <license>
@ -208,6 +208,7 @@
<excludes> <excludes>
<exclude>nb-configuration.xml</exclude> <exclude>nb-configuration.xml</exclude>
<exclude>nbactions.xml</exclude> <exclude>nbactions.xml</exclude>
<exclude>DEPENDENCIES</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>

12
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
View File

@ -1175,13 +1175,19 @@ public class ControllerFacade implements ControllerServiceProvider {
for (final Map.Entry<PropertyDescriptor, String> entry : procNode.getProperties().entrySet()) { for (final Map.Entry<PropertyDescriptor, String> entry : procNode.getProperties().entrySet()) {
final PropertyDescriptor descriptor = entry.getKey(); 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(); final String value = entry.getValue();
if (StringUtils.containsIgnoreCase(value, searchStr)) { if (StringUtils.containsIgnoreCase(value, searchStr)) {
matches.add("Property: " + descriptor.getName() + " - " + value); matches.add("Property: " + descriptor.getName() + " - " + value);
} }
addIfAppropriate(searchStr, descriptor.getName(), "Property", matches);
addIfAppropriate(searchStr, descriptor.getDescription(), "Property", matches);
} }
// consider searching the processor directly // consider searching the processor directly

5
nifi/pom.xml
View File

@ -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> <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> <url>http://nifi.incubator.apache.org/maven-site/</url>
<organization> <organization>
<name>Apache NiFi (incubating) Project</name> <name>Apache NiFi (incubating)</name>
<url>http://nifi.incubating.apache.org/</url> <url>http://nifi.incubator.apache.org/</url>
</organization> </organization>
<licenses> <licenses>
<license> <license>
@ -967,6 +967,7 @@
<exclude>src/test/resources/</exclude> <!-- Test datasets --> <exclude>src/test/resources/</exclude> <!-- Test datasets -->
<exclude>nb-configuration.xml</exclude> <exclude>nb-configuration.xml</exclude>
<exclude>nbactions.xml</exclude> <exclude>nbactions.xml</exclude>
<exclude>DEPENDENCIES</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>