[jira] [Commented] (MINIFI-63) Provide service enablement for MiNiFi instances on systems

2016-08-09 Thread Aldrin Piri (JIRA) 

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

Aldrin Piri commented on MINIFI-63:
---

Will need to do some refactoring of the code for cleanup and then subsequently 
provide the script wrappers that will use the above described signal approach 
to having a runnable service.

> Provide service enablement for MiNiFi instances on systems
> --
>
> Key: MINIFI-63
> URL: https://issues.apache.org/jira/browse/MINIFI-63
> Project: Apache NiFi MiNiFi
>  Issue Type: New Feature
>  Components: Agent Configuration/Installation
>Reporter: Aldrin Piri
>Assignee: Aldrin Piri
>
> It would be helpful to establish a basis for installing instances as a 
> service on host systems.  Initially, this can target Linux environments.



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

[jira] [Commented] (MINIFI-63) Provide service enablement for MiNiFi instances on systems

2016-08-09 Thread Aldrin Piri (JIRA) 

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

Aldrin Piri commented on MINIFI-63:
---

Performed the needed refactoring to support determination of paths regardless 
of where program is executed.  This is modeled after the script wrapper used in 
NiFi, the result of which is used in the process that starts things.  There is 
some naive determinations of file paths made that works fairly well, but is 
certainly constrained to the POSIX environment.  For the sake of ease, this 
more rudimentary determination will continue to be used, but the filesystem 
boost library seems like an interesting option to have a more robust and 
portable solution for this.  

> Provide service enablement for MiNiFi instances on systems
> --
>
> Key: MINIFI-63
> URL: https://issues.apache.org/jira/browse/MINIFI-63
> Project: Apache NiFi MiNiFi
>  Issue Type: New Feature
>  Components: Agent Configuration/Installation
>Reporter: Aldrin Piri
>Assignee: Aldrin Piri
>
> It would be helpful to establish a basis for installing instances as a 
> service on host systems.  Initially, this can target Linux environments.



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

nifi git commit: NIFI-2503 Backport PostHTTP SSL Protocol fix to 0.x branch

2016-08-09 Thread pvillard 
Repository: nifi
Updated Branches:
  refs/heads/0.x 88115579a -> 24c0c1113


NIFI-2503 Backport PostHTTP SSL Protocol fix to 0.x branch

This closes #811.


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

Branch: refs/heads/0.x
Commit: 24c0c111343d40188bf8b2de06ebeb39d1cccd88
Parents: 8811557
Author: Andy LoPresto 
Authored: Tue Jun 21 15:31:56 2016 -0700
Committer: Pierre Villard 
Committed: Tue Aug 9 22:55:05 2016 +0200

--
 .../nifi/processors/standard/PostHTTP.java  |   8 +-
 .../standard/TestPostHTTPGroovy.groovy  | 414 +++
 .../resources/TestPostHTTP/PostHandler.groovy   |  26 ++
 .../TestPostHTTP/ReverseHandler.groovy  |  26 ++
 4 files changed, 471 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/24c0c111/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
index 79d2815..e78f1e5 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
@@ -353,7 +353,7 @@ public class PostHTTP extends AbstractProcessor {
 configMap.clear();
 
 final StreamThrottler throttler = throttlerRef.getAndSet(null);
-if(throttler != null) {
+if (throttler != null) {
 try {
 throttler.close();
 } catch (IOException e) {
@@ -392,12 +392,12 @@ public class PostHTTP extends AbstractProcessor {
 final SSLContext sslContext;
 try {
 sslContext = createSSLContext(sslContextService);
+getLogger().info("PostHTTP supports protocol: " + 
sslContext.getProtocol());
 } catch (final Exception e) {
 throw new ProcessException(e);
 }
 
-final SSLConnectionSocketFactory sslsf = new 
SSLConnectionSocketFactory(sslContext, new String[]{"TLSv1"}, null, 
SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
-
+final SSLConnectionSocketFactory sslsf = new 
SSLConnectionSocketFactory(sslContext);
 // Also use a plain socket factory for regular http connections 
(especially proxies)
 final Registry socketFactoryRegistry =
 RegistryBuilder.create()
@@ -437,6 +437,8 @@ public class PostHTTP extends AbstractProcessor {
 builder = builder.loadKeyMaterial(keystore, 
service.getKeyStorePassword().toCharArray());
 }
 
+builder = builder.useProtocol(service.getSslAlgorithm());
+
 final SSLContext sslContext = builder.build();
 return sslContext;
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/24c0c111/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
new file mode 100644
index 000..891cf3c
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
@@ -0,0 +1,414 @@
+/*
+ * 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

nifi git commit: NIFI-2516 - Extract version info into parent pom, upgrade to commons-io 2.5 NIFI-2516 - Removing slf4j-api, version from slf4j-log4j12

2016-08-09 Thread pvillard 
Repository: nifi
Updated Branches:
  refs/heads/master f7d2cd69d -> 2dc094765


NIFI-2516 - Extract version info into parent pom, upgrade to commons-io 2.5
NIFI-2516 - Removing slf4j-api, version from slf4j-log4j12

This closes #809.


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

Branch: refs/heads/master
Commit: 2dc094765d2b7393834ec649a5b35fb374b315fe
Parents: f7d2cd6
Author: Bryan Rosander 
Authored: Mon Aug 8 12:31:18 2016 -0400
Committer: Pierre Villard 
Committed: Tue Aug 9 22:43:29 2016 +0200

--
 nifi-assembly/NOTICE|  2 +-
 .../nifi-amqp-nar/src/main/resources/META-INF/NOTICE|  2 +-
 .../nifi-azure-nar/src/main/resources/META-INF/NOTICE   |  2 +-
 .../src/main/resources/META-INF/NOTICE  |  2 +-
 .../nifi-evtx-nar/src/main/resources/META-INF/NOTICE|  2 +-
 .../src/main/resources/META-INF/NOTICE  |  2 +-
 .../nifi-hadoop-nar/src/main/resources/META-INF/NOTICE  |  2 +-
 .../src/main/resources/META-INF/NOTICE  |  2 +-
 .../nifi-hive-nar/src/main/resources/META-INF/NOTICE|  2 +-
 .../nifi-ignite-nar/src/main/resources/META-INF/NOTICE  |  2 +-
 .../nifi-mongodb-nar/src/main/resources/META-INF/NOTICE |  2 +-
 .../nifi-ranger-nar/src/main/resources/META-INF/NOTICE  |  2 +-
 .../src/main/resources/META-INF/NOTICE  |  2 +-
 .../nifi-snmp-nar/src/main/resources/META-INF/NOTICE|  2 +-
 .../nifi-solr-nar/src/main/resources/META-INF/NOTICE|  2 +-
 .../nifi-splunk-nar/src/main/resources/META-INF/NOTICE  |  2 +-
 .../src/main/resources/META-INF/NOTICE  |  2 +-
 .../src/main/resources/META-INF/NOTICE  |  2 +-
 nifi-toolkit/nifi-toolkit-assembly/NOTICE   |  6 +++---
 nifi-toolkit/nifi-toolkit-assembly/pom.xml  |  6 --
 nifi-toolkit/nifi-toolkit-tls/pom.xml   |  4 
 pom.xml | 12 +++-
 22 files changed, 32 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-assembly/NOTICE
--
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 5bb181e..bc600e9 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -17,7 +17,7 @@ The following binary components are provided under the Apache 
Software License v
   (ASLv2) Apache Commons IO
 The following NOTICE information applies:
   Apache Commons IO
-  Copyright 2002-2012 The Apache Software Foundation
+  Copyright 2002-2016 The Apache Software Foundation
 
   (ASLv2) Apache Commons Net
 The following NOTICE information applies:

http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE
--
diff --git 
a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE
index d82b16b..4b7a0df 100644
--- 
a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE
+++ 
b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE
@@ -13,7 +13,7 @@ The following binary components are provided under the Apache 
Software License v
   (ASLv2) Apache Commons IO
 The following NOTICE information applies:
   Apache Commons IO
-  Copyright 2002-2012 The Apache Software Foundation
+  Copyright 2002-2016 The Apache Software Foundation
 
   (ASLv2) Apache Commons Lang
 The following NOTICE information applies:

http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE
--
diff --git 
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE
index f539055..ff0f432 100644
--- 
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE
+++ 
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE
@@ -21,4 +21,4 @@ The following binary components are provided under the Apache 
Software License v
   (ASLv2) Apache Commons IO
 The following NOTICE information applies:
   Apache Commons IO
-  Copyright 2002-2012 The Apache Software Foundation
+

[2/3] nifi git commit: NIFI-2499 This closes #825. Updated User Guide screen shots and text to reflect the new UI. Added two new screenshots as well.

2016-08-09 Thread joewitt 
http://git-wip-us.apache.org/repos/asf/nifi/blob/623d56c0/nifi-docs/src/main/asciidoc/user-guide.adoc
--
diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc 
b/nifi-docs/src/main/asciidoc/user-guide.adoc
index 8af0321..f84440e 100644
--- a/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -29,8 +29,8 @@ along several dimensions of quality of service, such as 
loss-tolerant versus gua
 high throughput, and priority-based queuing. NiFi provides fine-grained data 
provenance for all data received, forked, joined
 cloned, modified, sent, and ultimately dropped upon reaching its configured 
end-state.
 
-See the Admin Guide for information about system requirements, installation, 
and configuration. Once NiFi is installed,
-use a supported web browser to view the User Interface (UI).
+See the link:administration-guide.html[System Administrator’s Guide] for 
information about system requirements, installation, and configuration. Once 
NiFi is installed,
+use a supported web browser to view the UI.
 
 
 Browser Support
@@ -57,6 +57,12 @@ against the supported browsers. Any problem using a 
supported browser should be
 While the UI may run successfully in unsupported browsers, it is not actively 
tested against them. Additionally, the UI is designed as a desktop
 experience and is not currently supported in mobile browsers.
 
+=== Viewing the UI in Variably Sized Browsers
+In most environments, all of the UI is visible in your browser. However, the 
UI has a responsive design that allows you
+to scroll through screens as needed, in smaller sized browsers or tablet 
environments.
+
+In environments where your browser width is less than 800 pixels and the 
height less than 600 pixels, portions of the
+UI may become unavailable.
 
 [template="glossary", id="terminology"]
 Terminology
@@ -110,7 +116,7 @@ Terminology
Whenever a component reports a Bulletin, a bulletin icon is displayed 
on that component. System-level bulletins are displayed on the Status bar near 
the top of the page.
Using the mouse to hover over that icon will provide a tool-tip that 
shows the time and severity (Debug, Info, Warning, Error) of the Bulletin,
as well as the message of the Bulletin.
-   Bulletins from all components can also be viewed and filtered in the 
Bulletin Board Page, available in the Management Toolbar.
+   Bulletins from all components can also be viewed and filtered in the 
Bulletin Board Page, available in the Global Menu.
 
 *Template*: Often times, a dataflow is comprised of many sub-flows that could 
be reused. NiFi allows DFMs to select a part of the dataflow
(or the entire dataflow) and create a Template. This Template is given 
a name and can then be dragged onto the canvas just like the other components.
@@ -123,7 +129,7 @@ Terminology
You can use these archived files to rollback flow configuration. To do 
so, stop NiFi, replace flow.xml.gz with a desired backup copy, then restart 
NiFi.
In a clustered environment, stop the entire NiFi cluster, replace the 
flow.xml.gz of one of nodes, and restart the node. Remove flow.xml.gz from 
other nodes.
Once you confirmed the node starts up as a one-node cluster, start the 
other nodes. The replaced flow configuration will be synchronized across the 
cluster.
-   The name and location of flow.xml.gz, and auto archive behavior are 
configurable. See the link:administration-guide.html#core-properties-br[Admin 
Guide] for further details.
+   The name and location of flow.xml.gz, and auto archive behavior are 
configurable. See the link:administration-guide.html#core-properties-br[System 
Administrator’s Guide] for further details.
 
 
 
@@ -131,105 +137,129 @@ Terminology
 NiFi User Interface
 ---
 
-The NiFi User Interface (UI) provides mechanisms for creating automated 
dataflows, as well as visualizing,
+The NiFi UI provides mechanisms for creating automated dataflows, as well as 
visualizing,
 editing, monitoring, and administering those dataflows. The UI can be broken 
down into several segments,
 each responsible for different functionality of the application. This section 
provides screenshots of the
 application and highlights the different segments of the UI. Each segment is 
discussed in further detail later
 in the document.
 
-When the application is started, the user is able to navigate to the User 
Interface by going to the default address of
+When the application is started, the user is able to navigate to the UI by 
going to the default address of
 `http://:8080/nifi` in a web browser. There are no permissions 
configured by default, so anyone is
-able to view and modify the dataflow. For information on securing the system, 
see the Systems Administrator guide.
+able to view and modify the dataflow. For information on securing the system, 
see the

[1/3] nifi git commit: NIFI-2499 edited image paths in asciidoc

2016-08-09 Thread joewitt 
Repository: nifi
Updated Branches:
  refs/heads/master fbb705e46 -> f7d2cd69d


NIFI-2499 edited image paths in asciidoc


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

Branch: refs/heads/master
Commit: f7d2cd69d447fccd4f9089143220fc2caff62fc7
Parents: 623d56c
Author: joewitt 
Authored: Tue Aug 9 16:37:05 2016 -0400
Committer: joewitt 
Committed: Tue Aug 9 16:37:20 2016 -0400

--
 nifi-docs/src/main/asciidoc/user-guide.adoc | 212 +++
 1 file changed, 106 insertions(+), 106 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/f7d2cd69/nifi-docs/src/main/asciidoc/user-guide.adoc
--
diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc 
b/nifi-docs/src/main/asciidoc/user-guide.adoc
index f84440e..4a9c64f 100644
--- a/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -149,7 +149,7 @@ able to view and modify the dataflow. For information on 
securing the system, se
 
 When a DFM navigates to the UI for the first time, a blank canvas is provided 
on which a dataflow can be built:
 
-image::images/nifi-toolbar-components.png["NiFi Components Toolbar"]
+image::nifi-toolbar-components.png["NiFi Components Toolbar"]
 
 The Components Toolbar runs across the top left portion of your screen. It 
consists of the components you can drag onto the
 canvas to build your dataflow. Each component is described in more detail in 
link:building-dataflow.html[Building a Dataflow].
@@ -168,7 +168,7 @@ On the right side of the canvas is Search, and the Global 
Menu. You can use Sear
 canvas and can to search by component name, type, identifier, configuration 
properties, and their values. The Global Menu
 contain options that allow you to manipulate existing components on the canvas:
 
-image::images/global-menu.png[NiFi Global Menu]
+image::global-menu.png[NiFi Global Menu]
 
 Additionally, the UI has allows has some features that allow you to easily 
navigate around the canvas. You can use the
 Navigate Palette to pan around the canvas, and to zoom in and out. The 
“Birds Eye View” of the dataflow provides a high-level
@@ -177,7 +177,7 @@ bottom of the screen. As you navigate into and out of 
Process Groups, the breadc
 the depth in the flow, and each Process Group that you entered to reach this 
depth. Each of the Process Groups listed in the
 breadcrumbs is a link that will take you back up to that level in the flow.
 
-image::images/nifi-navigation.png["NiFi Navigation"]
+image::nifi-navigation.png["NiFi Navigation"]
 
 [[UI-with-multi-tenant-authorization]]
 Accessing the UI with Multi-Tenant Authorization
@@ -233,7 +233,7 @@ Clicking the 'login' link will open the log in page. If the 
user is logging in w
 a form to do so. If NiFi is not configured to support anonymous access and the 
user is logging in with their username/password, they will
 be immediately sent to the login form bypassing the canvas.
 
-image::images/login.png["Log In"]
+image::login.png["Log In"]
 
 
 [[building-dataflow]]
@@ -250,16 +250,16 @@ the components together.
 The User Interface section above outlined the different segments of the UI and 
pointed out a Components Toolbar.
 This section looks at each of the Components in that toolbar:
 
-image::images/components.png["Components"]
+image::components.png["Components"]
 
 [[processor]]
-image:images/iconProcessor.png["Processor", width=32]
+image:iconProcessor.png["Processor", width=32]
 *Processor*: The Processor is the most commonly used component, as it is 
responsible for data ingress, egress, routing, and
manipulating. There are many different types of Processors. In fact, 
this is a very common Extension Point in NiFi,
meaning that many vendors may implement their own Processors to perform 
whatever functions are necessary for their use case.
When a Processor is dragged onto the canvas, the user is presented with 
a dialog to choose which type of Processor to use:
 
-image::images/add-processor.png["Add Processor Dialog"]
+image::add-processor.png["Add Processor Dialog"]
 
 In the top-right corner, the user is able to filter the list based on the 
Processor Type or the Tags associated with a Processor.
 Processor developers have the ability to add Tags to their Processors. These 
tags are used in this dialog for filtering and are
@@ -268,7 +268,7 @@ in the Tag Cloud. Clicking a Tag in the Cloud will filter 
the available Processo
 Tags are selected, only those Processors that contain all of those Tags are 
shown. For example, if we want

[3/3] nifi git commit: NIFI-2499 This closes #825. Updated User Guide screen shots and text to reflect the new UI. Added two new screenshots as well.

2016-08-09 Thread joewitt 
NIFI-2499 This closes #825. Updated User Guide screen shots and text to reflect 
the new UI. Added two new screenshots as well.


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

Branch: refs/heads/master
Commit: 623d56c0d51f85a41c9f914029db41f8748bb291
Parents: fbb705e
Author: Sarah Olson 
Authored: Tue Aug 9 13:02:59 2016 -0700
Committer: joewitt 
Committed: Tue Aug 9 16:37:20 2016 -0400

--
 .../images/add-controller-service-window.png| Bin 157241 -> 104794 bytes
 .../images/add-processor-with-tag-cloud.png | Bin 22925 -> 89542 bytes
 .../src/main/asciidoc/images/add-processor.png  | Bin 167146 -> 164695 bytes
 .../src/main/asciidoc/images/addConnect.png | Bin 1996 -> 1306 bytes
 .../src/main/asciidoc/images/comments-tab.png   | Bin 6431 -> 20920 bytes
 .../src/main/asciidoc/images/components.png | Bin 8992 -> 8571 bytes
 .../configure-controller-service-properties.png | Bin 107830 -> 46025 bytes
 .../configure-controller-service-settings.png   | Bin 79718 -> 36499 bytes
 .../images/configure-remote-process-group.png   | Bin 36406 -> 49004 bytes
 .../configure-reporting-task-properties.png | Bin 58292 -> 26208 bytes
 .../configure-reporting-task-settings.png   | Bin 80213 -> 36807 bytes
 .../asciidoc/images/connection-settings.png | Bin 62223 -> 46191 bytes
 .../images/controller-service-window.png| Bin 0 -> 13650 bytes
 .../images/controller-services-edit-buttons.png | Bin 22294 -> 13650 bytes
 .../controller-services-information-buttons.png | Bin 0 -> 13023 bytes
 .../asciidoc/images/controller-services-tab.png | Bin 167278 -> 37021 bytes
 .../images/controller-settings-button.png   | Bin 32341 -> 26757 bytes
 .../main/asciidoc/images/create-connection.png  | Bin 9430 -> 31389 bytes
 .../images/create-service-ssl-context.png   | Bin 142764 -> 72712 bytes
 .../asciidoc/images/edit-property-dropdown.png  | Bin 14291 -> 33359 bytes
 .../asciidoc/images/edit-property-textarea.png  | Bin 17146 -> 36956 bytes
 .../main/asciidoc/images/event-attributes.png   | Bin 55373 -> 51205 bytes
 .../src/main/asciidoc/images/event-content.png  | Bin 62054 -> 50829 bytes
 .../src/main/asciidoc/images/event-details.png  | Bin 73053 -> 57072 bytes
 .../src/main/asciidoc/images/expand-event.png   | Bin 40476 -> 14445 bytes
 .../main/asciidoc/images/expanded-events.png| Bin 76082 -> 242162 bytes
 .../src/main/asciidoc/images/find-parents.png   | Bin 35831 -> 14272 bytes
 .../src/main/asciidoc/images/iconDelete.png | Bin 670 -> 404 bytes
 .../src/main/asciidoc/images/iconDetails.png| Bin 633 -> 502 bytes
 .../src/main/asciidoc/images/iconDisable.png| Bin 764 -> 732 bytes
 nifi-docs/src/main/asciidoc/images/iconEdit.png | Bin 493 -> 675 bytes
 .../src/main/asciidoc/images/iconEnable.png | Bin 667 -> 502 bytes
 .../src/main/asciidoc/images/iconExport.png | Bin 453 -> 665 bytes
 .../src/main/asciidoc/images/iconFunnel.png | Bin 1223 -> 1592 bytes
 .../src/main/asciidoc/images/iconInputPort.png  | Bin 1842 -> 1082 bytes
 .../src/main/asciidoc/images/iconLabel.png  | Bin 838 -> 1280 bytes
 .../src/main/asciidoc/images/iconLineage.png| Bin 981 -> 600 bytes
 .../main/asciidoc/images/iconNewTemplate.png| Bin 1024 -> 1220 bytes
 .../src/main/asciidoc/images/iconNotSecure.png  | Bin 221 -> 445 bytes
 .../src/main/asciidoc/images/iconOutputPort.png | Bin 1658 -> 1306 bytes
 .../main/asciidoc/images/iconProcessGroup.png   | Bin 1422 -> 1487 bytes
 .../src/main/asciidoc/images/iconProcessor.png  | Bin 2109 -> 1446 bytes
 .../asciidoc/images/iconRemoteProcessGroup.png  | Bin 674 -> 1502 bytes
 .../src/main/asciidoc/images/iconResize.png | Bin 165 -> 198 bytes
 nifi-docs/src/main/asciidoc/images/iconRun.png  | Bin 538 -> 429 bytes
 .../src/main/asciidoc/images/iconTemplate.png   | Bin 1139 -> 1290 bytes
 .../asciidoc/images/iconTransmissionActive.png  | Bin 1330 -> 683 bytes
 .../images/iconTransmissionInactive.png | Bin 1248 -> 986 bytes
 .../images/instantiate-template-description.png | Bin 6508 -> 27449 bytes
 .../asciidoc/images/instantiate-template.png| Bin 3216 -> 11316 bytes
 .../main/asciidoc/images/invalid-processor.png  | Bin 8187 -> 18705 bytes
 .../main/asciidoc/images/lineage-flowfile.png   | Bin 3855 -> 1246 bytes
 nifi-docs/src/main/asciidoc/images/login.png| Bin 93233 -> 17776 bytes
 .../images/nifi-connection-bend-points.png  | Bin 208437 -> 63876 bytes
 .../asciidoc/images/nifi-connection-menu.png| Bin 31189 -> 16492 bytes
 .../main/asciidoc/images/nifi-connection.png| Bin 166905 -> 54002 bytes
 .../main/asciidoc/images/nifi-navigation.png| Bin 339195 -> 82960 bytes

nifi git commit: NIFI-2511: - Ensuring Process Group bulletins are bubbling up as expected.

2016-08-09 Thread bbende 
Repository: nifi
Updated Branches:
  refs/heads/master 45c31c830 -> fbb705e46


NIFI-2511: - Ensuring Process Group bulletins are bubbling up as expected.

This closes #822.

Signed-off-by: Bryan Bende 


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

Branch: refs/heads/master
Commit: fbb705e461e8bb89049973646b2016042123305f
Parents: 45c31c8
Author: Matt Gilman 
Authored: Tue Aug 9 12:55:18 2016 -0400
Committer: Bryan Bende 
Committed: Tue Aug 9 16:28:57 2016 -0400

--
 .../nifi/web/StandardNiFiServiceFacade.java | 55 ++--
 .../org/apache/nifi/web/api/dto/DtoFactory.java | 16 +++---
 .../apache/nifi/web/api/dto/EntityFactory.java  |  2 +-
 .../nifi/web/controller/ControllerFacade.java   | 12 -
 .../src/main/resources/nifi-web-api-context.xml |  2 -
 .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 25 +
 .../src/main/webapp/js/nf/nf-common.js  | 34 ++--
 7 files changed, 95 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/fbb705e4/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index a912479..9db15c0 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -203,6 +203,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -1606,7 +1608,7 @@ public class StandardNiFiServiceFacade implements 
NiFiServiceFacade {
 
 final ProcessGroup group = processGroupDAO.getProcessGroup(groupId);
 final ProcessGroupStatus groupStatus = 
controllerFacade.getProcessGroupStatus(groupId);
-return dtoFactory.createFlowDto(group, groupStatus, snippet, 
revisionManager);
+return dtoFactory.createFlowDto(group, groupStatus, snippet, 
revisionManager, this::getProcessGroupBulletins);
 }
 
 @Override
@@ -2591,10 +2593,57 @@ public class StandardNiFiServiceFacade implements 
NiFiServiceFacade {
 final RevisionDTO revision = 
dtoFactory.createRevisionDTO(revisionManager.getRevision(group.getIdentifier()));
 final PermissionsDTO permissions = 
dtoFactory.createPermissionsDto(group);
 final ProcessGroupStatusDTO status = 
dtoFactory.createConciseProcessGroupStatusDto(controllerFacade.getProcessGroupStatus(group.getIdentifier()));
-final List bulletins = 
dtoFactory.createBulletinDtos(bulletinRepository.findBulletinsForSource(group.getIdentifier()));
+final List bulletins = getProcessGroupBulletins(group);
 return 
entityFactory.createProcessGroupEntity(dtoFactory.createProcessGroupDto(group), 
revision, permissions, status, bulletins);
 }
 
+private List getProcessGroupBulletins(final ProcessGroup 
group) {
+final List bulletins = new 
ArrayList<>(bulletinRepository.findBulletinsForGroupBySource(group.getIdentifier()));
+
+for (final ProcessGroup descendantGroup : 
group.findAllProcessGroups()) {
+
bulletins.addAll(bulletinRepository.findBulletinsForGroupBySource(descendantGroup.getIdentifier()));
+}
+
+List dtos = new ArrayList<>();
+for (final Bulletin bulletin : bulletins) {
+if (authorizeBulletin(bulletin)) {
+dtos.add(dtoFactory.createBulletinDto(bulletin));
+} else {
+final BulletinDTO bulletinDTO = new BulletinDTO();
+bulletinDTO.setTimestamp(bulletin.getTimestamp());
+bulletinDTO.setId(bulletin.getId());
+bulletinDTO.setSourceId(bulletin.getSourceId());
+bulletinDTO.setGroupId(bulletin.getGroupId());
+dtos.add(bulletinDTO);
+}
+}
+
+// sort the bulletins
+Collections.sort(dtos, new Comparator() {
+

nifi git commit: NIFI-2507 Added Canned ACL support to PutS3Object

2016-08-09 Thread jwing 
Repository: nifi
Updated Branches:
  refs/heads/master b2401522e -> 45c31c830


NIFI-2507 Added Canned ACL support to PutS3Object

This closes #801

Signed-off-by: James Wing 


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

Branch: refs/heads/master
Commit: 45c31c8305aa1b833591eaa8d6d88bf94513f2ad
Parents: b240152
Author: Tim Reardon 
Authored: Fri Aug 5 17:06:38 2016 -0400
Committer: James Wing 
Committed: Tue Aug 9 13:20:52 2016 -0700

--
 .../processors/aws/s3/AbstractS3Processor.java  | 57 +++-
 .../nifi/processors/aws/s3/PutS3Object.java | 11 +++-
 .../nifi/processors/aws/s3/ITPutS3Object.java   |  3 +-
 3 files changed, 68 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/45c31c83/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
index aee9c39..ee46690 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
@@ -34,6 +34,7 @@ import com.amazonaws.regions.Region;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.S3ClientOptions;
 import com.amazonaws.services.s3.model.AccessControlList;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.CanonicalGrantee;
 import com.amazonaws.services.s3.model.EmailAddressGrantee;
 import com.amazonaws.services.s3.model.Grantee;
@@ -82,6 +83,16 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 .description("A comma-separated list of Amazon User ID's or E-mail 
addresses that specifies who should have permissions to change the Access 
Control List for an object")
 .defaultValue("${s3.permissions.writeacl.users}")
 .build();
+public static final PropertyDescriptor CANNED_ACL = new 
PropertyDescriptor.Builder()
+.name("canned-acl")
+.displayName("Canned ACL")
+.required(false)
+.expressionLanguageSupported(true)
+.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+.description("Amazon Canned ACL for an object, one of: 
BucketOwnerFullControl, BucketOwnerRead, LogDeliveryWrite, AuthenticatedRead, 
PublicReadWrite, PublicRead, Private; " +
+"will be ignored if any other ACL/permission/owner 
property is specified")
+.defaultValue("${s3.permissions.cannedacl}")
+.build();
 public static final PropertyDescriptor OWNER = new 
PropertyDescriptor.Builder()
 .name("Owner")
 .required(false)
@@ -183,36 +194,80 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 }
 }
 
+/**
+ * Create AccessControlList if appropriate properties are configured.
+ *
+ * @param context ProcessContext
+ * @param flowFile FlowFile
+ * @return AccessControlList or null if no ACL properties were specified
+ */
 protected final AccessControlList createACL(final ProcessContext context, 
final FlowFile flowFile) {
-final AccessControlList acl = new AccessControlList();
+// lazy-initialize ACL, as it should not be used if no properties were 
specified
+AccessControlList acl = null;
 
 final String ownerId = 
context.getProperty(OWNER).evaluateAttributeExpressions(flowFile).getValue();
 if (!StringUtils.isEmpty(ownerId)) {
 final Owner owner = new Owner();
 owner.setId(ownerId);
+if (acl == null) {
+acl = new AccessControlList();
+}
 acl.setOwner(owner);
 }
 
 for (final Grantee grantee : 
createGrantees(context.getProperty(FULL_CONTROL_USER_LIST).evaluateAttributeExpressions(flowFile).getValue()))
 {
+if (acl == null) {
+acl = new AccessControlList();
+}
 acl.grantPermission(grantee, Permission.FullControl);
 }
 
 for (final Grantee grantee :

nifi git commit: NIFI-2521 This closes #816. removed offending test classes and referencing items

2016-08-09 Thread joewitt 
Repository: nifi
Updated Branches:
  refs/heads/0.x 13262d2f7 -> 88115579a


NIFI-2521 This closes #816. removed offending test classes and referencing items


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

Branch: refs/heads/0.x
Commit: 88115579a42b32f00db8a11142ce9538fe1e99b1
Parents: 13262d2
Author: joewitt 
Authored: Tue Aug 9 00:51:04 2016 -0400
Committer: joewitt 
Committed: Tue Aug 9 15:48:04 2016 -0400

--
 .../nifi/snmp/processors/GetSNMPTest.java   | 389 ---
 .../nifi/snmp/processors/SNMPGetTest.java   | 123 --
 .../nifi/snmp/processors/SNMPWalkTest.java  | 121 --
 .../nifi/snmp/processors/SetSNMPTest.java   | 332 
 .../nifi/snmp/processors/TestSnmpAgentV1.java   | 218 ---
 .../nifi/snmp/processors/TestSnmpAgentV2c.java  | 219 ---
 .../nifi/snmp/processors/TestSnmpAgentV3.java   | 255 
 .../nifi/snmp/processors/WalkSNMPTest.java  | 117 --
 8 files changed, 1774 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/88115579/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
--
diff --git 
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
deleted file mode 100644
index 9e7f594..000
--- 
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
+++ /dev/null
@@ -1,389 +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.snmp.processors;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.nifi.util.MockFlowFile;
-import org.apache.nifi.util.TestRunner;
-import org.apache.nifi.util.TestRunners;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.snmp4j.AbstractTarget;
-import org.snmp4j.CommunityTarget;
-import org.snmp4j.PDU;
-import org.snmp4j.Snmp;
-import org.snmp4j.UserTarget;
-import org.snmp4j.agent.mo.DefaultMOFactory;
-import org.snmp4j.agent.mo.MOAccessImpl;
-import org.snmp4j.event.ResponseEvent;
-import org.snmp4j.mp.MPv3;
-import org.snmp4j.mp.SnmpConstants;
-import org.snmp4j.security.SecurityModels;
-import org.snmp4j.security.SecurityProtocols;
-import org.snmp4j.security.USM;
-import org.snmp4j.smi.Integer32;
-import org.snmp4j.smi.OID;
-import org.snmp4j.smi.OctetString;
-import org.snmp4j.smi.VariableBinding;
-import org.snmp4j.transport.DefaultUdpTransportMapping;
-
-/**
- * Class to test SNMP Get processor
- */
-public class GetSNMPTest {
-
-/** agent for version v1 */
-private static TestSnmpAgentV1 agentv1 = null;
-/** agent for version v2c */
-private static TestSnmpAgentV2c agentv2c = null;
-/** OID for system description */
-private static final OID sysDescr = new OID("1.3.6.1.2.1.1.1.0");
-/** value we set for system description at set-up */
-private static final String value = "MySystemDescr";
-/** OID for write only */
-private static final OID writeOnlyOID = new OID("1.3.6.1.2.1.1.3.0");
-/** value we set for write only at set-up */
-private static final int writeOnlyValue = 1;
-
-/**
- * Method to set up different SNMP agents
- * @throws Exception Exception
- */
-@BeforeClass
-public static void setUp() throws Exception {
-agentv2c = new TestSnmpAgentV2c("0.0.0.0");
-agentv2c.start();
-

nifi git commit: NIFI-2521 This closes #815. removed test classes with questionable origin and licensing.

2016-08-09 Thread joewitt 
Repository: nifi
Updated Branches:
  refs/heads/master 7a1f749f6 -> b2401522e


NIFI-2521 This closes #815. removed test classes with questionable origin and 
licensing.


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

Branch: refs/heads/master
Commit: b2401522ead954c31004fa5877d51fc69d72e4da
Parents: 7a1f749
Author: joewitt 
Authored: Tue Aug 9 00:33:45 2016 -0400
Committer: joewitt 
Committed: Tue Aug 9 15:46:58 2016 -0400

--
 .../nifi/snmp/processors/GetSNMPTest.java   | 391 ---
 .../nifi/snmp/processors/SNMPGetTest.java   | 123 --
 .../nifi/snmp/processors/SNMPWalkTest.java  | 121 --
 .../nifi/snmp/processors/SetSNMPTest.java   | 332 
 .../nifi/snmp/processors/TestSnmpAgentV1.java   | 218 ---
 .../nifi/snmp/processors/TestSnmpAgentV2c.java  | 219 ---
 .../nifi/snmp/processors/TestSnmpAgentV3.java   | 255 
 .../nifi/snmp/processors/WalkSNMPTest.java  | 117 --
 8 files changed, 1776 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/b2401522/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
--
diff --git 
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
 
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
deleted file mode 100644
index 48be787..000
--- 
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
+++ /dev/null
@@ -1,391 +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.snmp.processors;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.nifi.util.MockFlowFile;
-import org.apache.nifi.util.TestRunner;
-import org.apache.nifi.util.TestRunners;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.snmp4j.AbstractTarget;
-import org.snmp4j.CommunityTarget;
-import org.snmp4j.PDU;
-import org.snmp4j.Snmp;
-import org.snmp4j.UserTarget;
-import org.snmp4j.agent.mo.DefaultMOFactory;
-import org.snmp4j.agent.mo.MOAccessImpl;
-import org.snmp4j.event.ResponseEvent;
-import org.snmp4j.mp.MPv3;
-import org.snmp4j.mp.SnmpConstants;
-import org.snmp4j.security.SecurityModels;
-import org.snmp4j.security.SecurityProtocols;
-import org.snmp4j.security.USM;
-import org.snmp4j.smi.Integer32;
-import org.snmp4j.smi.OID;
-import org.snmp4j.smi.OctetString;
-import org.snmp4j.smi.VariableBinding;
-import org.snmp4j.transport.DefaultUdpTransportMapping;
-
-/**
- * Class to test SNMP Get processor
- */
-public class GetSNMPTest {
-
-/** agent for version v1 */
-private static TestSnmpAgentV1 agentv1 = null;
-/** agent for version v2c */
-private static TestSnmpAgentV2c agentv2c = null;
-/** OID for system description */
-private static final OID sysDescr = new OID("1.3.6.1.2.1.1.1.0");
-/** value we set for system description at set-up */
-private static final String value = "MySystemDescr";
-/** OID for write only */
-private static final OID writeOnlyOID = new OID("1.3.6.1.2.1.1.3.0");
-/** value we set for write only at set-up */
-private static final int writeOnlyValue = 1;
-
-/**
- * Method to set up different SNMP agents
- * @throws Exception Exception
- */
-@BeforeClass
-public static void setUp() throws Exception {
-agentv2c = new TestSnmpAgentV2c("0.0.0.0");
-agentv2c.start();
-

nifi git commit: NIFI-2475: - Updating UI to better suggest that component specific administrators do not override higher level administrators.

2016-08-09 Thread mattyb149 
Repository: nifi
Updated Branches:
  refs/heads/master 7575e87cb -> 7a1f749f6


NIFI-2475: - Updating UI to better suggest that component specific 
administrators do not override higher level administrators.

This closes #813


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

Branch: refs/heads/master
Commit: 7a1f749f6900399685f5d5e5a4c737e66c569c6b
Parents: 7575e87
Author: Matt Gilman 
Authored: Mon Aug 8 16:52:53 2016 -0400
Committer: Matt Burgess 
Committed: Tue Aug 9 15:40:28 2016 -0400

--
 .../partials/canvas/policy-management.jsp   |   3 +
 .../src/main/webapp/css/policy-management.css   |  12 ++
 .../webapp/js/nf/canvas/nf-policy-management.js | 174 ++-
 3 files changed, 143 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7a1f749f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/policy-management.jsp
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/policy-management.jsp
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/policy-management.jsp
index b0e10e9..b833c7c 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/policy-management.jsp
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/policy-management.jsp
@@ -24,6 +24,7 @@
 
 Create a new policy.
 Override this policy.
+Add policy for additional 
administrators.
 
 
 
@@ -88,5 +89,7 @@
 Last updated:
 
 
+Only listing component 
specific administrators. Inherited administrators not shown.
+
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/7a1f749f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css
index 0124106..2fa956b 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css
@@ -210,3 +210,15 @@ div.policy-selected-component-type {
 border: 1px solid #99;
 border-radius: 0;
 }
+
+/*
+admin policy message
+*/
+
+#admin-policy-message {
+float: right;
+margin-top: 8px;
+color: #775351;
+font-family: Roboto;
+font-size: 13px;
+}

http://git-wip-us.apache.org/repos/asf/nifi/blob/7a1f749f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js
index adbc42d..bcd40d8 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js
@@ -210,7 +210,7 @@ nf.PolicyManagement = (function () {
 
 var initPolicyTable = function () {
 // create/override a policy
-$('#create-policy-link, #override-policy-link').on('click', function 
() {
+$('#create-policy-link, #override-policy-link, 
#add-local-admin-link').on('click', function () {
 createPolicy();
 });
 
@@ -692,65 +692,146 @@ nf.PolicyManagement = (function () {
  */
 var loadPolicy = function () {
 var resourceAndAction = getSelectedResourceAndAction();
-return $.Deferred(function (deferred) {
-$.ajax({
-type: 'GET',
-url:

nifi git commit: NIFI-2520 This closes #818. Added attribution for storm-hive and other Hive dependencies to NOTICEs

2016-08-09 Thread joewitt 
Repository: nifi
Updated Branches:
  refs/heads/master 42df02f01 -> 7575e87cb


NIFI-2520 This closes #818. Added attribution for storm-hive and other Hive 
dependencies to NOTICEs


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

Branch: refs/heads/master
Commit: 7575e87cb14074bd2156addefb4140d51c4eb178
Parents: 42df02f
Author: Matt Burgess 
Authored: Tue Aug 9 14:47:23 2016 -0400
Committer: joewitt 
Committed: Tue Aug 9 15:27:24 2016 -0400

--
 NOTICE  |  9 ++-
 nifi-assembly/NOTICE| 58 
 .../src/main/resources/META-INF/NOTICE  | 19 +++
 3 files changed, 73 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7575e87c/NOTICE
--
diff --git a/NOTICE b/NOTICE
index 9661690..e59acd4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -11,4 +11,11 @@ BoundedByteArrayOutputStream.java adapted to 
SoftLimitBoundedByteArrayOutputStre
 This includes derived works from the Apache Software License V2 library 
python-evtx (https://github.com/williballenthin/python-evtx)
 Copyright 2012, 2013 Willi Ballenthin william.ballent...@mandiant.com
 while at Mandiant http://www.mandiant.com
-The derived work is adapted from Evtx/Evtx.py, Evtx/BinaryParser.py, 
Evtx/Nodes.py, Evtx/Views.py and can be found in the 
org.apache.nifi.processors.evtx.parser package.
\ No newline at end of file
+The derived work is adapted from Evtx/Evtx.py, Evtx/BinaryParser.py, 
Evtx/Nodes.py, Evtx/Views.py and can be found in the 
org.apache.nifi.processors.evtx.parser package.
+
+This includes derived works from the Apache Storm (ASLv2 licensed) project 
(https://github.com/apache/storm):
+Copyright 2015 The Apache Software Foundation
+The derived work is adapted from
+  org/apache/storm/hive/common/HiveWriter.java
+  org/apache/storm/hive/common/HiveOptions.java
+and can be found in the org.apache.nifi.util.hive package

http://git-wip-us.apache.org/repos/asf/nifi/blob/7575e87c/nifi-assembly/NOTICE
--
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index ad3a6d7..5bb181e 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -859,11 +859,69 @@ The following binary components are provided under the 
Apache Software License v
Apache Commons Email
Copyright 2002-2015 The Apache Software Foundation
 
+(ASLv2) Apache Hive
+   The following NOTICE information applies:
+   Apache Hive
+   Copyright 2008-2015 The Apache Software Foundation
+
+   This product includes software developed by The Apache Software 
Foundation (http://www.apache.org/).
+
+   This product includes Jersey (https://jersey.java.net/)
+   Copyright (c) 2010-2014 Oracle and/or its affiliates.
+
+   This project includes software copyrighted by Microsoft Corporation and
+   licensed under the Apache License, Version 2.0.
+
+   This project includes software copyrighted by Dell SecureWorks and
+   licensed under the Apache License, Version 2.0.
+
+(ASLv2) BoneCP
+   The following NOTICE information applies:
+   BoneCP
+   Copyright 2010 Wallace Wadge
+
+  (ASLv2) Apache Hadoop
+The following NOTICE information applies:
+  The binary distribution of this product bundles binaries of
+  org.iq80.leveldb:leveldb-api (https://github.com/dain/leveldb), which 
has the
+  following notices:
+  * Copyright 2011 Dain Sundstrom 
+  * Copyright 2011 FuseSource Corp. http://fusesource.com
+
+  The binary distribution of this product bundles binaries of
+  org.fusesource.hawtjni:hawtjni-runtime 
(https://github.com/fusesource/hawtjni),
+  which has the following notices:
+  * This product includes software developed by FuseSource Corp.
+http://fusesource.com
+  * This product includes software developed at
+Progress Software Corporation and/or its  subsidiaries or affiliates.
+  * This product includes software developed by IBM Corporation and others.
+
+  (ASLv2) Dropwizard Metrics
+  The following NOTICE information applies:
+Metrics
+Copyright 2010-2013 Coda Hale and Yammer, Inc.
+
+This product includes code derived from the JSR-166 project 
(ThreadLocalRandom, Striped64,
+LongAdder), which was released with the following comments:
+
+Written by Doug Lea with assistance from members of JCP JSR-166
+Expert Group and released to the public

nifi git commit: NIFI-2507 Added Canned ACL support to PutS3Object

2016-08-09 Thread jwing 
Repository: nifi
Updated Branches:
  refs/heads/0.x fcf85ecda -> 13262d2f7


NIFI-2507 Added Canned ACL support to PutS3Object

This closes #801

Signed-off-by: James Wing 


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

Branch: refs/heads/0.x
Commit: 13262d2f7b1ab0cda81c6c982fc70c1bd62ddcca
Parents: fcf85ec
Author: Tim Reardon 
Authored: Fri Aug 5 17:06:38 2016 -0400
Committer: James Wing 
Committed: Tue Aug 9 12:20:41 2016 -0700

--
 .../processors/aws/s3/AbstractS3Processor.java  | 57 +++-
 .../nifi/processors/aws/s3/PutS3Object.java | 11 +++-
 .../nifi/processors/aws/s3/ITPutS3Object.java   |  3 +-
 3 files changed, 68 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/13262d2f/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
index aee9c39..ee46690 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
@@ -34,6 +34,7 @@ import com.amazonaws.regions.Region;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.S3ClientOptions;
 import com.amazonaws.services.s3.model.AccessControlList;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.CanonicalGrantee;
 import com.amazonaws.services.s3.model.EmailAddressGrantee;
 import com.amazonaws.services.s3.model.Grantee;
@@ -82,6 +83,16 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 .description("A comma-separated list of Amazon User ID's or E-mail 
addresses that specifies who should have permissions to change the Access 
Control List for an object")
 .defaultValue("${s3.permissions.writeacl.users}")
 .build();
+public static final PropertyDescriptor CANNED_ACL = new 
PropertyDescriptor.Builder()
+.name("canned-acl")
+.displayName("Canned ACL")
+.required(false)
+.expressionLanguageSupported(true)
+.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+.description("Amazon Canned ACL for an object, one of: 
BucketOwnerFullControl, BucketOwnerRead, LogDeliveryWrite, AuthenticatedRead, 
PublicReadWrite, PublicRead, Private; " +
+"will be ignored if any other ACL/permission/owner 
property is specified")
+.defaultValue("${s3.permissions.cannedacl}")
+.build();
 public static final PropertyDescriptor OWNER = new 
PropertyDescriptor.Builder()
 .name("Owner")
 .required(false)
@@ -183,36 +194,80 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 }
 }
 
+/**
+ * Create AccessControlList if appropriate properties are configured.
+ *
+ * @param context ProcessContext
+ * @param flowFile FlowFile
+ * @return AccessControlList or null if no ACL properties were specified
+ */
 protected final AccessControlList createACL(final ProcessContext context, 
final FlowFile flowFile) {
-final AccessControlList acl = new AccessControlList();
+// lazy-initialize ACL, as it should not be used if no properties were 
specified
+AccessControlList acl = null;
 
 final String ownerId = 
context.getProperty(OWNER).evaluateAttributeExpressions(flowFile).getValue();
 if (!StringUtils.isEmpty(ownerId)) {
 final Owner owner = new Owner();
 owner.setId(ownerId);
+if (acl == null) {
+acl = new AccessControlList();
+}
 acl.setOwner(owner);
 }
 
 for (final Grantee grantee : 
createGrantees(context.getProperty(FULL_CONTROL_USER_LIST).evaluateAttributeExpressions(flowFile).getValue()))
 {
+if (acl == null) {
+acl = new AccessControlList();
+}
 acl.grantPermission(grantee, Permission.FullControl);
 }
 
 for (final Grantee grantee :

nifi git commit: NIFI-2406 This closes #820. Addressed regression introduced in NIFI-2406 where the cluster does not recognize a new Cluster Coordinator when the coordinator is shutdown

2016-08-09 Thread joewitt 
Repository: nifi
Updated Branches:
  refs/heads/master 18f415001 -> 42df02f01


NIFI-2406 This closes #820. Addressed regression introduced in NIFI-2406 where 
the cluster does not recognize a new Cluster Coordinator when the coordinator 
is shutdown


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

Branch: refs/heads/master
Commit: 42df02f014df6ac332f41120d1d01eac0118d946
Parents: 18f4150
Author: Mark Payne 
Authored: Tue Aug 9 11:11:08 2016 -0400
Committer: joewitt 
Committed: Tue Aug 9 15:19:49 2016 -0400

--
 .../org/apache/nifi/util/NiFiProperties.java|  1 -
 .../heartbeat/AbstractHeartbeatMonitor.java | 24 +---
 .../ClusterProtocolHeartbeatMonitor.java|  9 +---
 .../heartbeat/TestAbstractHeartbeatMonitor.java | 10 
 .../apache/nifi/controller/FlowController.java  | 21 +++--
 .../src/main/resources/conf/nifi.properties |  3 ---
 6 files changed, 41 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/42df02f0/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
--
diff --git 
a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
 
b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
index a873c44..90115d5 100644
--- 
a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
+++ 
b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
@@ -164,7 +164,6 @@ public class NiFiProperties extends Properties {
 public static final String CLUSTER_NODE_ADDRESS = 
"nifi.cluster.node.address";
 public static final String CLUSTER_NODE_PROTOCOL_PORT = 
"nifi.cluster.node.protocol.port";
 public static final String CLUSTER_NODE_PROTOCOL_THREADS = 
"nifi.cluster.node.protocol.threads";
-public static final String REQUEST_REPLICATION_CLAIM_TIMEOUT = 
"nifi.cluster.request.replication.claim.timeout";
 public static final String CLUSTER_NODE_CONNECTION_TIMEOUT = 
"nifi.cluster.node.connection.timeout";
 public static final String CLUSTER_NODE_READ_TIMEOUT = 
"nifi.cluster.node.read.timeout";
 public static final String CLUSTER_FIREWALL_FILE = 
"nifi.cluster.firewall.file";

http://git-wip-us.apache.org/repos/asf/nifi/blob/42df02f0/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
index 116ef3e..c216ed3 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/heartbeat/AbstractHeartbeatMonitor.java
@@ -42,7 +42,6 @@ public abstract class AbstractHeartbeatMonitor implements 
HeartbeatMonitor {
 protected final ClusterCoordinator clusterCoordinator;
 protected final FlowEngine flowEngine = new FlowEngine(1, "Heartbeat 
Monitor", true);
 
-protected volatile long latestHeartbeatTime;
 private volatile ScheduledFuture future;
 private volatile boolean stopped = true;
 
@@ -57,8 +56,8 @@ public abstract class AbstractHeartbeatMonitor implements 
HeartbeatMonitor {
 @Override
 public synchronized final void start() {
 if (!stopped) {
-logger.debug("Attempted to start Heartbeat Monitor but it is 
already started");
-return;
+logger.info("Attempted to start Heartbeat Monitor but it is 
already started. Stopping heartbeat monitor and re-starting it.");
+stop();
 }
 
 stopped = false;
@@ -125,6 +124,15 @@ public abstract class AbstractHeartbeatMonitor implements 
HeartbeatMonitor {
  * Visible for testing.
  */
 protected synchronized void monitorHeartbeats() {
+if (!clusterCoordinator.isActiveClusterCoordinator()) {
+// Occasionally Curator appears to not notify us that we have lost 
the elected

nifi git commit: NIFI-2515 fixed Kafka serialization/deserialization settings

2016-08-09 Thread joewitt 
Repository: nifi
Updated Branches:
  refs/heads/0.x 4927e8c4e -> fcf85ecda


NIFI-2515 fixed Kafka serialization/deserialization settings


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

Branch: refs/heads/0.x
Commit: fcf85ecdae114745e92c59d06073b7eb6cb8e4a0
Parents: 4927e8c
Author: Oleg Zhurakousky 
Authored: Mon Aug 8 17:03:12 2016 -0400
Committer: joewitt 
Committed: Tue Aug 9 14:30:15 2016 -0400

--
 .../kafka/pubsub/AbstractKafkaProcessor.java| 36 +---
 .../processors/kafka/pubsub/ConsumeKafka.java   |  8 ++---
 .../processors/kafka/pubsub/PublishKafka.java   |  8 ++---
 .../kafka/pubsub/ConsumeKafkaTest.java  | 16 +
 .../kafka/pubsub/PublishKafkaTest.java  | 15 
 5 files changed, 67 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/fcf85ecd/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
index 092de31..736d93e 100644
--- 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
+++ 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
@@ -27,8 +27,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
+import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.ByteArrayDeserializer;
+import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.apache.nifi.annotation.lifecycle.OnStopped;
 import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
@@ -117,11 +120,11 @@ abstract class AbstractKafkaProcessor extends AbstractSessi
 .build();
 
 static final PropertyDescriptor SSL_CONTEXT_SERVICE = new 
PropertyDescriptor.Builder()
-.name("ssl.context.service")
-.displayName("SSL Context Service")
-.description("Specifies the SSL Context Service to use for 
communicating with Kafka.")
+.name("ssl.context.service")
+.displayName("SSL Context Service")
+.description("Specifies the SSL Context Service to use for 
communicating with Kafka.")
 .required(false)
-.identifiesControllerService(SSLContextService.class)
+.identifiesControllerService(SSLContextService.class)
 .build();
 
 static final Builder MESSAGE_DEMARCATOR_BUILDER = new 
PropertyDescriptor.Builder()
@@ -306,6 +309,31 @@ abstract class AbstractKafkaProcessor 
extends AbstractSessi
 }
 }
 
+String keySerializer = validationContext.getProperty(new 
PropertyDescriptor.Builder().name(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG).build())
+.getValue();
+if (keySerializer != null && 
!ByteArraySerializer.class.getName().equals(keySerializer)) {
+results.add(new 
ValidationResult.Builder().subject(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG)
+.explanation("Key Serializer must be " + 
ByteArraySerializer.class.getName() + "' was '" + keySerializer + "'").build());
+}
+String valueSerializer = validationContext.getProperty(new 
PropertyDescriptor.Builder().name(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG).build())
+.getValue();
+if (valueSerializer != null && 
!ByteArraySerializer.class.getName().equals(valueSerializer)) {
+results.add(new 
ValidationResult.Builder().subject(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG)
+.explanation("Value Serializer must be " + 
ByteArraySerializer.class.getName() + "' was '" + valueSerializer + 
"'").build());
+}
+String keyDeSerializer = validationContext.getProperty(new 
PropertyDescriptor.Builder().name(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG).build())
+.getValue();
+if (keyDeSerializer != null

nifi git commit: NIFI-2515 This closes #814. fixed Kafka serialization/deserialization settings

2016-08-09 Thread joewitt 
Repository: nifi
Updated Branches:
  refs/heads/master f6ba92229 -> 18f415001


NIFI-2515 This closes #814. fixed Kafka serialization/deserialization settings


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

Branch: refs/heads/master
Commit: 18f415001589a7298f3d59c3f844d8865d719050
Parents: f6ba922
Author: Oleg Zhurakousky 
Authored: Mon Aug 8 17:03:12 2016 -0400
Committer: joewitt 
Committed: Tue Aug 9 14:28:51 2016 -0400

--
 .../kafka/pubsub/AbstractKafkaProcessor.java| 36 +---
 .../processors/kafka/pubsub/ConsumeKafka.java   |  8 ++---
 .../processors/kafka/pubsub/PublishKafka.java   |  8 ++---
 .../kafka/pubsub/ConsumeKafkaTest.java  | 16 +
 .../kafka/pubsub/PublishKafkaTest.java  | 15 
 5 files changed, 67 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/18f41500/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
index c2c2321..4677e33 100644
--- 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
+++ 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-pubsub-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/AbstractKafkaProcessor.java
@@ -27,8 +27,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
+import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.ByteArrayDeserializer;
+import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.apache.nifi.annotation.lifecycle.OnStopped;
 import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
@@ -117,11 +120,11 @@ abstract class AbstractKafkaProcessor extends AbstractSessi
 .build();
 
 static final PropertyDescriptor SSL_CONTEXT_SERVICE = new 
PropertyDescriptor.Builder()
-.name("ssl.context.service")
-.displayName("SSL Context Service")
-.description("Specifies the SSL Context Service to use for 
communicating with Kafka.")
+.name("ssl.context.service")
+.displayName("SSL Context Service")
+.description("Specifies the SSL Context Service to use for 
communicating with Kafka.")
 .required(false)
-.identifiesControllerService(SSLContextService.class)
+.identifiesControllerService(SSLContextService.class)
 .build();
 
 static final Builder MESSAGE_DEMARCATOR_BUILDER = new 
PropertyDescriptor.Builder()
@@ -306,6 +309,31 @@ abstract class AbstractKafkaProcessor 
extends AbstractSessi
 }
 }
 
+String keySerializer = validationContext.getProperty(new 
PropertyDescriptor.Builder().name(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG).build())
+.getValue();
+if (keySerializer != null && 
!ByteArraySerializer.class.getName().equals(keySerializer)) {
+results.add(new 
ValidationResult.Builder().subject(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG)
+.explanation("Key Serializer must be " + 
ByteArraySerializer.class.getName() + "' was '" + keySerializer + "'").build());
+}
+String valueSerializer = validationContext.getProperty(new 
PropertyDescriptor.Builder().name(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG).build())
+.getValue();
+if (valueSerializer != null && 
!ByteArraySerializer.class.getName().equals(valueSerializer)) {
+results.add(new 
ValidationResult.Builder().subject(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG)
+.explanation("Value Serializer must be " + 
ByteArraySerializer.class.getName() + "' was '" + valueSerializer + 
"'").build());
+}
+String keyDeSerializer = validationContext.getProperty(new 
PropertyDescriptor.Builder().name(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG).build())
+.getValue();
+if

nifi git commit: NIFI-1965 This closes #819. COnvert DNS_TIMEOUT property to TIME_PERIOD

2016-08-09 Thread joewitt 
Repository: nifi
Updated Branches:
  refs/heads/master ae8045d99 -> f6ba92229


NIFI-1965  This closes #819. COnvert DNS_TIMEOUT property to TIME_PERIOD


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

Branch: refs/heads/master
Commit: f6ba92229224504d0bbd1126bd8428a010bb4c45
Parents: ae8045d
Author: Andre F de Miranda 
Authored: Tue Aug 9 23:08:16 2016 +1000
Committer: joewitt 
Committed: Tue Aug 9 14:25:07 2016 -0400

--
 .../org/apache/nifi/processors/enrich/QueryDNS.java| 13 +++--
 .../apache/nifi/processors/enrich/TestQueryDNS.java| 10 +-
 2 files changed, 12 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ba9222/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/enrich/QueryDNS.java
--
diff --git 
a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/enrich/QueryDNS.java
 
b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/enrich/QueryDNS.java
index d80a72c..bb346c6 100644
--- 
a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/enrich/QueryDNS.java
+++ 
b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/enrich/QueryDNS.java
@@ -24,6 +24,7 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.naming.Context;
 import javax.naming.NameNotFoundException;
@@ -86,10 +87,10 @@ public class QueryDNS extends AbstractEnrichProcessor {
 public static final PropertyDescriptor DNS_TIMEOUT = new 
PropertyDescriptor.Builder()
 .name("DNS_TIMEOUT")
 .displayName("DNS Query Timeout")
-.description("The amount of milliseconds to wait until considering 
a query as failed")
+.description("The amount of time to wait until considering a query 
as failed")
 .required(true)
-.defaultValue("1500")
-.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+.defaultValue("1500 ms")
+.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
 .build();
 
 public static final PropertyDescriptor DNS_RETRIES = new 
PropertyDescriptor.Builder()
@@ -218,7 +219,7 @@ public class QueryDNS extends AbstractEnrichProcessor {
 
 protected void initializeResolver(final ProcessContext context ) {
 
-final String dnsTimeout = context.getProperty(DNS_TIMEOUT).getValue();
+final String dnsTimeout = 
context.getProperty(DNS_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).toString();
 final String dnsServer = context.getProperty(DNS_SERVER).getValue();
 final String dnsRetries = context.getProperty(DNS_RETRIES).getValue();
 
@@ -247,7 +248,7 @@ public class QueryDNS extends AbstractEnrichProcessor {
 /**
  * This method performs a simple DNS lookup using JNDI
  * @param queryInput String containing the query body itself (e.g. 
4.3.3.1.in-addr.arpa);
- * @param queryType String containign the query type (e.g. TXT);
+ * @param queryType String containing the query type (e.g. TXT);
  */
 protected Attributes doLookup(String queryInput, String queryType) throws 
NamingException {
 // This is a simple DNS lookup attempt
@@ -273,4 +274,4 @@ public class QueryDNS extends AbstractEnrichProcessor {
 initialized.set(true);
 }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/nifi/blob/f6ba9222/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/enrich/TestQueryDNS.java
--
diff --git 
a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/enrich/TestQueryDNS.java
 
b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/enrich/TestQueryDNS.java
index 65c1a50..593ff08 100644
--- 
a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/enrich/TestQueryDNS.java
+++ 
b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/enrich/TestQueryDNS.java
@@ -74,7 +74,7 @@ public class TestQueryDNS  {
 public void

nifi git commit: NIFI-2505: - Updating the user identity field in the ActionDTO.

2016-08-09 Thread bbende 
Repository: nifi
Updated Branches:
  refs/heads/master aae632560 -> ae8045d99


NIFI-2505: - Updating the user identity field in the ActionDTO.

This closes #800.

Signed-off-by: Bryan Bende 


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

Branch: refs/heads/master
Commit: ae8045d99bcb5edf695c96d07850282208f31e0f
Parents: aae6325
Author: Matt Gilman 
Authored: Fri Aug 5 16:35:13 2016 -0400
Committer: Bryan Bende 
Committed: Tue Aug 9 13:07:50 2016 -0400

--
 .../org/apache/nifi/web/api/dto/action/ActionDTO.java | 14 +++---
 .../java/org/apache/nifi/web/api/dto/DtoFactory.java  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/ae8045d9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
index 1332f5c..8479d49 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
@@ -32,7 +32,7 @@ import java.util.Date;
 public class ActionDTO {
 
 private Integer id;
-private String userDn;
+private String userIdentity;
 private Date timestamp;
 
 private String sourceId;
@@ -58,17 +58,17 @@ public class ActionDTO {
 }
 
 /**
- * @return user dn who perform this action
+ * @return user identity who perform this action
  */
 @ApiModelProperty(
-value = "The dn of the user that performed the action."
+value = "The identity of the user that performed the action."
 )
-public String getUserDn() {
-return userDn;
+public String getUserIdentity() {
+return userIdentity;
 }
 
-public void setUserDn(String userDn) {
-this.userDn = userDn;
+public void setUserIdentity(String userIdentity) {
+this.userIdentity = userIdentity;
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/nifi/blob/ae8045d9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
index 93afccf..9c54494 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
@@ -222,7 +222,7 @@ public final class DtoFactory {
 actionDto.setSourceName(action.getSourceName());
 actionDto.setSourceType(action.getSourceType().name());
 actionDto.setTimestamp(action.getTimestamp());
-actionDto.setUserDn(action.getUserIdentity());
+actionDto.setUserIdentity(action.getUserIdentity());
 actionDto.setOperation(action.getOperation().name());
 
actionDto.setActionDetails(createActionDetailsDto(action.getActionDetails()));
 
actionDto.setComponentDetails(createComponentDetailsDto(action.getComponentDetails()));

nifi git commit: NIFI-2237: - Reorganizing the refactored REST endpoints. - Tweaking message text.

2016-08-09 Thread bbende 
Repository: nifi
Updated Branches:
  refs/heads/master cb76e67a3 -> aae632560


NIFI-2237: - Reorganizing the refactored REST endpoints. - Tweaking message 
text.

This closes #788.

Signed-off-by: Bryan Bende 


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

Branch: refs/heads/master
Commit: aae6325603aa191173b6f34545bf7111c960be6e
Parents: cb76e67
Author: Matt Gilman 
Authored: Thu Aug 4 10:37:42 2016 -0400
Committer: Bryan Bende 
Committed: Tue Aug 9 12:04:31 2016 -0400

--
 .../nifi-web/nifi-web-api/pom.xml   |   2 +-
 .../nifi/web/api/ApplicationResource.java   |   2 +-
 .../nifi/web/api/ProcessGroupResource.java  |   7 +-
 .../apache/nifi/web/api/SnippetResource.java|   6 +-
 .../src/main/resources/templates/index.html.hbs | 157 ++-
 5 files changed, 128 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/aae63256/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index 9024835..4a2637e 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -78,7 +78,7 @@
 
 The Rest Api provides programmatic 
access to command and control a NiFi instance in real time. Start and 
 stop processors, monitor queues, 
query provenance data, and more. Each endpoint below includes a description,
-definitions of the expected input 
and output, potential response codes, and the authorities required
+definitions of the expected input 
and output, potential response codes, and the authorizations required
 to invoke each service.
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/aae63256/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
index aa057fe..aeffa89 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
@@ -95,7 +95,7 @@ public abstract class ApplicationResource {
 public static final String PROXY_PORT_HTTP_HEADER = "X-ProxyPort";
 public static final String PROXY_CONTEXT_PATH_HTTP_HEADER = 
"X-ProxyContextPath";
 
-protected static final String NON_GUARANTEED_ENDPOINT = "Note: This 
endpoint is subject to change as the NiFi and it's REST API evolve.";
+protected static final String NON_GUARANTEED_ENDPOINT = "Note: This 
endpoint is subject to change as NiFi and it's REST API evolve.";
 
 private static final Logger logger = 
LoggerFactory.getLogger(ApplicationResource.class);
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/aae63256/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
index 0ececa1..d9055c9 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
+++

[nifi] Git Push Summary

2016-08-09 Thread jpercivall 
Repository: nifi
Updated Tags:  refs/tags/rel/nifi-1.0.0-BETA-official [created] dfcd1cb58

[jira] [Commented] (MINIFI-63) Provide service enablement for MiNiFi instances on systems

2016-08-09 Thread Aldrin Piri (JIRA) 

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

Aldrin Piri commented on MINIFI-63:
---

This is inclusive of the config.yml file as well as minifi.properties.

> Provide service enablement for MiNiFi instances on systems
> --
>
> Key: MINIFI-63
> URL: https://issues.apache.org/jira/browse/MINIFI-63
> Project: Apache NiFi MiNiFi
>  Issue Type: New Feature
>  Components: Agent Configuration/Installation
>Reporter: Aldrin Piri
>Assignee: Aldrin Piri
>
> It would be helpful to establish a basis for installing instances as a 
> service on host systems.  Initially, this can target Linux environments.



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

svn commit: r1755605 - /nifi/site/trunk/download.html

2016-08-09 Thread jpercivall 
Author: jpercivall
Date: Tue Aug  9 14:08:45 2016
New Revision: 1755605

URL: http://svn.apache.org/viewvc?rev=1755605=rev
Log:
Adding links to sha256 for 1.0.0-BETA and 0.7.0

Modified:
nifi/site/trunk/download.html

Modified: nifi/site/trunk/download.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/download.html?rev=1755605=1755604=1755605=diff
==
--- nifi/site/trunk/download.html (original)
+++ nifi/site/trunk/download.html Tue Aug  9 14:08:45 2016
@@ -125,15 +125,15 @@
   
   Sources:
   
-  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip;>nifi-1.0.0-BETA-source-release.zip
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.sha1;>sha1
 )
+  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip;>nifi-1.0.0-BETA-source-release.zip
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.sha256;>sha256
 )
   
   
   
   Binaries
   
-  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz;>nifi-1.0.0-BETA-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.sha1;>sha1
 )
+  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz;>nifi-1.0.0-BETA-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.sha256;>sha256
 )
 
-  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip;>nifi-1.0.0-BETA-bin.zip
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.sha1;>sha1
 )
+  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip;>nifi-1.0.0-BETA-bin.zip
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.sha256;>sha256
 )
   
   
   https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.0.0-BETA;>Release
 Notes
@@ -147,15 +147,15 @@
   
   Sources:
   
-  https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.0/nifi-0.7.0-source-release.zip;>nifi-0.7.0-source-release.zip
 ( https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.sha1;>sha1
 )
+  https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.0/nifi-0.7.0-source-release.zip;>nifi-0.7.0-source-release.zip
 ( https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.sha256;>sha256
 )
   
   
   
   Binaries
   
-  https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.0/nifi-0.7.0-bin.tar.gz;>nifi-0.7.0-bin.tar.gz
 (

nifi-site git commit: Adding link to sha256 for 1.0.0-BETA and 0.7.0

2016-08-09 Thread jpercivall 
Repository: nifi-site
Updated Branches:
  refs/heads/master 1d3df4b6e -> e19bccecb


Adding link to sha256 for 1.0.0-BETA and 0.7.0


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

Branch: refs/heads/master
Commit: e19bccecb36f07abee8ddb69696ebb2140430516
Parents: 1d3df4b
Author: Joseph Percivall 
Authored: Tue Aug 9 10:04:31 2016 -0400
Committer: Joseph Percivall 
Committed: Tue Aug 9 10:04:31 2016 -0400

--
 src/pages/html/download.hbs | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/e19bccec/src/pages/html/download.hbs
--
diff --git a/src/pages/html/download.hbs b/src/pages/html/download.hbs
index f70a01a..1e732a8 100644
--- a/src/pages/html/download.hbs
+++ b/src/pages/html/download.hbs
@@ -28,15 +28,15 @@ title: Apache NiFi Downloads
   
   Sources:
   
-  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip;>nifi-1.0.0-BETA-source-release.zip
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.sha1;>sha1
 )
+  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip;>nifi-1.0.0-BETA-source-release.zip
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-source-release.zip.sha256;>sha256
 )
   
   
   
   Binaries
   
-  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz;>nifi-1.0.0-BETA-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.sha1;>sha1
 )
+  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz;>nifi-1.0.0-BETA-bin.tar.gz
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.tar.gz.sha256;>sha256
 )
 
-  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip;>nifi-1.0.0-BETA-bin.zip
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.sha1;>sha1
 )
+  https://www.apache.org/dyn/closer.lua?path=/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip;>nifi-1.0.0-BETA-bin.zip
 ( https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.asc;>asc,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.md5;>md5,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.sha1;>sha1,
 https://www.apache.org/dist/nifi/1.0.0-BETA/nifi-1.0.0-BETA-bin.zip.sha256;>sha256
 )
   
   
   https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.0.0-BETA;>Release
 Notes
@@ -50,15 +50,15 @@ title: Apache NiFi Downloads
   
   Sources:
   
-  https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.0/nifi-0.7.0-source-release.zip;>nifi-0.7.0-source-release.zip
 ( https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.asc;>asc,
 https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.md5;>md5,
 https://www.apache.org/dist/nifi/0.7.0/nifi-0.7.0-source-release.zip.sha1;>sha1
 )
+