nifi git commit: NIFI-2160 fixed service startup ordering

2016-07-07 Thread ozhurakousky
Repository: nifi
Updated Branches:
  refs/heads/0.x 35a5667f3 -> 8dbb5d8aa


NIFI-2160 fixed service startup ordering

fixed imports


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8dbb5d8a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8dbb5d8a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8dbb5d8a

Branch: refs/heads/0.x
Commit: 8dbb5d8aab1509bd27bc3ec31f28f9cfb19e6197
Parents: 35a5667
Author: Oleg Zhurakousky 
Authored: Tue Jul 5 17:47:51 2016 -0400
Committer: Oleg Zhurakousky 
Committed: Thu Jul 7 22:39:35 2016 -0400

--
 .../service/StandardControllerServiceNode.java  |  4 +-
 .../StandardControllerServiceProvider.java  | 27 
 .../TestStandardControllerServiceProvider.java  | 66 +++-
 3 files changed, 67 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/8dbb5d8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
index 2deb4ed..7a416af 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
@@ -115,7 +115,7 @@ public class StandardControllerServiceNode extends 
AbstractConfiguredComponent i
 
 @Override
 public List getRequiredControllerServices() {
-List requiredServices = new ArrayList<>();
+Set requiredServices = new HashSet<>();
 for (Entry pEntry : 
this.getProperties().entrySet()) {
 PropertyDescriptor descriptor = pEntry.getKey();
 if (descriptor.getControllerServiceDefinition() != null && 
descriptor.isRequired()) {
@@ -124,7 +124,7 @@ public class StandardControllerServiceNode extends 
AbstractConfiguredComponent i
 requiredServices.addAll(rNode.getRequiredControllerServices());
 }
 }
-return requiredServices;
+return new ArrayList<>(requiredServices);
 }
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/8dbb5d8a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
index 4b18751..58add5d 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
@@ -25,7 +25,6 @@ import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -313,17 +312,11 @@ public class StandardControllerServiceProvider implements 
ControllerServiceProvi
 }
 
 if (shouldStart) {
-List services = new 
ArrayList<>(serviceNodes);
-Collections.sort(services, new Comparator() 
{
-@Override
-public int compare(ControllerServiceNode s1, 
ControllerServiceNode s2) {
-return s2.getRequiredControllerServices().contains(s1) ? 
-1 : 1;
-}
-});
-
-for (ControllerServiceNode controllerServiceNode : services) {
+for (ControllerServiceNode controllerServiceNode : serviceNodes) {
 try {
-this.enableControllerService(controllerServiceNode);
+if (!controllerServiceNode.isActive()) {
+
this.enableControllerServiceDependenciesFirst(controllerServiceNode);
+}
  

nifi git commit: NIFI-2160 fixed service startup ordering (MASTER)

2016-07-07 Thread ozhurakousky
Repository: nifi
Updated Branches:
  refs/heads/master 6edfa634d -> 2ed1ab763


NIFI-2160 fixed service startup ordering (MASTER)

This closes #606


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2ed1ab76
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2ed1ab76
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2ed1ab76

Branch: refs/heads/master
Commit: 2ed1ab7630a91a0f966954f9821048693fe65598
Parents: 6edfa63
Author: Oleg Zhurakousky 
Authored: Tue Jul 5 20:08:34 2016 -0400
Committer: Oleg Zhurakousky 
Committed: Thu Jul 7 22:37:20 2016 -0400

--
 .../service/StandardControllerServiceNode.java  |  6 +-
 .../StandardControllerServiceProvider.java  | 28 ---
 .../TestStandardControllerServiceProvider.java  | 85 +++-
 3 files changed, 82 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/2ed1ab76/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
index 05dbc2d..7856dcd 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
@@ -22,8 +22,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -170,7 +170,7 @@ public class StandardControllerServiceNode extends 
AbstractConfiguredComponent i
 
 @Override
 public List getRequiredControllerServices() {
-List requiredServices = new ArrayList<>();
+Set requiredServices = new HashSet<>();
 for (Entry pEntry : 
this.getProperties().entrySet()) {
 PropertyDescriptor descriptor = pEntry.getKey();
 if (descriptor.getControllerServiceDefinition() != null && 
descriptor.isRequired()) {
@@ -179,7 +179,7 @@ public class StandardControllerServiceNode extends 
AbstractConfiguredComponent i
 requiredServices.addAll(rNode.getRequiredControllerServices());
 }
 }
-return requiredServices;
+return new ArrayList<>(requiredServices);
 }
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/2ed1ab76/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
index 3861355..22ee5cf 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
@@ -25,7 +25,6 @@ import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -55,7 +54,6 @@ import org.apache.nifi.nar.ExtensionManager;
 import org.apache.nifi.nar.NarCloseable;
 import org.apache.nifi.processor.SimpleProcessLogger;
 import org.apache.nifi.processor.StandardValidationContextFactory;
-
 import org.apache.nifi.reporting.BulletinRepository;
 import org.apache.nifi.reporting.Severity;
 import org.apache.nifi.util.ObjectHolder;
@@ -385,17 +383,11 @@ public class StandardControllerServiceProvider implements 
ControllerServiceProvi
 }
 
 if (shouldStart) {
-List services = new 
ArrayList<>(serviceNodes);
-C

svn commit: r1751842 - /nifi/site/trunk/people.html

2016-07-07 Thread joewitt
Author: joewitt
Date: Thu Jul  7 23:07:15 2016
New Revision: 1751842

URL: http://svn.apache.org/viewvc?rev=1751842&view=rev
Log:
pierre in committers and andy in pmc

Modified:
nifi/site/trunk/people.html

Modified: nifi/site/trunk/people.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/people.html?rev=1751842&r1=1751841&r2=1751842&view=diff
==
--- nifi/site/trunk/people.html (original)
+++ nifi/site/trunk/people.html Thu Jul  7 23:07:15 2016
@@ -196,6 +196,11 @@
Joe Percivall

 
+   
+   alopresto
+   Andy LoPresto
+   
+
 
 
 
@@ -246,9 +251,9 @@

 
 
-   alopresto
-   Andy LoPresto
-   
+pvillard31
+Pierre Villard
+
 
 
 




nifi-site git commit: added myself to committers

2016-07-07 Thread pvillard
Repository: nifi-site
Updated Branches:
  refs/heads/master 39b4e93b7 -> cfe64bd56


added myself to committers


Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/cfe64bd5
Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/cfe64bd5
Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/cfe64bd5

Branch: refs/heads/master
Commit: cfe64bd5606b2abc5642d1c784cfbbb1f7f38245
Parents: 39b4e93
Author: Pierre Villard 
Authored: Thu Jul 7 23:25:16 2016 +0200
Committer: Pierre Villard 
Committed: Thu Jul 7 23:25:16 2016 +0200

--
 src/pages/html/people.hbs | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/cfe64bd5/src/pages/html/people.hbs
--
diff --git a/src/pages/html/people.hbs b/src/pages/html/people.hbs
index 1f74633..ff0d1b5 100644
--- a/src/pages/html/people.hbs
+++ b/src/pages/html/people.hbs
@@ -153,6 +153,11 @@ title: Apache NiFi Team
Oleg Zhurakousky

 
+
+pvillard31
+Pierre Villard
+
+
 
 
 



nifi-site git commit: Moved my name from Committer section to PMC section.

2016-07-07 Thread alopresto
Repository: nifi-site
Updated Branches:
  refs/heads/master 0c0a56226 -> 39b4e93b7


Moved my name from Committer section to PMC section.


Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/39b4e93b
Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/39b4e93b
Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/39b4e93b

Branch: refs/heads/master
Commit: 39b4e93b72af2ca1c5f2fcb7e8fcc7896705d874
Parents: 0c0a562
Author: Andy LoPresto 
Authored: Thu Jul 7 14:13:02 2016 -0700
Committer: Andy LoPresto 
Committed: Thu Jul 7 14:13:02 2016 -0700

--
 src/pages/html/people.hbs | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/39b4e93b/src/pages/html/people.hbs
--
diff --git a/src/pages/html/people.hbs b/src/pages/html/people.hbs
index d9e4b83..1f74633 100644
--- a/src/pages/html/people.hbs
+++ b/src/pages/html/people.hbs
@@ -99,6 +99,11 @@ title: Apache NiFi Team
Joe Percivall

 
+   
+   alopresto
+   Andy LoPresto
+   
+
 
 
 
@@ -148,11 +153,6 @@ title: Apache NiFi Team
Oleg Zhurakousky

 
-
-   alopresto
-   Andy LoPresto
-   
-
 
 
 



nifi git commit: NIFI-1998: Update Cassandra processor docs to include 3.0.x clusters

2016-07-07 Thread jpercivall
Repository: nifi
Updated Branches:
  refs/heads/0.x 149c6facc -> 35a5667f3


NIFI-1998: Update Cassandra processor docs to include 3.0.x clusters

This closes #616

Signed-off-by: jpercivall 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/35a5667f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/35a5667f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/35a5667f

Branch: refs/heads/0.x
Commit: 35a5667f3283e8a0ae04d86c50712770f676fccd
Parents: 149c6fa
Author: Matt Burgess 
Authored: Thu Jul 7 12:03:53 2016 -0400
Committer: jpercivall 
Committed: Thu Jul 7 15:44:56 2016 -0400

--
 .../java/org/apache/nifi/processors/cassandra/PutCassandraQL.java  | 2 +-
 .../java/org/apache/nifi/processors/cassandra/QueryCassandra.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/35a5667f/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
--
diff --git 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
index 24a124e..fb102fc 100644
--- 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
+++ 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
@@ -68,7 +68,7 @@ import java.util.regex.Pattern;
 @Tags({"cassandra", "cql", "put", "insert", "update", "set"})
 @EventDriven
 @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
-@CapabilityDescription("Execute provided Cassandra Query Language (CQL) 
statement on a Cassandra 1.x or 2.x cluster. "
+@CapabilityDescription("Execute provided Cassandra Query Language (CQL) 
statement on a Cassandra 1.x, 2.x, or 3.0.x cluster. "
 + "The content of an incoming FlowFile is expected to be the CQL 
command to execute. The CQL command may use "
 + "the ? to escape parameters. In this case, the parameters to use 
must exist as FlowFile attributes with the "
 + "naming convention cql.args.N.type and cql.args.N.value, where N is 
a positive integer. The cql.args.N.type "

http://git-wip-us.apache.org/repos/asf/nifi/blob/35a5667f/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
--
diff --git 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
index 7b78ea6..d5b23aa 100644
--- 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
+++ 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
@@ -75,7 +75,7 @@ import java.util.concurrent.TimeoutException;
 @Tags({"cassandra", "cql", "select"})
 @EventDriven
 @InputRequirement(InputRequirement.Requirement.INPUT_ALLOWED)
-@CapabilityDescription("Execute provided Cassandra Query Language (CQL) select 
query on a Cassandra 1.x or 2.x cluster. Query result "
+@CapabilityDescription("Execute provided Cassandra Query Language (CQL) select 
query on a Cassandra 1.x, 2.x, or 3.0.x cluster. Query result "
 + "may be converted to Avro or JSON format. Streaming is used so 
arbitrarily large result sets are supported. This processor can be "
 + "scheduled to run on a timer, or cron expression, using the standard 
scheduling methods, or it can be triggered by an incoming FlowFile. "
 + "If it is triggered by an incoming FlowFile, then attributes of that 
FlowFile will be available when evaluating the "



nifi git commit: NIFI-1998: Update Cassandra processor docs to include 3.0.x clusters

2016-07-07 Thread jpercivall
Repository: nifi
Updated Branches:
  refs/heads/master 8f1202899 -> 6edfa634d


NIFI-1998: Update Cassandra processor docs to include 3.0.x clusters

This closes #616

Signed-off-by: jpercivall 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6edfa634
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6edfa634
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6edfa634

Branch: refs/heads/master
Commit: 6edfa634d4664f95a49217a88d764df37232a226
Parents: 8f12028
Author: Matt Burgess 
Authored: Thu Jul 7 12:03:53 2016 -0400
Committer: jpercivall 
Committed: Thu Jul 7 15:31:38 2016 -0400

--
 .../java/org/apache/nifi/processors/cassandra/PutCassandraQL.java  | 2 +-
 .../java/org/apache/nifi/processors/cassandra/QueryCassandra.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/6edfa634/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
--
diff --git 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
index 1e0c973..2f680a6 100644
--- 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
+++ 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
@@ -69,7 +69,7 @@ import java.util.regex.Pattern;
 @Tags({"cassandra", "cql", "put", "insert", "update", "set"})
 @EventDriven
 @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
-@CapabilityDescription("Execute provided Cassandra Query Language (CQL) 
statement on a Cassandra 1.x or 2.x cluster. "
+@CapabilityDescription("Execute provided Cassandra Query Language (CQL) 
statement on a Cassandra 1.x, 2.x, or 3.0.x cluster. "
 + "The content of an incoming FlowFile is expected to be the CQL 
command to execute. The CQL command may use "
 + "the ? to escape parameters. In this case, the parameters to use 
must exist as FlowFile attributes with the "
 + "naming convention cql.args.N.type and cql.args.N.value, where N is 
a positive integer. The cql.args.N.type "

http://git-wip-us.apache.org/repos/asf/nifi/blob/6edfa634/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
--
diff --git 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
index bf0890d..3182958 100644
--- 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
+++ 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
@@ -75,7 +75,7 @@ import java.util.concurrent.TimeoutException;
 @Tags({"cassandra", "cql", "select"})
 @EventDriven
 @InputRequirement(InputRequirement.Requirement.INPUT_ALLOWED)
-@CapabilityDescription("Execute provided Cassandra Query Language (CQL) select 
query on a Cassandra 1.x or 2.x cluster. Query result "
+@CapabilityDescription("Execute provided Cassandra Query Language (CQL) select 
query on a Cassandra 1.x, 2.x, or 3.0.x cluster. Query result "
 + "may be converted to Avro or JSON format. Streaming is used so 
arbitrarily large result sets are supported. This processor can be "
 + "scheduled to run on a timer, or cron expression, using the standard 
scheduling methods, or it can be triggered by an incoming FlowFile. "
 + "If it is triggered by an incoming FlowFile, then attributes of that 
FlowFile will be available when evaluating the "



[jira] [Commented] (MINIFI-54) ConfigSchema duplicate validation only works when processors is not null

2016-07-07 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/MINIFI-54?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15366568#comment-15366568
 ] 

ASF GitHub Bot commented on MINIFI-54:
--

GitHub user brosander opened a pull request:

https://github.com/apache/nifi-minifi/pull/30

MINIFI-54 - Fixing duplicate validation for connections, remote proce…

…ssing groups

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/brosander/nifi-minifi MINIFI-54

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/nifi-minifi/pull/30.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #30


commit 5d7c016f8689faac5ab52e54c938556e3f4cbef1
Author: Bryan Rosander 
Date:   2016-07-07T18:35:28Z

MINIFI-54 - Fixing duplicate validation for connections, remote processing 
groups




> ConfigSchema duplicate validation only works when processors is not null
> 
>
> Key: MINIFI-54
> URL: https://issues.apache.org/jira/browse/MINIFI-54
> Project: Apache NiFi MiNiFi
>  Issue Type: Bug
>Reporter: Bryan Rosander
>
> ConfigSchema has logic to detect duplicate processor, connection, and remote 
> processing group names.  This is to help MiNiFi ensure it can generate a 
> valid flow.
> Unfortunately, the check is short circuited if processors are null, 
> regardless of which duplicates it is checking for, causing for possibly 
> missing validation errors.
> https://github.com/apache/nifi-minifi/blob/2d1e43e73b90df55abc71845160b6422d7a6f03f/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ConfigSchema.java#L122
> Should be changed to a null check on the names parameter



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (MINIFI-54) ConfigSchema duplicate validation only works when processors is not null

2016-07-07 Thread Bryan Rosander (JIRA)
Bryan Rosander created MINIFI-54:


 Summary: ConfigSchema duplicate validation only works when 
processors is not null
 Key: MINIFI-54
 URL: https://issues.apache.org/jira/browse/MINIFI-54
 Project: Apache NiFi MiNiFi
  Issue Type: Bug
Reporter: Bryan Rosander


ConfigSchema has logic to detect duplicate processor, connection, and remote 
processing group names.  This is to help MiNiFi ensure it can generate a valid 
flow.

Unfortunately, the check is short circuited if processors are null, regardless 
of which duplicates it is checking for, causing for possibly missing validation 
errors.

https://github.com/apache/nifi-minifi/blob/2d1e43e73b90df55abc71845160b6422d7a6f03f/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ConfigSchema.java#L122

Should be changed to a null check on the names parameter



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


nifi git commit: NIFI-2158 : return 'true' for isXYZEnabled() for ComponentLog if either the slf4j logger has that level enabled or the bulletin repository does, instead of only checking if slf4j logg

2016-07-07 Thread mattyb149
Repository: nifi
Updated Branches:
  refs/heads/master b7a584122 -> 8f1202899


NIFI-2158 : return 'true' for isXYZEnabled() for ComponentLog if either the 
slf4j logger has that level enabled or the bulletin repository does, instead of 
only checking if slf4j logger has it enabled

This closes #598


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8f120289
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8f120289
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8f120289

Branch: refs/heads/master
Commit: 8f1202899b2be8ebae58746a9be564225a3514ce
Parents: b7a5841
Author: Mark Payne 
Authored: Wed Jun 29 16:36:55 2016 -0400
Committer: Matt Burgess 
Committed: Thu Jul 7 13:33:34 2016 -0400

--
 .../org/apache/nifi/logging/LogRepository.java  |  8 +++
 .../repository/StandardLogRepository.java   | 25 
 .../nifi/processor/SimpleProcessLogger.java | 18 +++---
 3 files changed, 42 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/8f120289/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
index 54bb672..06ddab4 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
@@ -76,4 +76,12 @@ public interface LogRepository {
  * @return the current logger for the component
  */
 ComponentLog getLogger();
+
+boolean isDebugEnabled();
+
+boolean isInfoEnabled();
+
+boolean isWarnEnabled();
+
+boolean isErrorEnabled();
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/8f120289/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
index f6c55b6..8baf04a 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
@@ -183,4 +183,29 @@ public class StandardLogRepository implements 
LogRepository {
 public ComponentLog getLogger() {
 return componentLogger;
 }
+
+private boolean hasObserver(final LogLevel logLevel) {
+final Collection logLevelObservers = 
observers.get(logLevel);
+return (logLevelObservers != null && !logLevelObservers.isEmpty());
+}
+
+@Override
+public boolean isDebugEnabled() {
+return hasObserver(LogLevel.DEBUG);
+}
+
+@Override
+public boolean isInfoEnabled() {
+return hasObserver(LogLevel.INFO);
+}
+
+@Override
+public boolean isWarnEnabled() {
+return hasObserver(LogLevel.WARN);
+}
+
+@Override
+public boolean isErrorEnabled() {
+return hasObserver(LogLevel.ERROR);
+}
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/8f120289/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
index 4f31722..cc17abc 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
@@ -168,28 +168,28 @@ public class 

[jira] [Created] (MINIFI-53) Add search bar in processors

2016-07-07 Thread Luis Lahoz (JIRA)
Luis Lahoz created MINIFI-53:


 Summary: Add search bar in processors 
 Key: MINIFI-53
 URL: https://issues.apache.org/jira/browse/MINIFI-53
 Project: Apache NiFi MiNiFi
  Issue Type: Improvement
  Components: Core Framework
Reporter: Luis Lahoz
Priority: Minor


It will be nice to have a search bar in the Route on Attribute processor, we 
have tons of properties there and is hard to find a specific one. Update 
Attribute have the search bar in the advance tab and is very useful. 

I believe this change require some framework changes, since all the processor 
share the same configuration window, but it will be nice to have.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Resolved] (MINIFI-53) Add search bar in processors

2016-07-07 Thread Luis Lahoz (JIRA)

 [ 
https://issues.apache.org/jira/browse/MINIFI-53?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Luis Lahoz resolved MINIFI-53.
--
Resolution: Invalid

Wrong project. This ticket can be closed.

> Add search bar in processors 
> -
>
> Key: MINIFI-53
> URL: https://issues.apache.org/jira/browse/MINIFI-53
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>  Components: Core Framework
>Reporter: Luis Lahoz
>Priority: Minor
>
> It will be nice to have a search bar in the Route on Attribute processor, we 
> have tons of properties there and is hard to find a specific one. Update 
> Attribute have the search bar in the advance tab and is very useful. 
> I believe this change require some framework changes, since all the processor 
> share the same configuration window, but it will be nice to have.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Closed] (MINIFI-53) Add search bar in processors

2016-07-07 Thread Luis Lahoz (JIRA)

 [ 
https://issues.apache.org/jira/browse/MINIFI-53?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Luis Lahoz closed MINIFI-53.


> Add search bar in processors 
> -
>
> Key: MINIFI-53
> URL: https://issues.apache.org/jira/browse/MINIFI-53
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>  Components: Core Framework
>Reporter: Luis Lahoz
>Priority: Minor
>
> It will be nice to have a search bar in the Route on Attribute processor, we 
> have tons of properties there and is hard to find a specific one. Update 
> Attribute have the search bar in the advance tab and is very useful. 
> I believe this change require some framework changes, since all the processor 
> share the same configuration window, but it will be nice to have.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (MINIFI-52) Make use of Yetus Audience Annotations

2016-07-07 Thread Aldrin Piri (JIRA)
Aldrin Piri created MINIFI-52:
-

 Summary: Make use of Yetus Audience Annotations
 Key: MINIFI-52
 URL: https://issues.apache.org/jira/browse/MINIFI-52
 Project: Apache NiFi MiNiFi
  Issue Type: Task
  Components: Core Framework
Reporter: Aldrin Piri


To communicate a clear representation of which parts of the project are open 
for extension, evolving, and the like we can make use of the Yetus audience 
annotations on our codebase.  Doing so will help to establish and clearly 
communicate which items are extensible and what parts of the framework may be 
evolving or changing. 



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


nifi git commit: [NIFI-2018] Update icons used in Context Menu [NIFI-2108] update favicon This closes #607

2016-07-07 Thread mcgilman
Repository: nifi
Updated Branches:
  refs/heads/master 4f2d17a8d -> b7a584122


[NIFI-2018] Update icons used in Context Menu
[NIFI-2108] update favicon
This closes #607


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b7a58412
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b7a58412
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b7a58412

Branch: refs/heads/master
Commit: b7a584122d6c38fa32649504d8e6677caa37f84b
Parents: 4f2d17a
Author: Scott Aslan 
Authored: Wed Jul 6 11:39:25 2016 -0400
Committer: Matt Gilman 
Committed: Thu Jul 7 07:52:28 2016 -0400

--
 .../nifi-web-ui/src/main/webapp/css/main.css|  30 ++---
 .../src/main/webapp/images/nifi16.ico   | Bin 1150 -> 1150 bytes
 .../main/webapp/js/nf/canvas/nf-context-menu.js |  62 +--
 3 files changed, 54 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/b7a58412/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
index 55904fa..5486357 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
@@ -126,22 +126,28 @@ body {
 
 #context-menu {
 display: none;
-background-color: #fff;
-border: 1px solid #000;
 position: absolute;
 z-index: 10006;
+font-size: 13px;
+padding:3px 0;
+background-color:rgba(249,250,251,0.97); /*tint base-color 96%*/
+border:1px solid #004849; /*link-color*/
+box-shadow: 0 3px 6px rgba(0,0,0,0.3);
+width: 215px;
+max-height: inherit;
+color:#004849
 }
 
 div.context-menu-item {
 cursor: pointer;
-width: 155px;
 height: 20px;
 padding-top: 4px;
 padding-left: 4px;
 }
 
 div.context-menu-item.hover {
-color: #027fd2;
+background-color:#C7D2D7; /*tint base-color 60%*/
+box-shadow:0 1px 1px rgba(0,0,0,0.15);
 }
 
 .context-menu-item-img {
@@ -151,13 +157,23 @@ div.context-menu-item.hover {
 background-size: cover;
 }
 
+.context-menu-item-img.fa{
+position: relative;
+top: 2px;
+left: 2px;
+}
+
+.context-menu-item-img.icon {
+position: relative;
+top: 1px;
+left: 3px;
+}
+
 div.context-menu-item-text {
-width: 135px;
 margin-left: 4px;
 line-height: 16px;
 float: left;
-font-family: Arial, sans-serif;
-font-size: 11px;
+color: #262626;
 }
 
 div.context-menu-provenance {

http://git-wip-us.apache.org/repos/asf/nifi/blob/b7a58412/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi16.ico
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi16.ico
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi16.ico
old mode 100755
new mode 100644
index 2ac3670..12da810
Binary files 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi16.ico
 and 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi16.ico
 differ

http://git-wip-us.apache.org/repos/asf/nifi/blob/b7a58412/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
index 77258b7..6fa4141 100644
--- 
a/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
@@ -424,7 +424,7 @@ nf.ContextMenu = (function () {
 }).appendTo(contextMenu);
 
 // create the img and conditionally add the style
-var img = $('').css('background-image', 'url(' + 
item['img'] + ')').appendTo(menuItem);
+var img = $('').addClass(item['clazz']).appendTo(menuItem);
 if (nf.Common.isDefinedAndNotNull(item['im