[jira] [Assigned] (MINIFI-15) Create Config Format, Documentation and Transformer

[Joseph Percivall (JIRA)]

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

Joseph Percivall reassigned MINIFI-15:
--

Assignee: Joseph Percivall

> Create Config Format, Documentation and Transformer
> ---
>
> Key: MINIFI-15
> URL: https://issues.apache.org/jira/browse/MINIFI-15
> Project: Apache NiFi MiNiFi
>  Issue Type: Sub-task
>  Components: Processing Configuration
>Reporter: Joseph Percivall
>Assignee: Joseph Percivall
> Fix For: 0.0.1
>
>
> To configure MiNiFi there needs to be a standard format for sending 
> information to the config change listeners. This needs to be fleshed out and 
> documented. 
> Also there should be a config transformer to facilitate going from the config 
> file to nifi.properties and flow.xml.gz.



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

[jira] [Commented] (MINIFI-36) Create mechanism that supports pull semantics for configuration changes

[Bryan Rosander (JIRA)]

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

Bryan Rosander commented on MINIFI-36:
--

Once NIFI-1820 is implemented, these pull semantics might be able to be 
implemented via an extension to the Site To Site protocol.  This would 
hopefully allow the same channel(s) used for sending data to the NiFi cluster 
to be used to be notified of configuration changes.

> Create mechanism that supports pull semantics for configuration changes
> ---
>
> Key: MINIFI-36
> URL: https://issues.apache.org/jira/browse/MINIFI-36
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>  Components: Processing Configuration
>Reporter: Aldrin Piri
> Fix For: 0.1.0
>
>
> Much like the efforts of MINIFI-12, it would also be convenient for a 
> configuration in which an instance could reach out to a defined endpoint to 
> poll for changes and bring those into the associated bootstrap process to 
> activate a change in processing.
> Considerations include the mechanism in which polling occurs and how this is 
> exposed.  A way of knowing if the flow is new, likely bound to the efforts of 
> MINIFI-35.  In one case, it is conceivable that an instance could reach out 
> to a NiFi instance and its associated API to receive configuration. 



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

[jira] [Commented] (MINIFI-34) Establish build system for MiNiFi C++

[ASF GitHub Bot (JIRA)]

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

ASF GitHub Bot commented on MINIFI-34:
--

GitHub user apiri opened a pull request:

https://github.com/apache/nifi-minifi-cpp/pull/14

MINIFI-34 Establishing CMake build system to provide build functional…

MINIFI-34 Establishing CMake build system to provide build functionality 
equivalent to pre-existing Makefile.

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

$ git pull https://github.com/apiri/nifi-minifi-cpp MINIFI-34-CMAKE

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

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

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

This closes #14


commit a358693c23252e427031a3ef4d25281b15116cb7
Author: Aldrin Piri 
Date:   2016-05-05T21:32:57Z

MINIFI-34 Establishing CMake build system to provide build functionality 
equivalent to pre-existing Makefile.




> Establish build system for MiNiFi C++
> -
>
> Key: MINIFI-34
> URL: https://issues.apache.org/jira/browse/MINIFI-34
> Project: Apache NiFi MiNiFi
>  Issue Type: Task
>  Components: Build
>Reporter: Aldrin Piri
>Assignee: Aldrin Piri
>  Labels: C++, native
>
> Given the need to run on varied and disparate environments, a build procedure 
> is imperative in ensuring consistent project compilation and in assisting 
> folks in contributing.  There are a few tools that go beyond a Makefile to 
> aid in this process.  Among these are Autotools, CMake, and Scons
> Key things to keep in mind are the need to support deployment and development 
> in Windows, Linux and OS X.  This likely precludes Autotools without 
> significant effort to work in Windows environments. 



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

nifi git commit: NIFI-2822 - pass the JWT Authorization token i. This closes #1065

[mcgilman]

Repository: nifi
Updated Branches:
  refs/heads/master 886823599 -> 30f008d67


NIFI-2822 - pass the JWT Authorization token i. This closes #1065


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

Branch: refs/heads/master
Commit: 30f008d6764ac9f41c9bbdeec723ed09ac5c44a6
Parents: 8868235
Author: Yolanda M. Davis 
Authored: Mon Sep 26 12:11:28 2016 -0400
Committer: Matt Gilman 
Committed: Mon Sep 26 15:16:32 2016 -0400

--
 .../src/main/webapp/WEB-INF/jsp/index.jsp   | 2 ++
 .../nifi-jolt-transform-json-ui/src/main/webapp/app/app.js  | 9 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/30f008d6/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
index 96eda99..26ba321 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -31,6 +31,8 @@
 
 
 
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/30f008d6/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
index 67c440c..2e9cf0c 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
@@ -17,7 +17,12 @@
 
 'use strict';
 
-var AppRun =  function($rootScope,$state){
+var AppRun =  function($rootScope,$state,$http){
+
+if (nf.Storage.hasItem('jwt')) {
+var token = nf.Storage.getItem('jwt');
+$http.defaults.headers.common.Authorization = 'Bearer ' + token;
+}
 
 $rootScope.$on('$stateChangeError', function(event, toState, toParams, 
fromState, fromParams, error){
 event.preventDefault();
@@ -35,7 +40,7 @@ var AppConfig = function ($urlRouterProvider) {
 
 };
 
-AppRun.$inject = ['$rootScope','$state'];
+AppRun.$inject = ['$rootScope','$state','$http'];
 
 AppConfig.$inject = ['$urlRouterProvider'];
 

nifi git commit: Backport NIFI-2728 to 0.x tree. This closes #1061

[mcgilman]

Repository: nifi
Updated Branches:
  refs/heads/0.x 5ddf1d70b -> 4e6f9d396


Backport NIFI-2728 to 0.x tree. This closes #1061


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

Branch: refs/heads/0.x
Commit: 4e6f9d39652f78db5840129ea5d49eddffb62e0e
Parents: 5ddf1d7
Author: Andre F de Miranda 
Authored: Mon Sep 26 23:40:23 2016 +1000
Committer: Matt Gilman 
Committed: Mon Sep 26 14:49:44 2016 -0400

--
 .travis.yml | 31 +--
 pom.xml |  2 +-
 2 files changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/4e6f9d39/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index b5c02d0..4ffef5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,18 @@
+# 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.
+
 language: java
 
 os:
@@ -8,12 +23,24 @@ jdk:
   - oraclejdk7
   - openjdk7
 
+# Caches mvn repository in order to speed upbuilds
+cache:
+  directories:
+- $HOME/.m2
+- $HOME/.npm
+
 # before_install aids in a couple workarounds for issues within the Travis-CI 
environment
 #   1. Workaround for buffer overflow issues with OpenJDK versions of java as 
per https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165135711
 #   2. Workaround for non-existent Maven repository as per: 
https://github.com/travis-ci/travis-ci/issues/4629#issuecomment-131214465
 before_install:
   - sudo hostname "$(hostname | cut -c1-63)"
-  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" 
/etc/hosts | sudo tee /etc/hosts
+  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" 
/etc/hosts > /tmp/hosts
+  - sudo mv /tmp/hosts /etc/hosts
   - sed -i.bak -e 
's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g'
 ~/.m2/settings.xml
+#  - echo "MAVEN_OPTS='-Xmx2g -XX:+UseG1GC'" > ~/.mavenrc
+  - mvn apache-rat:check
 
-script: mvn clean install -Pcontrib-check
+install:
+  - mvn -q -DskipTests=true clean install
+script:
+  - mvn -Pcontrib-check verify

http://git-wip-us.apache.org/repos/asf/nifi/blob/4e6f9d39/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5e71b92..ac4f0c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1302,7 +1302,7 @@ language governing permissions and limitations under the 
License. -->
 2.18
 
 
true
--Xmx1G 
-Djava.net.preferIPv4Stack=true
+-Xmx2G 
-Djava.net.preferIPv4Stack=true
 
 
 

[jira] [Commented] (MINIFI-109) Add ExecuteProcess processor

[ASF GitHub Bot (JIRA)]

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

ASF GitHub Bot commented on MINIFI-109:
---

GitHub user benqiu2016 opened a pull request:

https://github.com/apache/nifi-minifi-cpp/pull/13

MINIFI-109: Add ExecuteProcess



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

$ git pull https://github.com/benqiu2016/nifi-minifi-cpp 
excecute_process_merge

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

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

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

This closes #13


commit 2e1b7599d6f59d014587c8db3890ac0843942a99
Author: Bin Qiu 
Date:   2016-09-26T17:42:54Z

MINIFI-109: Add ExecuteProcess




> Add ExecuteProcess processor
> 
>
> Key: MINIFI-109
> URL: https://issues.apache.org/jira/browse/MINIFI-109
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>  Components: C++
>Affects Versions: cpp-1.0.0
>Reporter: bqiu
>Assignee: bqiu
>Priority: Minor
> Fix For: cpp-1.0.0
>
>
> Add ExecuteProcess processor



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

nifi git commit: NIFI-2803 The pagination of GenerateTableFetch has a sort bug.

[mattyb149]

Repository: nifi
Updated Branches:
  refs/heads/master 446cd4470 -> 886823599


NIFI-2803 The pagination of GenerateTableFetch has a sort bug.

Signed-off-by: Matt Burgess 

NIFI-2803: Updated unit tests for GenerateTableFetch

Signed-off-by: Matt Burgess 

This closes #1052


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

Branch: refs/heads/master
Commit: 88682359937afbc0e48df769c296606316c7b1d0
Parents: 446cd44
Author: Byunghwa Yun 
Authored: Thu Sep 22 19:00:16 2016 +0900
Committer: Matt Burgess 
Committed: Mon Sep 26 12:05:16 2016 -0400

--
 .../processors/standard/GenerateTableFetch.java |  2 +-
 .../processors/standard/TestGenerateTableFetch.java | 16 
 2 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/88682359/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
index f1c86f8..bff1024 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
@@ -230,7 +230,7 @@ public class GenerateTableFetch extends 
AbstractDatabaseFetchProcessor {
 
 Integer limit = partitionSize == 0 ? null : partitionSize;
 Integer offset = partitionSize == 0 ? null : i * partitionSize;
-final String query = dbAdapter.getSelectStatement(tableName, 
columnNames, StringUtils.join(maxValueClauses, " AND "), null, limit, offset);
+final String query = dbAdapter.getSelectStatement(tableName, 
columnNames, whereClause, StringUtils.join(maxValueColumnNameList, ", "), 
limit, offset);
 sqlFlowFile = session.create();
 sqlFlowFile = session.write(sqlFlowFile, out -> {
 out.write(query.getBytes());

http://git-wip-us.apache.org/repos/asf/nifi/blob/88682359/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGenerateTableFetch.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGenerateTableFetch.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGenerateTableFetch.java
index 3b9f3a3..8a8aa01 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGenerateTableFetch.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGenerateTableFetch.java
@@ -128,7 +128,7 @@ public class TestGenerateTableFetch {
 runner.assertAllFlowFilesTransferred(REL_SUCCESS, 1);
 MockFlowFile flowFile = 
runner.getFlowFilesForRelationship(REL_SUCCESS).get(0);
 String query = new String(flowFile.toByteArray());
-assertEquals("SELECT * FROM TEST_QUERY_DB_TABLE FETCH NEXT 1 ROWS 
ONLY", query);
+assertEquals("SELECT * FROM TEST_QUERY_DB_TABLE ORDER BY ID FETCH NEXT 
1 ROWS ONLY", query);
 ResultSet resultSet = stmt.executeQuery(query);
 // Should be three records
 assertTrue(resultSet.next());
@@ -153,7 +153,7 @@ public class TestGenerateTableFetch {
 // Verify first flow file's contents
 flowFile = runner.getFlowFilesForRelationship(REL_SUCCESS).get(0);
 query = new String(flowFile.toByteArray());
-assertEquals("SELECT * FROM TEST_QUERY_DB_TABLE WHERE ID > 2 FETCH 
NEXT 2 ROWS ONLY", query);
+assertEquals("SELECT * FROM TEST_QUERY_DB_TABLE WHERE ID > 2 ORDER BY 
ID FETCH NEXT 2 ROWS ONLY", query);
 resultSet = stmt.executeQuery(query);
 // Should be two records
 assertTrue(resultSet.next());
@@ -163,7 +163,7 @@ public class TestGenerateTableFetch {
 // Verify second flow file's contents
 flowFile 

[2/2] nifi git commit: NIFI-2816 - Clean typos across the code

[pvillard]

NIFI-2816 - Clean typos across the code

This closes #1057.


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

Branch: refs/heads/master
Commit: 446cd4470251e6a400fde14eca69db8b10969d40
Parents: 1b88552
Author: Andre F de Miranda 
Authored: Sat Sep 24 02:32:53 2016 +1000
Committer: Pierre Villard 
Committed: Mon Sep 26 17:47:31 2016 +0200

--
 .../nifi/expression/AttributeExpression.java|   2 +-
 .../notification/NotificationService.java   |   2 +-
 .../nifi/security/util/CertificateUtils.java|   2 +-
 .../nifi/io/nio/AbstractChannelReader.java  |   2 +-
 .../src/main/asciidoc/administration-guide.adoc |   2 +-
 .../src/main/asciidoc/developer-guide.adoc  |   4 +-
 .../repository/FlowFileRepository.java  |   2 +-
 .../apache/nifi/util/MockProcessSession.java|   2 +-
 .../nifi/amqp/processors/AMQPPublisher.java |   2 +-
 ...AbstractAWSCredentialsProviderProcessor.java |   4 +-
 .../aws/dynamodb/AbstractDynamoDBProcessor.java |   2 +-
 .../AbstractKinesisFirehoseProcessor.java   |   2 +-
 .../aws/lambda/AbstractAWSLambdaProcessor.java  |   2 +-
 .../aws/sns/AbstractSNSProcessor.java   |   2 +-
 .../aws/sqs/AbstractSQSProcessor.java   |   2 +-
 .../nifi/processors/aws/s3/AbstractS3IT.java|   2 +-
 .../nifi/processors/aws/s3/ITPutS3Object.java   |   2 +-
 .../nifi/couchbase/CouchbaseClusterService.java |   2 +-
 ...ctElasticsearchTransportClientProcessor.java |   4 +-
 .../email/AbstractEmailProcessor.java   |   4 +-
 .../processors/evtx/parser/BinaryReader.java|   4 +-
 .../apache/nifi/web/api/dto/BulletinDTO.java|   2 +-
 .../web/api/dto/ControllerConfigurationDTO.java |   4 +-
 .../apache/nifi/web/api/dto/ControllerDTO.java  |   2 +-
 .../nifi/web/api/dto/ControllerServiceDTO.java  |   2 +-
 ...ontrollerServiceReferencingComponentDTO.java |   4 +-
 .../nifi/web/api/dto/DocumentedTypeDTO.java |   2 +-
 .../nifi/web/api/dto/ProcessGroupDTO.java   |   2 +-
 .../apache/nifi/web/api/dto/ProcessorDTO.java   |   2 +-
 .../nifi/web/api/dto/PropertyDescriptorDTO.java |   2 +-
 .../web/api/dto/status/ControllerStatusDTO.java |   2 +-
 .../nifi/web/api/entity/ConnectionsEntity.java  |   4 +-
 .../nifi/web/api/entity/ProcessGroupEntity.java |   2 +-
 .../apache/nifi/documentation/DocGenerator.java |   8 +-
 .../nifi/authorization/FileAuthorizerTest.java  |   2 +-
 .../http/StandardHttpResponseMerger.java|   8 +-
 .../ConnectionStatusEndpiontMerger.java |  86 -
 .../ConnectionStatusEndpointMerger.java |  86 +
 .../endpoints/DropRequestEndpiontMerger.java| 125 ---
 .../endpoints/DropRequestEndpointMerger.java| 125 +++
 .../nifi/controller/ReportingTaskNode.java  |   2 +-
 .../service/ControllerServiceState.java |   2 +-
 .../controller/StandardFlowSynchronizer.java|   2 +-
 .../reporting/AbstractReportingTaskNode.java|   2 +-
 .../repository/FileSystemRepository.java|   2 +-
 .../java/org/apache/nifi/engine/FlowEngine.java |   2 +-
 .../nifi/authorization/AuthorizableLookup.java  |   4 +-
 .../StandardAuthorizableLookup.java |   4 +-
 .../web/dao/impl/StandardReportingTaskDAO.java  |   2 +-
 .../util/NiFiTestLoginIdentityProvider.java |   2 +-
 .../apache/nifi/web/DownloadableContent.java|   2 +-
 .../nifi/web/ContentViewerController.java   |   4 +-
 .../hadoop/util/ByteFilteringOutputStream.java  |   4 +-
 .../hive/AuthenticationFailedException.java |   3 -
 .../ignite/AbstractIgniteProcessor.java |   2 +-
 .../additionalDetails.html  |   4 +-
 .../additionalDetails.html  |   2 +-
 .../processors/kafka/test/EmbeddedKafka.java|   4 +-
 .../processors/kafka/test/EmbeddedKafka.java|   4 +-
 .../processors/kafka/pubsub/ConsumerLease.java  |   2 +-
 .../additionalDetails.html  |   2 +-
 .../processors/kafka/test/EmbeddedKafka.java|   4 +-
 .../additionalDetails.html  |   2 +-
 .../additionalDetails.html  |   2 +-
 .../nifi/processors/twitter/LocationUtil.java   |   2 +-
 .../additionalDetails.html  |   4 +-
 .../standard/ConvertCharacterSet.java   |   2 +-
 .../processors/standard/ConvertJSONToSQL.java   |   4 +-
 .../nifi/processors/standard/ExtractText.java   |  14 +--
 .../nifi/processors/standard/FetchFile.java |   2 +-
 .../processors/standard/GetFileTransfer.java|   2 +-
 .../nifi/processors/standard/util/FTPUtils.java |   4 +-
 .../standard/util/crypto/bcrypt/BCrypt.java |   2 +-
 

[1/2] nifi git commit: NIFI-2816 - Clean typos across the code

[pvillard]

Repository: nifi
Updated Branches:
  refs/heads/master 1b88552b4 -> 446cd4470


http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
index 84bf7b3..33c162a 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
@@ -392,8 +392,8 @@ class StandardAuthorizableLookup implements 
AuthorizableLookup {
 }
 
 @Override
-public Authorizable getControllerServiceReferencingComponent(String 
controllerSeriveId, String id) {
-final ControllerServiceNode controllerService = 
controllerServiceDAO.getControllerService(controllerSeriveId);
+public Authorizable getControllerServiceReferencingComponent(String 
controllerServiceId, String id) {
+final ControllerServiceNode controllerService = 
controllerServiceDAO.getControllerService(controllerServiceId);
 final ControllerServiceReference referencingComponents = 
controllerService.getReferences();
 final ConfiguredComponent reference = 
findControllerServiceReferencingComponent(referencingComponents, id);
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
index e3cf89b..ac3d9d5 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
@@ -276,7 +276,7 @@ public class StandardReportingTaskDAO extends ComponentDAO 
implements ReportingT
 reportingTask.setName(name);
 }
 if (isNotNull(schedulingPeriod)) {
-reportingTask.setScheduldingPeriod(schedulingPeriod);
+reportingTask.setSchedulingPeriod(schedulingPeriod);
 }
 if (isNotNull(annotationData)) {
 reportingTask.setAnnotationData(annotationData);

http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java
index 967f652..508a0d1 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java
@@ -41,7 +41,7 @@ public class NiFiTestLoginIdentityProvider implements 
LoginIdentityProvider {
  */
 public NiFiTestLoginIdentityProvider() {
 users = new HashMap<>();
-users.put("user@nifi", "whateve");
+users.put("user@nifi", "whatever");
 users.put("unregistered-user@nifi", "password");
 }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
 

nifi git commit: NIFI-2796: - Fixing incorrect documentation for the cluster summary endpoint.

[aldrin]

Repository: nifi
Updated Branches:
  refs/heads/master be85d9ddf -> 1b88552b4


NIFI-2796:
- Fixing incorrect documentation for the cluster summary endpoint.

This closes #1063.

Signed-off-by: Aldrin Piri 


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

Branch: refs/heads/master
Commit: 1b88552b4677ceb1dfef0119c9c5a0306761ec95
Parents: be85d9d
Author: Matt Gilman 
Authored: Mon Sep 26 10:19:54 2016 -0400
Committer: Aldrin Piri 
Committed: Mon Sep 26 11:43:33 2016 -0400

--
 .../org/apache/nifi/web/api/entity/ClusteSummaryEntity.java  | 2 +-
 .../src/main/java/org/apache/nifi/web/api/FlowResource.java  | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/1b88552b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusteSummaryEntity.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusteSummaryEntity.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusteSummaryEntity.java
index f3f4c34..d263120 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusteSummaryEntity.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ClusteSummaryEntity.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 /**
  * A serialized representation of this class can be placed in the entity body 
of a request or response to or from the API. This particular entity holds a 
reference to a ClusterSummaryDTO.
  */
-@XmlRootElement(name = "controllerStatusEntity")
+@XmlRootElement(name = "clusterSummaryEntity")
 public class ClusteSummaryEntity extends Entity {
 
 private ClusterSummaryDTO clusterSummary;

http://git-wip-us.apache.org/repos/asf/nifi/blob/1b88552b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.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/FlowResource.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
index dd5a220..c97bb71 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
@@ -759,9 +759,9 @@ public class FlowResource extends ApplicationResource {
 }
 
 /**
- * Retrieves the status for this NiFi.
+ * Retrieves the cluster summary for this NiFi.
  *
- * @return A controllerStatusEntity.
+ * @return A clusterSummaryEntity.
  * @throws InterruptedException if interrupted
  */
 @GET
@@ -769,8 +769,8 @@ public class FlowResource extends ApplicationResource {
 @Produces(MediaType.APPLICATION_JSON)
 @Path("cluster/summary")
 @ApiOperation(
-value = "Gets the current status of this NiFi",
-response = ControllerStatusEntity.class,
+value = "The cluster summary for this NiFi",
+response = ClusteSummaryEntity.class,
 authorizations = {
 @Authorization(value = "Read - /flow", type = "")
 }

nifi git commit: Backport NIFI-2814 to 0.x tree

[aldrin]

Repository: nifi
Updated Branches:
  refs/heads/0.x 560a835ef -> 5ddf1d70b


Backport NIFI-2814 to 0.x tree

This closes #1062.

Signed-off-by: Aldrin Piri 


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

Branch: refs/heads/0.x
Commit: 5ddf1d70b5ad245b188fb569bdd0f08afd76c23c
Parents: 560a835
Author: Andre F de Miranda 
Authored: Mon Sep 26 23:08:51 2016 +1000
Committer: Aldrin Piri 
Committed: Mon Sep 26 11:32:18 2016 -0400

--
 appveyor.yml | 15 +++
 pom.xml  |  2 --
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/5ddf1d70/appveyor.yml
--
diff --git a/appveyor.yml b/appveyor.yml
index 342c9a1..d51e92c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,18 @@
+# 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.
+
 version: '0.7.0-SNAPSHOT-{build}'
 os: Windows Server 2012
 environment:

http://git-wip-us.apache.org/repos/asf/nifi/blob/5ddf1d70/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 131fbcc..5e71b92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1582,8 +1582,6 @@ language governing permissions and limitations under the 
License. -->
 nb-configuration.xml 
 nbactions.xml 
 DEPENDENCIES 
-.travis.yml 
-appveyor.yml 
 
 
 

nifi git commit: NIFI-2814 - Add ASF header to AppVeyor settings file and adjust apache-rat accordingly

[aldrin]

Repository: nifi
Updated Branches:
  refs/heads/master 44d4b882b -> be85d9ddf


NIFI-2814 - Add ASF header to AppVeyor settings file and adjust apache-rat 
accordingly

This closes #1058.

Signed-off-by: Aldrin Piri 


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

Branch: refs/heads/master
Commit: be85d9ddff1a3c39631718d936afdf5a6199c335
Parents: 44d4b88
Author: Andre F de Miranda 
Authored: Sat Sep 24 14:43:58 2016 +1000
Committer: Aldrin Piri 
Committed: Mon Sep 26 11:30:44 2016 -0400

--
 appveyor.yml | 15 +++
 pom.xml  |  2 --
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/be85d9dd/appveyor.yml
--
diff --git a/appveyor.yml b/appveyor.yml
index ed3a053..c7aa2f2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,18 @@
+# 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.
+
 version: '1.0.0-SNAPSHOT-{build}'
 os: Windows Server 2012
 environment:

http://git-wip-us.apache.org/repos/asf/nifi/blob/be85d9dd/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0f1d088..22a35cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1716,8 +1716,6 @@ language governing permissions and limitations under the 
License. -->
 nb-configuration.xml 
 nbactions.xml 
 DEPENDENCIES 
-.travis.yml 
-appveyor.yml 
 
 
 

[jira] [Commented] (MINIFI-81) Adjust usage information for minifi-toolkit executable

[ASF GitHub Bot (JIRA)]

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

ASF GitHub Bot commented on MINIFI-81:
--

Github user asfgit closed the pull request at:

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


> Adjust usage information for minifi-toolkit executable
> --
>
> Key: MINIFI-81
> URL: https://issues.apache.org/jira/browse/MINIFI-81
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>  Components: utilities
>Affects Versions: 0.0.1
>Reporter: Aldrin Piri
>Assignee: Joseph Percivall
>Priority: Minor
> Fix For: 0.1.0
>
>
> Currently the usage information is derived from the underlying Java class.  
> This is more verbose than needed and should be handled by the wrapping script 
> invoking that command.



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

nifi-minifi git commit: MINIFI-81 Adding a check for a valid command to the config.sh toolkit script

[aldrin]

Repository: nifi-minifi
Updated Branches:
  refs/heads/master e6f6b0665 -> 974c536ca


MINIFI-81 Adding a check for a valid command to the config.sh toolkit script

This closes #39.

Signed-off-by: Aldrin Piri 


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

Branch: refs/heads/master
Commit: 974c536cab73351471e770db3cc8885c1e76c2c0
Parents: e6f6b06
Author: Joseph Percivall 
Authored: Fri Sep 23 11:11:41 2016 -0400
Committer: Aldrin Piri 
Committed: Mon Sep 26 11:24:16 2016 -0400

--
 .../src/main/resources/config.sh   | 17 +++--
 .../minifi/toolkit/configuration/ConfigMain.java   |  8 
 2 files changed, 15 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/974c536c/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh
--
diff --git 
a/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh 
b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh
index cee8a71..ba29fdc 100755
--- a/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh
+++ b/minifi-toolkit/minifi-toolkit-assembly/src/main/resources/config.sh
@@ -119,5 +119,18 @@ run() {
 }
 
 
-init "$1"
-run "$@"
\ No newline at end of file
+case "$1" in
+transform|validate)
+init "$1"
+run "$@"
+;;
+*)
+echo ""
+echo "MiNiFi toolkit Usage, valid commands include: 
{transform|validate}"
+echo "transform: Transform template xml into MiNiFi config YAML"
+echo "config.sh transform INPUT_FILE OUTPUT_FILE"
+echo "validate: Validate config YAML"
+echo "config.sh validate INPUT_FILE"
+echo ""
+;;
+esac
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/974c536c/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java
--
diff --git 
a/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java
 
b/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java
index e44b5d7..74e1f7f 100644
--- 
a/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java
@@ -85,8 +85,6 @@ public class ConfigMain {
 public static void printValidateUsage() {
 System.out.println("Validate Usage:");
 System.out.println();
-System.out.print("java ");
-System.out.print(ConfigMain.class.getCanonicalName());
 System.out.println(" validate INPUT_FILE");
 System.out.println();
 }
@@ -128,8 +126,6 @@ public class ConfigMain {
 public static void printTransformUsage() {
 System.out.println("Transform Usage:");
 System.out.println();
-System.out.print("java ");
-System.out.print(ConfigMain.class.getCanonicalName());
 System.out.println(" transform INPUT_FILE OUTPUT_FILE");
 System.out.println();
 }
@@ -313,10 +309,6 @@ public class ConfigMain {
 public void printUsage() {
 System.out.println("Usage:");
 System.out.println();
-System.out.print("java ");
-System.out.print(ConfigMain.class.getCanonicalName());
-System.out.println("  options");
-System.out.println();
 System.out.println("Valid commands include:");
 commandMap.forEach((s, command) -> System.out.println(s + ": " + 
command.description));
 }

[jira] [Commented] (MINIFI-81) Adjust usage information for minifi-toolkit executable

[ASF GitHub Bot (JIRA)]

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

ASF GitHub Bot commented on MINIFI-81:
--

Github user apiri commented on a diff in the pull request:

https://github.com/apache/nifi-minifi/pull/39#discussion_r80500315
  
--- Diff: 
minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java
 ---
@@ -85,8 +85,6 @@ public static void main(String[] args) {
 public static void printValidateUsage() {
 System.out.println("Validate Usage:");
 System.out.println();
-System.out.print("java ");
--- End diff --

fair enough, will merge 


> Adjust usage information for minifi-toolkit executable
> --
>
> Key: MINIFI-81
> URL: https://issues.apache.org/jira/browse/MINIFI-81
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>  Components: utilities
>Affects Versions: 0.0.1
>Reporter: Aldrin Piri
>Assignee: Joseph Percivall
>Priority: Minor
> Fix For: 0.1.0
>
>
> Currently the usage information is derived from the underlying Java class.  
> This is more verbose than needed and should be handled by the wrapping script 
> invoking that command.



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

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-376 [deleted] 4691b5c67

[jira] [Commented] (MINIFI-81) Adjust usage information for minifi-toolkit executable

[ASF GitHub Bot (JIRA)]

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

ASF GitHub Bot commented on MINIFI-81:
--

Github user JPercivall commented on a diff in the pull request:

https://github.com/apache/nifi-minifi/pull/39#discussion_r80488336
  
--- Diff: 
minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMain.java
 ---
@@ -85,8 +85,6 @@ public static void main(String[] args) {
 public static void printValidateUsage() {
 System.out.println("Validate Usage:");
 System.out.println();
-System.out.print("java ");
--- End diff --

Hey @apiri, I chose to remove them because they can lead to very confusing 
errors messages for user who ran it using the scripts. If they happen to 
mis-type a file location not only would they see the error saying the file 
doesn't exist but also this "java  ..." line that was quite 
confusing.

Also, I see this being run using the script in >99% of the cases.


> Adjust usage information for minifi-toolkit executable
> --
>
> Key: MINIFI-81
> URL: https://issues.apache.org/jira/browse/MINIFI-81
> Project: Apache NiFi MiNiFi
>  Issue Type: Improvement
>  Components: utilities
>Affects Versions: 0.0.1
>Reporter: Aldrin Piri
>Assignee: Joseph Percivall
>Priority: Minor
> Fix For: 0.1.0
>
>
> Currently the usage information is derived from the underlying Java class.  
> This is more verbose than needed and should be handled by the wrapping script 
> invoking that command.



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

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1563 [deleted] d85d9f768

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1107 [deleted] 08e65abd2

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1073 [deleted] 313fc2ec7

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1054 [deleted] e2d3d1b76

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-731 [deleted] 94b4eddb0

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-919 [deleted] eb64448e6

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-744 [deleted] 13b3017d2

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-640 [deleted] d4ff40dfe

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-631 [deleted] ec9b53b6a

[nifi] Git Push Summary

[afucs]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-274 [deleted] 4bdd729dc

nifi git commit: NIFI-2071 - Support repeating capture groups in ExtractText

[ijokarumawak]

Repository: nifi
Updated Branches:
  refs/heads/master 56f7cd085 -> 44d4b882b


NIFI-2071 - Support repeating capture groups in ExtractText

This closes #1050.

Signed-off-by: Koji Kawamura 


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

Branch: refs/heads/master
Commit: 44d4b882bf90c6fc8a9c924e17ce3256f9f0e486
Parents: 56f7cd0
Author: Pierre Villard 
Authored: Thu Sep 22 20:43:42 2016 +0200
Committer: Koji Kawamura 
Committed: Mon Sep 26 17:22:21 2016 +0900

--
 .../nifi/processors/standard/ExtractText.java   | 32 +---
 .../processors/standard/TestExtractText.java| 54 +++-
 2 files changed, 78 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/44d4b882/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
index a4370b8..e1d641d 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
@@ -72,8 +72,9 @@ import org.apache.nifi.stream.io.StreamUtils;
 + "\"abc(def)?(g)\" we would add an attribute \"regex.1\" with a value 
of \"def\" if the \"def\" matched. If "
 + "the \"def\" did not match, no attribute named \"regex.1\" would be 
added but an attribute named \"regex.2\" "
 + "with a value of \"g\" will be added regardless."
-+ "The value of the property must be a valid Regular Expressions with 
one or more capturing groups.  "
-+ "If the Regular Expression matches more than once, only the first 
match will be used.  "
++ "The value of the property must be a valid Regular Expressions with 
one or more capturing groups. "
++ "If the Regular Expression matches more than once, only the first 
match will be used unless the property "
++ "enabling repeating capture group is set to true. "
 + "If any provided Regular Expression matches, the FlowFile(s) will be 
routed to 'matched'. "
 + "If no provided Regular Expression matches, the FlowFile will be 
routed to 'unmatched' "
 + "and no attributes will be applied to the FlowFile.")
@@ -193,6 +194,16 @@ public class ExtractText extends AbstractProcessor {
 .defaultValue("true")
 .build();
 
+public static final PropertyDescriptor ENABLE_REPEATING_CAPTURE_GROUP = 
new PropertyDescriptor.Builder()
+.name("extract-text-enable-repeating-capture-group")
+.displayName("Enable repeating capture group")
+.description("If set to true, every string matching the capture 
groups will be extracted. Otherwise, "
++ "if the Regular Expression matches more than once, only 
the first match will be extracted.")
+.required(true)
+.allowableValues("true", "false")
+.defaultValue("false")
+.build();
+
 public static final Relationship REL_MATCH = new Relationship.Builder()
 .name("matched")
 .description("FlowFiles are routed to this relationship when the 
Regular Expression is successfully evaluated and the FlowFile is modified as a 
result")
@@ -229,6 +240,7 @@ public class ExtractText extends AbstractProcessor {
 props.add(UNICODE_CHARACTER_CLASS);
 props.add(UNIX_LINES);
 props.add(INCLUDE_CAPTURE_GROUP_ZERO);
+props.add(ENABLE_REPEATING_CAPTURE_GROUP);
 this.properties = Collections.unmodifiableList(props);
 }
 
@@ -320,22 +332,28 @@ public class ExtractText extends AbstractProcessor {
 for (final Map.Entry entry : patternMap.entrySet()) {
 
 final Matcher matcher = entry.getValue().matcher(contentString);
+int j = 0;
 
-if (matcher.find()) {
+while (matcher.find()) {
 final String baseKey = entry.getKey();
-for (int i = startGroupIdx; i <= matcher.groupCount(); i++) {
-final String key = new 
StringBuilder(baseKey).append(".").append(i).toString();
+