from:"joewitt"

[10/10] incubator-nifi git commit: NIFI-272 fixing pom version references

2015-01-30 Thread joewitt

NIFI-272 fixing pom version references


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

Branch: refs/heads/develop
Commit: 21619da1b310d07b4a004463f37e2e91ac1cbc30
Parents: 02b402b
Author: joewitt joew...@apache.org
Authored: Fri Jan 30 23:06:31 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 30 23:06:31 2015 -0500

--
 nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml | 2 +-
 nifi/nifi-maven-archetypes/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21619da1/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
--
diff --git a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml 
b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
index 8eb2862..540764c 100644
--- a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
+++ b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
@@ -20,7 +20,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-maven-archetypes/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 
 artifactIdnifi-processor-bundle-archetype/artifactId

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21619da1/nifi/nifi-maven-archetypes/pom.xml
--
diff --git a/nifi/nifi-maven-archetypes/pom.xml 
b/nifi/nifi-maven-archetypes/pom.xml
index b4ee95b..cb6fd00 100644
--- a/nifi/nifi-maven-archetypes/pom.xml
+++ b/nifi/nifi-maven-archetypes/pom.xml
@@ -19,7 +19,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-maven-archetypes/artifactId

[06/10] incubator-nifi git commit: NIFI-270 prepare for next development iteration

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
index 64215c6..deb787f 100644
--- 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
@@ -18,7 +18,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-processor/artifactId

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
index 70aefc6..04b9ad6 100644
--- 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
@@ -18,7 +18,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 artifactIdnifi-update-attribute-ui/artifactId
 packagingwar/packaging

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
--
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
index e20e77b..dcb63e4 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
@@ -18,11 +18,11 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-bundles/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 packagingpom/packaging
 
 modules
@@ -37,18 +37,18 @@
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-model/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-processor/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-ui/artifactId
 typewar/type
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /dependency
 /dependencies
 /dependencyManagement

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/pom.xml
--
diff --git a/nifi/nifi-nar-bundles/pom.xml b/nifi/nifi-nar-bundles/pom.xml
index fa65abe..4ee6875 100644
--- a/nifi/nifi-nar-bundles/pom.xml
+++ b/nifi/nifi-nar-bundles/pom.xml
@@ -19,12 +19,12 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-bundles/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 packagingpom/packaging
 
 modules
@@ -43,70 +43,70 @@
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-distributed-cache-client-service/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.nifi/groupId
 
artifactIdnifi-distributed-cache-client-service-api/artifactId
-version0.0.1-incubating/version
+

Git Push Summary

2015-01-30 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/nifi-270-release-setup [deleted] c91d875f3

[3/3] incubator-nifi git commit: Merge branch 'NIFI-270-RC3'

2015-01-30 Thread joewitt

Merge branch 'NIFI-270-RC3'


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

Branch: refs/heads/master
Commit: e713258be3c2aa2dc75d860bb14d238268e8dc96
Parents: d2c1144 418e932
Author: joewitt joew...@apache.org
Authored: Fri Jan 30 22:48:18 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 30 22:48:18 2015 -0500

--
 nifi/nifi-api/pom.xml   |  4 +-
 nifi/nifi-assembly/pom.xml  |  4 +-
 nifi/nifi-bootstrap/pom.xml |  2 +-
 .../nifi-data-provenance-utils/pom.xml  |  4 +-
 .../nifi-expression-language/pom.xml|  4 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |  4 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml|  4 +-
 .../nifi-processor-utilities/pom.xml|  4 +-
 nifi/nifi-commons/nifi-properties/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-socket-utils/pom.xml |  4 +-
 nifi/nifi-commons/nifi-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |  4 +-
 nifi/nifi-commons/pom.xml   |  2 +-
 nifi/nifi-docs/pom.xml  |  2 +-
 nifi/nifi-mock/pom.xml  |  4 +-
 .../nifi-framework-nar/pom.xml  |  4 +-
 .../nifi-framework/nifi-administration/pom.xml  |  4 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |  2 +-
 .../nifi-cluster-authorization-provider/pom.xml |  2 +-
 .../nifi-cluster-protocol/pom.xml   |  2 +-
 .../nifi-framework/nifi-cluster-web/pom.xml |  2 +-
 .../nifi-framework/nifi-cluster/pom.xml |  2 +-
 .../nifi-file-authorization-provider/pom.xml|  4 +-
 .../nifi-framework-core-api/pom.xml |  4 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |  2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |  2 +-
 .../nifi-framework/nifi-resources/pom.xml   |  2 +-
 .../nifi-framework/nifi-runtime/pom.xml |  2 +-
 .../nifi-framework/nifi-security/pom.xml|  4 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|  4 +-
 .../nifi-framework/nifi-user-actions/pom.xml|  4 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |  2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |  2 +-
 .../nifi-web/nifi-web-api/pom.xml   |  4 +-
 .../nifi-web/nifi-web-docs/pom.xml  |  2 +-
 .../nifi-web/nifi-web-error/pom.xml |  2 +-
 .../nifi-web-optimistic-locking/pom.xml |  2 +-
 .../nifi-web/nifi-web-security/pom.xml  |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |  2 +-
 .../nifi-framework/nifi-web/pom.xml | 10 +--
 .../nifi-framework/pom.xml  |  4 +-
 .../nifi-framework-bundle/pom.xml   | 36 +--
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |  4 +-
 .../nifi-hdfs-processors/pom.xml|  2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |  6 +-
 .../nifi-hadoop-libraries-nar/pom.xml   |  4 +-
 .../nifi-hadoop-libraries-bundle/pom.xml|  4 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |  4 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml|  4 +-
 .../nifi-kafka-processors/pom.xml   |  2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |  4 +-
 .../pom.xml |  2 +-
 .../nifi-provenance-repository-nar/pom.xml  |  4 +-
 .../nifi-volatile-provenance-repository/pom.xml |  2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |  8 +--
 .../nifi-standard-nar/pom.xml   |  4 +-
 .../nifi-standard-prioritizers/pom.xml  |  2 +-
 .../nifi-standard-processors/pom.xml|  2 +-
 .../nifi-standard-reporting-tasks/pom.xml   |  2 +-
 .../nifi-standard-bundle/pom.xml| 10 +--
 .../pom.xml |  2 +-
 .../pom.xml |  2 +-
 .../nifi-distributed-cache-protocol/pom.xml |  2 +-
 .../nifi-distributed-cache-server/pom.xml   |  2 +-
 .../nifi-distributed-cache-services-nar/pom.xml |  4 +-
 .../pom.xml |  4 +-
 .../nifi-load-distribution-service-api/pom.xml  |  4 +-
 .../nifi-ssl-context-nar/pom.xml|  4 +-
 .../nifi-ssl-context-service/pom.xml|  2 +-
 .../nifi-ssl-context-bundle/pom.xml |  4 +-
 .../nifi-ssl-context-service-api/pom.xml|  2 +-
 .../nifi-standard-services-api-nar/pom.xml  |  4 +-
 .../nifi-standard-services/pom.xml  |  4 +-
 .../nifi-update-attribute-model/pom.xml |  2

[2/3] incubator-nifi git commit: NIFI-270 prepare for next development iteration

2015-01-30 Thread joewitt

NIFI-270 prepare for next development iteration


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

Branch: refs/heads/master
Commit: 418e932ce68b7f21a4ac900e3223972b20edd487
Parents: 3a76259
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:36:35 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:36:35 2015 -0500

--
 nifi/nifi-api/pom.xml   |  4 +-
 nifi/nifi-assembly/pom.xml  |  4 +-
 nifi/nifi-bootstrap/pom.xml |  2 +-
 .../nifi-data-provenance-utils/pom.xml  |  4 +-
 .../nifi-expression-language/pom.xml|  4 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |  4 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml|  4 +-
 .../nifi-processor-utilities/pom.xml|  4 +-
 nifi/nifi-commons/nifi-properties/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-socket-utils/pom.xml |  4 +-
 nifi/nifi-commons/nifi-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |  4 +-
 nifi/nifi-commons/pom.xml   |  2 +-
 nifi/nifi-docs/pom.xml  |  2 +-
 nifi/nifi-mock/pom.xml  |  4 +-
 .../nifi-framework-nar/pom.xml  |  4 +-
 .../nifi-framework/nifi-administration/pom.xml  |  4 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |  2 +-
 .../nifi-cluster-authorization-provider/pom.xml |  2 +-
 .../nifi-cluster-protocol/pom.xml   |  2 +-
 .../nifi-framework/nifi-cluster-web/pom.xml |  2 +-
 .../nifi-framework/nifi-cluster/pom.xml |  2 +-
 .../nifi-file-authorization-provider/pom.xml|  4 +-
 .../nifi-framework-core-api/pom.xml |  4 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |  2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |  2 +-
 .../nifi-framework/nifi-resources/pom.xml   |  2 +-
 .../nifi-framework/nifi-runtime/pom.xml |  2 +-
 .../nifi-framework/nifi-security/pom.xml|  4 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|  4 +-
 .../nifi-framework/nifi-user-actions/pom.xml|  4 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |  2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |  2 +-
 .../nifi-web/nifi-web-api/pom.xml   |  4 +-
 .../nifi-web/nifi-web-docs/pom.xml  |  2 +-
 .../nifi-web/nifi-web-error/pom.xml |  2 +-
 .../nifi-web-optimistic-locking/pom.xml |  2 +-
 .../nifi-web/nifi-web-security/pom.xml  |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |  2 +-
 .../nifi-framework/nifi-web/pom.xml | 10 +--
 .../nifi-framework/pom.xml  |  4 +-
 .../nifi-framework-bundle/pom.xml   | 36 +--
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |  4 +-
 .../nifi-hdfs-processors/pom.xml|  2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |  6 +-
 .../nifi-hadoop-libraries-nar/pom.xml   |  4 +-
 .../nifi-hadoop-libraries-bundle/pom.xml|  4 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |  4 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml|  4 +-
 .../nifi-kafka-processors/pom.xml   |  2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |  4 +-
 .../pom.xml |  2 +-
 .../nifi-provenance-repository-nar/pom.xml  |  4 +-
 .../nifi-volatile-provenance-repository/pom.xml |  2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |  8 +--
 .../nifi-standard-nar/pom.xml   |  4 +-
 .../nifi-standard-prioritizers/pom.xml  |  2 +-
 .../nifi-standard-processors/pom.xml|  2 +-
 .../nifi-standard-reporting-tasks/pom.xml   |  2 +-
 .../nifi-standard-bundle/pom.xml| 10 +--
 .../pom.xml |  2 +-
 .../pom.xml |  2 +-
 .../nifi-distributed-cache-protocol/pom.xml |  2 +-
 .../nifi-distributed-cache-server/pom.xml   |  2 +-
 .../nifi-distributed-cache-services-nar/pom.xml |  4 +-
 .../pom.xml |  4 +-
 .../nifi-load-distribution-service-api/pom.xml  |  4 +-
 .../nifi-ssl-context-nar/pom.xml|  4 +-
 .../nifi-ssl-context-service/pom.xml|  2 +-
 .../nifi-ssl-context-bundle/pom.xml |  4 +-
 .../nifi-ssl-context-service-api/pom.xml|  2 +-
 .../nifi-standard-services-api-nar/pom.xml  |  4 +-
 .../nifi-standard-services/pom.xml  |  4 +-
 .../nifi-update-attribute-model/pom.xml

[16/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
 
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
deleted file mode 100644
index 81bb7a7..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
+++ /dev/null
@@ -1,531 +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.cluster.manager.impl;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
-import org.apache.nifi.cluster.manager.HttpRequestReplicator;
-import org.apache.nifi.cluster.manager.NodeResponse;
-import org.apache.nifi.cluster.manager.exception.UriConstructionException;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.logging.NiFiLog;
-import org.apache.nifi.util.FormatUtils;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * An implementation of the codeHttpRequestReplicator/code interface. This
- * implementation parallelizes the node HTTP requests using the given
- * codeExecutorService/code instance. Individual requests may have
- * connection and read timeouts set, which may be set during instance
- * construction. Otherwise, the default is not to timeout.
- *
- * If a node protocol scheme is provided during construction, then all requests
- * will be replicated using the given scheme. If null is provided as the scheme
- * (the default), then the requests will be replicated using the scheme of the
- * original URI.
- *
- * Clients must call start() and stop() to initialize and shutdown the 
instance.
- * The instance must be started before issuing any replication requests.
- *
- * @author unattributed
- */
-public class HttpRequestReplicatorImpl implements HttpRequestReplicator {
-
-// defaults
-private static final int DEFAULT_SHUTDOWN_REPLICATOR_SECONDS = 30;
-
-// logger
-private static final Logger logger = new 
NiFiLog(LoggerFactory.getLogger(HttpRequestReplicatorImpl.class));
-
-// final members
-private final Client client;// the client to use for issuing 
requests
-private final int numThreads;   // number of threads to use for 
request replication
-private final int connectionTimeoutMs;  // connection timeout per node 
request
-private final int readTimeoutMs;// read timeout per node request
-
-// members
-private ExecutorService executorService;
-private int shutdownReplicatorSeconds = 
DEFAULT_SHUTDOWN_REPLICATOR_SECONDS;
-
-// guarded by synchronized method access in support of multithreaded 
replication
-private String nodeProtocolScheme = null;
-
-/**
- * Creates an instance.

[19/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
 
b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
deleted file mode 100644
index ec1f26d..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
+++ /dev/null
@@ -1,133 +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.cluster.protocol.impl;
-
-import org.apache.nifi.cluster.protocol.impl.ClusterServicesBroadcaster;
-import org.apache.nifi.cluster.protocol.impl.MulticastProtocolListener;
-import java.net.InetSocketAddress;
-import org.apache.nifi.cluster.protocol.ProtocolContext;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
-import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.message.ServiceBroadcastMessage;
-import org.apache.nifi.io.socket.multicast.DiscoverableService;
-import org.apache.nifi.io.socket.multicast.DiscoverableServiceImpl;
-import org.apache.nifi.io.socket.multicast.MulticastConfiguration;
-import org.junit.After;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author unattributed
- */
-public class ClusterServicesBroadcasterTest {
-
-private ClusterServicesBroadcaster broadcaster;
-
-private MulticastProtocolListener listener;
-
-private DummyProtocolHandler handler;
-
-private InetSocketAddress multicastAddress;
-
-private DiscoverableService broadcastedService;
-
-private ProtocolContext protocolContext;
-
-private MulticastConfiguration configuration;
-
-@Before
-public void setup() throws Exception {
-
-broadcastedService = new DiscoverableServiceImpl(some-service, new 
InetSocketAddress(localhost, 1));
-
-multicastAddress = new InetSocketAddress(225.1.1.1, 2);
-
-configuration = new MulticastConfiguration();
-
-protocolContext = new 
JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
-
-broadcaster = new ClusterServicesBroadcaster(multicastAddress, 
configuration, protocolContext, 500 ms);
-broadcaster.addService(broadcastedService);
-
-handler = new DummyProtocolHandler();
-listener = new MulticastProtocolListener(5, multicastAddress, 
configuration, protocolContext);
-listener.addHandler(handler);
-}
-
-@After
-public void teardown() {
-
-if(broadcaster.isRunning()) {
-broadcaster.stop();
-}
-
-try {
-if(listener.isRunning()) {
-listener.stop();
-}
-} catch(Exception ex) {
-ex.printStackTrace(System.out);
-}
-
-}
-
-@Ignore(fails needs to be fixed)
-@Test
-public void testBroadcastReceived() throws Exception {
-
-broadcaster.start();
-listener.start();
-
-Thread.sleep(1000);
-
-listener.stop();
-
-assertNotNull(handler.getProtocolMessage());
-assertEquals(ProtocolMessage.MessageType.SERVICE_BROADCAST, 
handler.getProtocolMessage().getType());
-final ServiceBroadcastMessage msg = (ServiceBroadcastMessage) 
handler.getProtocolMessage();
-assertEquals(broadcastedService.getServiceName(), 
msg.getServiceName());
-

[09/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
 
b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
deleted file mode 100644
index 4afdfb7..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/RootGroupPort.java
+++ /dev/null
@@ -1,78 +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.remote;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.nifi.connectable.Port;
-import org.apache.nifi.remote.exception.BadRequestException;
-import org.apache.nifi.remote.exception.NotAuthorizedException;
-import org.apache.nifi.remote.exception.RequestExpiredException;
-import org.apache.nifi.remote.protocol.ServerProtocol;
-
-public interface RootGroupPort extends Port {
-
-boolean isTransmitting();
-
-void setGroupAccessControl(SetString groups);
-
-SetString getGroupAccessControl();
-
-void setUserAccessControl(SetString users);
-
-SetString getUserAccessControl();
-
-/**
- * Verifies that the specified user is authorized to interact with this 
port
- * and returns a {@link PortAuthorizationResult} indicating why the user is
- * unauthorized if this assumption fails
- *
- * @param dn
- * @return
- */
-PortAuthorizationResult checkUserAuthorization(String dn);
-
-/**
- * Receives data from the given stream
- *
- * @param peer
- * @param serverProtocol
- * @param requestHeaders
- *
- * @return the number of FlowFiles received
- * @throws org.apache.nifi.remote.exception.NotAuthorizedException
- * @throws org.apache.nifi.remote.exception.BadRequestException
- * @throws org.apache.nifi.remote.exception.RequestExpiredException
- */
-int receiveFlowFiles(Peer peer, ServerProtocol serverProtocol, MapString, 
String requestHeaders) throws NotAuthorizedException, BadRequestException, 
RequestExpiredException;
-
-/**
- * Transfers data to the given stream
- *
- * @param peer
- * @param requestHeaders
- * @param serverProtocol
- *
- * @return the number of FlowFiles transferred
- * @throws org.apache.nifi.remote.exception.NotAuthorizedException
- * @throws org.apache.nifi.remote.exception.BadRequestException
- * @throws org.apache.nifi.remote.exception.RequestExpiredException
- */
-int transferFlowFiles(Peer peer, ServerProtocol serverProtocol, 
MapString, String requestHeaders) throws NotAuthorizedException, 
BadRequestException, RequestExpiredException;
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
 
b/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
deleted file mode 100644
index 56432d5..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/core-api/src/main/java/org/apache/nifi/remote/TransferDirection.java
+++ /dev/null
@@ -1,23 +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

[26/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
 
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
deleted file mode 100644
index b1ead42..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
+++ /dev/null
@@ -1,630 +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.web.api.dto.provenance;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.nifi.web.api.dto.util.TimestampAdapter;
-
-/**
- * A provenance event.
- */
-@XmlType(name = provenanceEvent)
-public class ProvenanceEventDTO {
-
-private String id;
-
-// in search results table
-private Long eventId;
-private Date eventTime;
-private Long eventDuration;
-private Long lineageDuration;
-private String eventType;
-private String flowFileUuid;
-private String fileSize;
-private Long fileSizeBytes;
-private String clusterNodeId;// include when clustered
-private String clusterNodeAddress; // include when clustered
-
-private String groupId;
-private String componentId;
-private String componentType;
-private String componentName;
-private String sourceSystemFlowFileId;
-private String alternateIdentifierUri;
-private CollectionAttributeDTO attributes;
-private ListString parentUuids;
-private ListString childUuids;
-
-private String transitUri;
-
-private String relationship;
-private String details;
-
-// content
-private Boolean contentEqual;
-private Boolean inputContentAvailable;
-private String inputContentClaimSection;
-private String inputContentClaimContainer;
-private String inputContentClaimIdentifier;
-private Long inputContentClaimOffset;
-private String inputContentClaimFileSize;
-private Long inputContentClaimFileSizeBytes;
-private Boolean outputContentAvailable;
-private String outputContentClaimSection;
-private String outputContentClaimContainer;
-private String outputContentClaimIdentifier;
-private Long outputContentClaimOffset;
-private String outputContentClaimFileSize;
-private Long outputContentClaimFileSizeBytes;
-
-// replay
-private Boolean replayAvailable;
-private String replayExplanation;
-private String sourceConnectionIdentifier;
-
-/**
- * The event uuid.
- *
- * @return
- */
-public String getId() {
-return id;
-}
-
-public void setId(String id) {
-this.id = id;
-}
-
-/**
- * The event id.
- *
- * @return
- */
-public Long getEventId() {
-return eventId;
-}
-
-public void setEventId(Long eventId) {
-this.eventId = eventId;
-}
-
-/**
- * The time the event occurred.
- *
- * @return
- */
-@XmlJavaTypeAdapter(TimestampAdapter.class)
-public Date getEventTime() {
-return eventTime;
-}
-
-public void setEventTime(Date eventTime) {
-this.eventTime = eventTime;
-}
-
-/**
- * The UUID of the FlowFile for this event.
- *
- * @return
- */
-public String getFlowFileUuid() {
-return flowFileUuid;
-}
-
-public void setFlowFileUuid(String flowFileUuid) {
-this.flowFileUuid = flowFileUuid;
-}
-
-/**
- * The size of the FlowFile for this event.
- *
- * @return
- */
-public String getFileSize() {
-return fileSize;
-}
-
-public void setFileSize(String fileSize) {
-this.fileSize = fileSize;
-}
-
-/**
- * The size of the

[27/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
 
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
deleted file mode 100644
index df59b13..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
+++ /dev/null
@@ -1,279 +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.web.api.dto;
-
-import java.util.Date;
-import java.util.List;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
-
-/**
- * Details of a remote process group in this NiFi.
- */
-@XmlType(name = remoteProcessGroup)
-public class RemoteProcessGroupDTO extends NiFiComponentDTO {
-
-private String targetUri;
-private Boolean targetSecure;
-
-private String name;
-private String comments;
-private String communicationsTimeout;
-private String yieldDuration;
-
-private ListString authorizationIssues;
-private Boolean transmitting;
-
-private Integer inputPortCount;
-private Integer outputPortCount;
-
-private Integer activeRemoteInputPortCount;
-private Integer inactiveRemoteInputPortCount;
-private Integer activeRemoteOutputPortCount;
-private Integer inactiveRemoteOutputPortCount;
-
-private Date flowRefreshed;
-
-private RemoteProcessGroupContentsDTO contents;
-
-public RemoteProcessGroupDTO() {
-super();
-}
-
-public RemoteProcessGroupDTO(final RemoteProcessGroupDTO toCopy) {
-setId(toCopy.getId());
-setPosition(toCopy.getPosition());
-targetUri = toCopy.getTargetUri();
-name = toCopy.getName();
-}
-
-public void setTargetUri(final String targetUri) {
-this.targetUri = targetUri;
-}
-
-/**
- * The target uri of this remote process group.
- *
- * @return
- */
-public String getTargetUri() {
-return this.targetUri;
-}
-
-/**
- * The name of this remote process group.
- *
- * @param name
- */
-public void setName(final String name) {
-this.name = name;
-}
-
-public String getName() {
-return this.name;
-}
-
-/**
- * Comments for this remote process group.
- *
- * @return
- */
-public String getComments() {
-return comments;
-}
-
-public void setComments(String comments) {
-this.comments = comments;
-}
-
-/**
- * Returns any remote authorization issues for this remote process group.
- *
- * @return
- */
-public ListString getAuthorizationIssues() {
-return authorizationIssues;
-}
-
-public void setAuthorizationIssues(ListString authorizationIssues) {
-this.authorizationIssues = authorizationIssues;
-}
-
-/**
- * Whether or not this remote process group is actively transmitting.
- *
- * @return
- */
-public Boolean isTransmitting() {
-return transmitting;
-}
-
-public void setTransmitting(Boolean transmitting) {
-this.transmitting = transmitting;
-}
-
-/**
- * Whether or not the target is running securely.
- *
- * @return
- */
-public Boolean isTargetSecure() {
-return targetSecure;
-}
-
-public void setTargetSecure(Boolean targetSecure) {
-this.targetSecure = targetSecure;
-}
-
-/**
- * Returns the time period used for the timeout when communicating with 
this
- * RemoteProcessGroup.
- *
- * @return
- */
-public String getCommunicationsTimeout() {
-return communicationsTimeout;
-}
-
-public void setCommunicationsTimeout(String communicationsTimeout) {
-

[14/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
 
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
deleted file mode 100644
index 84565da..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
+++ /dev/null
@@ -1,252 +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.cluster.node;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.nifi.cluster.HeartbeatPayload;
-import org.apache.nifi.cluster.protocol.Heartbeat;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Represents a connected flow controller. Nodes always have an immutable
- * identifier and a status. The status may be changed, but never null.
- *
- * A Node may be cloned, but the cloning is a shallow copy of the instance.
- *
- * This class overrides hashCode and equals and considers two instances to be
- * equal if they have the equal NodeIdentifiers.
- *
- * @author unattributed
- */
-public class Node implements Cloneable, ComparableNode {
-
-private static final Logger lockLogger = 
LoggerFactory.getLogger(cluster.lock);
-
-/**
- * The semantics of a Node status are as follows:
- * ul
- * liCONNECTED -- a flow controller that is connected to the cluster. A
- * connecting node transitions to connected after the cluster receives the
- * flow controller's first heartbeat. A connected node can transition to
- * disconnecting./li
- * liCONNECTING -- a flow controller has issued a connection request to
- * the cluster, but has not yet sent a heartbeat. A connecting node can
- * transition to disconnecting or connected. The cluster will not accept 
any
- * external requests to change the flow while any node is connecting./li
- * liDISCONNECTED -- a flow controller that is not connected to the
- * cluster. A disconnected node can transition to connecting./li
- * liDISCONNECTING -- a flow controller that is in the process of
- * disconnecting from the cluster. A disconnecting node will always
- * transition to disconnected./li
- * /ul
- */
-public static enum Status {
-
-CONNECTED,
-CONNECTING,
-DISCONNECTED,
-DISCONNECTING
-}
-
-/**
- * the node's unique identifier
- */
-private final NodeIdentifier nodeId;
-
-/**
- * the node statue
- */
-private Status status;
-
-/**
- * the last heartbeat received by from the node
- */
-private Heartbeat lastHeartbeat;
-
-/**
- * the payload of the last heartbeat received from the node
- */
-private HeartbeatPayload lastHeartbeatPayload;
-
-/**
- * the last time the connection for this node was requested
- */
-private AtomicLong connectionRequestedTimestamp = new AtomicLong(0L);
-
-/**
- * a flag to indicate this node was disconnected because of a lack of
- * heartbeat
- */
-private boolean heartbeatDisconnection;
-
-public Node(final NodeIdentifier id, final Status status) {
-if (id == null) {
-throw new IllegalArgumentException(ID may not be null.);
-} else if (status == null) {
-throw new IllegalArgumentException(Status may not be null.);
-}
-this.nodeId = id;
-this.status = status;
-}
-
-public NodeIdentifier getNodeId() {
-return nodeId;
-}
-
-/**
- * Returns the last received heartbeat or null if no heartbeat has been 
set.
- *
- * @return a heartbeat or null
- */
-public Heartbeat getHeartbeat() {
-return lastHeartbeat;
-}
-
-public HeartbeatPayload getHeartbeatPayload() {
-return

[44/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
--
diff --git 
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
 
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
deleted file mode 100644
index 0665979..000
--- 
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
+++ /dev/null
@@ -1,57 +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.attribute.expression.language.evaluation.functions;
-
-import java.util.Map;
-
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import 
org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
-import 
org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-
-public class MinusEvaluator extends NumberEvaluator {
-
-private final NumberEvaluator subject;
-private final NumberEvaluator minusValue;
-
-public MinusEvaluator(final NumberEvaluator subject, final NumberEvaluator 
minusValue) {
-this.subject = subject;
-this.minusValue = minusValue;
-}
-
-@Override
-public QueryResultLong evaluate(final MapString, String attributes) {
-final Long subjectValue = subject.evaluate(attributes).getValue();
-if (subjectValue == null) {
-return new NumberQueryResult(null);
-}
-
-final Long minus = minusValue.evaluate(attributes).getValue();
-if (minus == null) {
-return new NumberQueryResult(null);
-}
-
-final long result = subjectValue - minus;
-return new NumberQueryResult(result);
-}
-
-@Override
-public Evaluator? getSubjectEvaluator() {
-return subject;
-}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
--
diff --git 
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
 
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
deleted file mode 100644
index 6b7b838..000
--- 
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
+++ /dev/null
@@ -1,57 +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.attribute.expression.language.evaluation.functions;
-
-import java.util.Map;
-
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import 
org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
-import 
org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
-import

[28/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
 
b/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
deleted file mode 100644
index 9e15fc1..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
+++ /dev/null
@@ -1,262 +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.web.api.dto;
-
-import java.util.Set;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Configuration details for a NiFi controller. Primary use of this DTO is for
- * consumption by a remote NiFi instance to initiate site to site
- * communications.
- */
-@XmlType(name = controller)
-public class ControllerDTO {
-
-private String id;
-private String name;
-private String comments;
-
-private Integer runningCount;
-private Integer stoppedCount;
-private Integer invalidCount;
-private Integer disabledCount;
-private Integer activeRemotePortCount;
-private Integer inactiveRemotePortCount;
-
-private Integer inputPortCount;
-private Integer outputPortCount;
-
-private Integer remoteSiteListeningPort;
-private Boolean siteToSiteSecure;
-private String instanceId;
-private SetPortDTO inputPorts;
-private SetPortDTO outputPorts;
-
-/**
- * The id of this NiFi controller.
- *
- * @return
- */
-public String getId() {
-return id;
-}
-
-public void setId(String id) {
-this.id = id;
-}
-
-/**
- * The name of this NiFi controller.
- *
- * @return The name of this controller
- */
-public String getName() {
-return name;
-}
-
-public void setName(String name) {
-this.name = name;
-}
-
-/**
- * The comments of this NiFi controller.
- *
- * @return
- */
-public String getComments() {
-return comments;
-}
-
-public void setComments(String comments) {
-this.comments = comments;
-}
-
-/**
- * The input ports available to send data to this NiFi controller.
- *
- * @return
- */
-public SetPortDTO getInputPorts() {
-return inputPorts;
-}
-
-public void setInputPorts(SetPortDTO inputPorts) {
-this.inputPorts = inputPorts;
-}
-
-/**
- * The output ports available to received data from this NiFi controller.
- *
- * @return
- */
-public SetPortDTO getOutputPorts() {
-return outputPorts;
-}
-
-public void setOutputPorts(SetPortDTO outputPorts) {
-this.outputPorts = outputPorts;
-}
-
-/**
- * The Instance ID of the cluster, if this node is connected to a Cluster
- * Manager, or of this individual instance of in standalone mode
- *
- * @return
- */
-public String getInstanceId() {
-return instanceId;
-}
-
-public void setInstanceId(String instanceId) {
-this.instanceId = instanceId;
-}
-
-/**
- * The Socket Port on which this instance is listening for Remote Transfers
- * of Flow Files. If this instance is not configured to receive Flow Files
- * from remote instances, this will be null.
- *
- * @return a integer between 1 and 65535, or null, if not configured for
- * remote transfer
- */
-public Integer getRemoteSiteListeningPort() {
-return remoteSiteListeningPort;
-}
-
-public void setRemoteSiteListeningPort(final Integer port) {
-this.remoteSiteListeningPort = port;
-}
-
-/**
- * Indicates whether or not Site-to-Site communications with this instance
- * is secure (2-way authentication)
- *
- * @return
- */
-public Boolean isSiteToSiteSecure() {
-return siteToSiteSecure;
-}
-
-public void setSiteToSiteSecure(Boolean

[58/62] [abbrv] incubator-nifi git commit: NIFI 270 updating nar version

2015-01-30 Thread joewitt

NIFI 270 updating nar version


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

Branch: refs/heads/master
Commit: 0b692b1d8205007a796b41b5df692e00d68addc4
Parents: 4431d9c
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:30:27 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:30:27 2015 -0500

--
 nifi/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/0b692b1d/nifi/pom.xml
--
diff --git a/nifi/pom.xml b/nifi/pom.xml
index 9dac476..fb94135 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -973,7 +973,7 @@
 plugin
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-maven-plugin/artifactId
-version1.0.0-incubating-SNAPSHOT/version
+version1.0.0-incubating/version
 extensionstrue/extensions
 /plugin
 /plugins

[57/62] [abbrv] incubator-nifi git commit: NIFI-270 prepare for next development iteration

2015-01-30 Thread joewitt

NIFI-270 prepare for next development iteration


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

Branch: refs/heads/master
Commit: 4431d9c2cf8b3e77c566718d941ef6f0ef581414
Parents: 6e69d99
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:28:41 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:28:41 2015 -0500

--
 nifi-nar-maven-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4431d9c2/nifi-nar-maven-plugin/pom.xml
--
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index d032da7..79e437e 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-maven-plugin/artifactId
-version1.0.0-incubating/version
+version1.0.1-incubating-SNAPSHOT/version
 packagingmaven-plugin/packaging
 descriptionApache NiFi Nar Plugin. It is currently a part of the Apache 
Incubator./description
 urlhttp://nifi.incubator.apache.org/maven-site//url
@@ -58,7 +58,7 @@
 
connectionscm:git:git://git.apache.org/incubator-nifi.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection
 urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url
-tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag
+tagHEAD/tag
 /scm
 issueManagement
 systemJIRA/system

[08/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
 
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
deleted file mode 100644
index f36a459..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/EventDrivenWorkerQueue.java
+++ /dev/null
@@ -1,329 +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.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.nifi.connectable.Connectable;
-import org.apache.nifi.connectable.Connection;
-import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.util.Connectables;
-
-public class EventDrivenWorkerQueue implements WorkerQueue {
-
-private final Object workMonitor = new Object();
-
-private final MapConnectable, Worker workerMap = new HashMap();   // 
protected by synchronizing on workMonitor
-private final WorkerReadyQueue workerQueue;
-
-public EventDrivenWorkerQueue(final boolean clustered, final boolean 
primary, final ProcessScheduler scheduler) {
-workerQueue = new WorkerReadyQueue(scheduler);
-workerQueue.setClustered(clustered);
-workerQueue.setPrimary(primary);
-}
-
-@Override
-public void setClustered(final boolean clustered) {
-workerQueue.setClustered(clustered);
-}
-
-@Override
-public void setPrimary(final boolean primary) {
-workerQueue.setPrimary(primary);
-}
-
-@Override
-public Worker poll(final long timeout, final TimeUnit timeUnit) {
-final long maxTime = System.currentTimeMillis() + 
TimeUnit.MILLISECONDS.convert(timeout, timeUnit);
-while (System.currentTimeMillis()  maxTime) {
-synchronized (workMonitor) {
-final Worker worker = workerQueue.poll();
-if (worker == null) {
-// nothing to do. wait until we have something to do.
-final long timeLeft = maxTime - System.currentTimeMillis();
-if (timeLeft = 0) {
-return null;
-}
-
-try {
-workMonitor.wait(timeLeft);
-} catch (final InterruptedException ignored) {
-}
-} else {
-// Decrement the amount of work there is to do for this 
worker.
-final int workLeft = worker.decrementEventCount();
-if (workLeft  0) {
-workerQueue.offer(worker);
-}
-
-return worker;
-}
-}
-}
-
-return null;
-}
-
-@Override
-public void offer(final Connectable connectable) {
-synchronized (workMonitor) {
-Worker worker = workerMap.get(connectable);
-if (worker == null) {
-// if worker is null, then it has not been scheduled to run; 
ignore the event.
-return;
-}
-
-final int countBefore = worker.incrementEventCount();
-if (countBefore  0) {
-worker.setWorkCount(1);
-}
-if (countBefore = 0) {
-// If countBefore  0 then it's already on the queue, so just 
incrementing its counter is sufficient.
-workerQueue.offer(worker);
-}
-
-workMonitor.notify();
-}
-}
-
-private int getWorkCount(final Connectable connectable) {
-int sum = 0;
-for (final Connection connection : 
connectable.getIncomingConnections()) {
-

svn commit: r1656147 - /incubator/nifi/site/trunk/content/downloads/index.md

2015-01-30 Thread joewitt

Author: joewitt
Date: Sat Jan 31 03:27:57 2015
New Revision: 1656147

URL: http://svn.apache.org/r1656147
Log:
fixing indent

Modified:
incubator/nifi/site/trunk/content/downloads/index.md

Modified: incubator/nifi/site/trunk/content/downloads/index.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/downloads/index.md?rev=1656147r1=1656146r2=1656147view=diff
==
--- incubator/nifi/site/trunk/content/downloads/index.md (original)
+++ incubator/nifi/site/trunk/content/downloads/index.md Sat Jan 31 03:27:57 
2015
@@ -12,9 +12,9 @@ If a download is not found please allow
 Releases
 
 *  0.0.1-incubating
-  *  [Release 
Notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329078)
-  *  Sources:
-  *  
[nifi-0.0.1-incubating-source-release.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip)
 ( 
[asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc),
 
[md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5),
 
[sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1)
 )
-  *  Binaries:
-  *  
[nifi-0.0.1-incubating-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz)
 ( 
[asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.asc),
 
[md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.md5),
 
[sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.sha1)
 )
-  *  
[nifi-0.0.1-incubating-bin.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip)
 ( 
[asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.asc),
 
[md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.md5),
 
[sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.sha1)
 )
\ No newline at end of file
+*  [Release 
Notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329078)
+*  Sources:
+*  
[nifi-0.0.1-incubating-source-release.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip)
 ( 
[asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc),
 
[md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5),
 
[sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1)
 )
+*  Binaries:
+*  
[nifi-0.0.1-incubating-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz)
 ( 
[asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.asc),
 
[md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.md5),
 
[sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.sha1)
 )
+*  
[nifi-0.0.1-incubating-bin.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip)
 ( 
[asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.asc),
 
[md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.md5),
 
[sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.sha1)
 )
\ No newline at end of file

svn commit: r938448 - /websites/production/nifi/content/

2015-01-30 Thread joewitt

Author: joewitt
Date: Sat Jan 31 03:26:19 2015
New Revision: 938448

Log:
Publishing svnmucc operation to nifi site by joewitt

Added:
websites/production/nifi/content/
  - copied from r938447, websites/staging/nifi/trunk/content/

[56/62] [abbrv] incubator-nifi git commit: NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3

2015-01-30 Thread joewitt

NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3


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

Branch: refs/heads/master
Commit: 6e69d99444e22772df300cd777096dc21a7c8e35
Parents: 43e646e
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:28:31 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:28:31 2015 -0500

--
 nifi-nar-maven-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6e69d994/nifi-nar-maven-plugin/pom.xml
--
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index c0f3583..d032da7 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-maven-plugin/artifactId
-version1.0.0-incubating-SNAPSHOT/version
+version1.0.0-incubating/version
 packagingmaven-plugin/packaging
 descriptionApache NiFi Nar Plugin. It is currently a part of the Apache 
Incubator./description
 urlhttp://nifi.incubator.apache.org/maven-site//url
@@ -58,7 +58,7 @@
 
connectionscm:git:git://git.apache.org/incubator-nifi.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection
 urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url
-tagHEAD/tag
+tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag
 /scm
 issueManagement
 systemJIRA/system

[06/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
 
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
deleted file mode 100644
index c67181a..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java
+++ /dev/null
@@ -1,418 +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.controller;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.nifi.connectable.Size;
-import org.apache.nifi.encrypt.StringEncryptor;
-import org.apache.nifi.groups.RemoteProcessGroupPortDescriptor;
-import org.apache.nifi.remote.StandardRemoteProcessGroupPortDescriptor;
-import org.apache.nifi.scheduling.SchedulingStrategy;
-import org.apache.nifi.util.DomUtils;
-import org.apache.nifi.web.api.dto.ConnectableDTO;
-import org.apache.nifi.web.api.dto.ConnectionDTO;
-import org.apache.nifi.web.api.dto.FlowSnippetDTO;
-import org.apache.nifi.web.api.dto.FunnelDTO;
-import org.apache.nifi.web.api.dto.LabelDTO;
-import org.apache.nifi.web.api.dto.PortDTO;
-import org.apache.nifi.web.api.dto.PositionDTO;
-import org.apache.nifi.web.api.dto.ProcessGroupDTO;
-import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
-import org.apache.nifi.web.api.dto.ProcessorDTO;
-import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class FlowFromDOMFactory {
-
-public static PositionDTO getPosition(final Element positionElement) {
-if (positionElement == null) {
-throw new IllegalArgumentException(Invalid Flow: Found no 
'position' element);
-}
-return new 
PositionDTO(Double.parseDouble(positionElement.getAttribute(x)), 
Double.parseDouble(positionElement.getAttribute(y)));
-}
-
-public static Size getSize(final Element sizeElement) {
-if (sizeElement == null) {
-throw new IllegalArgumentException(Invalid Flow: Found no 'size' 
element);
-}
-
-return new Size(Double.parseDouble(sizeElement.getAttribute(width)), 
Double.parseDouble(sizeElement.getAttribute(height)));
-}
-
-public static MapString, String getStyle(final Element stylesElement) {
-final MapString, String styles = new HashMap();
-if (stylesElement == null) {
-return styles;
-}
-
-for (final Element styleElement : getChildrenByTagName(stylesElement, 
style)) {
-final String styleName = styleElement.getAttribute(name);
-final String styleValue = styleElement.getTextContent();
-styles.put(styleName, styleValue);
-}
-
-return styles;
-}
-
-public static ProcessGroupDTO getProcessGroup(final String parentId, final 
Element element, final StringEncryptor encryptor) {
-final ProcessGroupDTO dto = new ProcessGroupDTO();
-final String groupId = getString(element, id);
-dto.setId(groupId);
-dto.setParentGroupId(parentId);
-dto.setName(getString(element, name));
-dto.setPosition(getPosition(DomUtils.getChild(element, position)));
-dto.setComments(getString(element, comment));
-
-final SetProcessorDTO processors = new HashSet();
-final SetConnectionDTO connections = new HashSet();
-final SetFunnelDTO funnels = new HashSet();
-final SetPortDTO inputPorts = new HashSet();
-final SetPortDTO outputPorts = new HashSet();
-final SetLabelDTO labels = new HashSet();
-final SetProcessGroupDTO processGroups = new HashSet();
-final SetRemoteProcessGroupDTO remoteProcessGroups = new HashSet();
-
-

[05/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
 
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
deleted file mode 100644
index d459b00..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
+++ /dev/null
@@ -1,875 +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.controller;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.UUID;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.nifi.cluster.ConnectionException;
-import org.apache.nifi.cluster.protocol.ConnectionRequest;
-import org.apache.nifi.cluster.protocol.ConnectionResponse;
-import org.apache.nifi.cluster.protocol.DataFlow;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.StandardDataFlow;
-import org.apache.nifi.cluster.protocol.UnknownServiceAddressException;
-import org.apache.nifi.cluster.protocol.impl.NodeProtocolSenderListener;
-import org.apache.nifi.cluster.protocol.message.ConnectionRequestMessage;
-import 
org.apache.nifi.cluster.protocol.message.ControllerStartupFailureMessage;
-import org.apache.nifi.cluster.protocol.message.DisconnectMessage;
-import org.apache.nifi.cluster.protocol.message.FlowRequestMessage;
-import org.apache.nifi.cluster.protocol.message.FlowResponseMessage;
-import org.apache.nifi.cluster.protocol.message.PrimaryRoleAssignmentMessage;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionFailureMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionRequestMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionResponseMessage;
-import org.apache.nifi.engine.FlowEngine;
-import org.apache.nifi.events.BulletinFactory;
-import org.apache.nifi.util.file.FileUtils;
-import org.apache.nifi.groups.ProcessGroup;
-import org.apache.nifi.lifecycle.LifeCycleStartException;
-import org.apache.nifi.logging.LogLevel;
-import org.apache.nifi.persistence.FlowConfigurationDAO;
-import org.apache.nifi.persistence.StandardXMLFlowConfigurationDAO;
-import org.apache.nifi.reporting.Bulletin;
-import org.apache.nifi.services.FlowService;
-import org.apache.nifi.util.FormatUtils;
-import org.apache.nifi.util.NiFiProperties;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.nifi.encrypt.StringEncryptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class StandardFlowService implements FlowService, ProtocolHandler {
-
-private static final String EVENT_CATEGORY = Controller;
-
-private final FlowController controller;
-private final Path flowXml;
-private final Path taskConfigXml;
-private final Path serviceConfigXml;
-private final FlowConfigurationDAO dao;
-private final int gracefulShutdownSeconds;
-private final boolean autoResumeState;
-private final int connectionRetryMillis;
-private final StringEncryptor encryptor;
-
-// Lock is used to protect the flow.xml file.
-private final

[54/62] [abbrv] incubator-nifi git commit: NIFI 270 fixed organization and excluded DEPENDENCIES from rat check

2015-01-30 Thread joewitt

NIFI 270 fixed organization and excluded DEPENDENCIES from rat check


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

Branch: refs/heads/master
Commit: f85b8714a10dd314c07de8f2150945c0b6191e88
Parents: 2f4727d
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:25:59 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:25:59 2015 -0500

--
 nifi-nar-maven-plugin/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f85b8714/nifi-nar-maven-plugin/pom.xml
--
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index cb59c13..c0f3583 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -29,8 +29,8 @@
 descriptionApache NiFi Nar Plugin. It is currently a part of the Apache 
Incubator./description
 urlhttp://nifi.incubator.apache.org/maven-site//url
 organization
-nameApache NiFi (incubating) Project/name
-urlhttp://nifi.incubating.apache.org//url
+nameApache NiFi (incubating)/name
+urlhttp://nifi.incubator.apache.org//url
 /organization
 licenses
 license
@@ -208,6 +208,7 @@
 excludes
 excludenb-configuration.xml/exclude
 excludenbactions.xml/exclude
+excludeDEPENDENCIES/exclude
 /excludes
 /configuration
 /plugin

[59/62] [abbrv] incubator-nifi git commit: NIFI-270 prepare release nifi-0.0.1-incubating-RC3

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
index 0941cd9..a3e3fc9 100644
--- 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
@@ -17,10 +17,10 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.1-incubating/version
 /parent
 artifactIdnifi-update-attribute-nar/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.1-incubating/version
 packagingnar/packaging
 
 dependencies

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
index a39ab34..64215c6 100644
--- 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
@@ -18,7 +18,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.1-incubating/version
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-processor/artifactId

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
index e1962d2..70aefc6 100644
--- 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
@@ -18,7 +18,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.1-incubating/version
 /parent
 artifactIdnifi-update-attribute-ui/artifactId
 packagingwar/packaging

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
--
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
index ef74687..e20e77b 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
@@ -18,11 +18,11 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-bundles/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.1-incubating/version
 /parent
 
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.1-incubating/version
 packagingpom/packaging
 
 modules
@@ -37,18 +37,18 @@
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-model/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.1-incubating/version
 /dependency
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-processor/artifactId
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.1-incubating/version
 /dependency
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-ui/artifactId
 typewar/type
-version0.0.1-incubating-SNAPSHOT/version
+version0.0.1-incubating/version
 /dependency
 /dependencies
 /dependencyManagement

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a762592/nifi/nifi-nar-bundles/pom.xml
--
diff --git a/nifi/nifi-nar-bundles/pom.xml

[1/5] Git Push Summary

2015-01-30 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop 21619da1b - 037f36dd9

[07/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
 
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
deleted file mode 100644
index 346e801..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ /dev/null
@@ -1,3579 +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.controller;
-
-import static java.util.Objects.requireNonNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import javax.net.ssl.SSLContext;
-
-import org.apache.nifi.admin.service.UserService;
-import org.apache.nifi.cluster.BulletinsPayload;
-import org.apache.nifi.cluster.HeartbeatPayload;
-import org.apache.nifi.cluster.protocol.DataFlow;
-import org.apache.nifi.cluster.protocol.Heartbeat;
-import org.apache.nifi.cluster.protocol.NodeBulletins;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.cluster.protocol.NodeProtocolSender;
-import org.apache.nifi.cluster.protocol.UnknownServiceAddressException;
-import org.apache.nifi.cluster.protocol.message.HeartbeatMessage;
-import org.apache.nifi.cluster.protocol.message.NodeBulletinsMessage;
-import org.apache.nifi.connectable.Connectable;
-import org.apache.nifi.connectable.ConnectableType;
-import org.apache.nifi.connectable.Connection;
-import org.apache.nifi.connectable.Funnel;
-import org.apache.nifi.connectable.LocalPort;
-import org.apache.nifi.connectable.Port;
-import org.apache.nifi.connectable.Position;
-import org.apache.nifi.connectable.Size;
-import org.apache.nifi.connectable.StandardConnection;
-import org.apache.nifi.controller.exception.CommunicationsException;
-import org.apache.nifi.controller.exception.ProcessorInstantiationException;
-import org.apache.nifi.controller.exception.ProcessorLifeCycleException;
-import org.apache.nifi.controller.label.Label;
-import org.apache.nifi.controller.label.StandardLabel;
-import 
org.apache.nifi.controller.reporting.ReportingTaskInstantiationException;
-import org.apache.nifi.controller.reporting.StandardReportingTaskNode;
-import org.apache.nifi.controller.repository.ContentRepository;
-import org.apache.nifi.controller.repository.CounterRepository;
-import org.apache.nifi.controller.repository.FlowFileEvent;
-import org.apache.nifi.controller.repository.FlowFileEventRepository;
-import org.apache.nifi.controller.repository.FlowFileRecord;
-import org.apache.nifi.controller.repository.FlowFileRepository;
-import org.apache.nifi.controller.repository.FlowFileSwapManager;
-import org.apache.nifi.controller.repository.QueueProvider;
-import org.apache.nifi.controller.repository.RepositoryRecord;
-import org.apache.nifi.controller.repository.RepositoryStatusReport;
-import org.apache.nifi.controller.repository.StandardCounterRepository;
-import org.apache.nifi.controller.repository.StandardFlowFileRecord;
-import

[42/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
--
diff --git 
a/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
 
b/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
deleted file mode 100644
index 8dfbaf1..000
--- 
a/nifi/commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
+++ /dev/null
@@ -1,1143 +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.attribute.expression.language;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.nifi.attribute.expression.language.Query.Range;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-import 
org.apache.nifi.attribute.expression.language.exception.AttributeExpressionLanguageException;
-import 
org.apache.nifi.attribute.expression.language.exception.AttributeExpressionLanguageParsingException;
-import org.apache.nifi.expression.AttributeExpression.ResultType;
-import org.apache.nifi.flowfile.FlowFile;
-import org.antlr.runtime.tree.Tree;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-public class TestQuery {
-
-@Test
-public void testCompilation() {
-assertInvalid(${attr:uuid()});
-assertInvalid(${attr:indexOf(length())});
-assertValid(${UUID()});
-assertInvalid(${UUID():nextInt()});
-assertValid(${nextInt()});
-assertValid(${now():format('/MM/dd')});
-assertInvalid(${attr:times(3)});
-assertValid(${attr:toNumber():multiply(3)});
-// left here because it's convenient for looking at the output
-//System.out.println(Query.compile().evaluate(null));
-}
-
-private void assertValid(final String query) {
-try {
-Query.compile(query);
-} catch (final Exception e) {
-e.printStackTrace();
-Assert.fail(Expected query to be valid, but it failed to compile 
due to  + e);
-}
-}
-
-private void assertInvalid(final String query) {
-try {
-Query.compile(query);
-Assert.fail(Expected query to be invalid, but it did compile);
-} catch (final Exception e) {
-}
-}
-
-@Test
-public void testIsValidExpression() {
-Query.validateExpression(${abc:substring(${xyz:length()})}, false);
-Query.isValidExpression(${now():format('-MM-dd')});
-
-
-try {
-Query.validateExpression($${attr}, false);
-Assert.fail(invalid query validated);
-} catch (final AttributeExpressionLanguageParsingException e) {
-}
-
-Query.validateExpression($${attr}, true);
-
-Query.validateExpression(${filename:startsWith('T8MTXBC')\n 
-+ :or( ${filename:startsWith('C4QXABC')} )\n
-+ :or( ${filename:startsWith('U6CXEBC')} )
-+ :or( ${filename:startsWith('KYM3ABC')} )}, false);
-}
-
-
-@Test
-public void testCompileEmbedded() {
-final String expression = ${x:equals( ${y} )};
-final Query query = Query.compile(expression);
-final Tree tree = query.getTree();
-System.out.println( printTree(tree) );
-
-final MapString, String attributes = new HashMap();
-attributes.put(x, x);
-attributes.put(y, x);
-final String result = Query.evaluateExpressions(expression, 
attributes, null);
-assertEquals(true, result);
-
-Query.validateExpression(expression, false);
-}
-
-private String printTree(final Tree

[30/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
 
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
deleted file mode 100644
index edd214b..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/Transaction.java
+++ /dev/null
@@ -1,49 +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.admin.service.transaction;
-
-import java.io.Closeable;
-import org.apache.nifi.admin.service.action.AdministrationAction;
-
-/**
- * Defines a transaction.
- */
-public interface Transaction extends Closeable {
-
-/**
- * Executes the specified action within the current transaction.
- *
- * @param T
- * @param action
- * @return
- * @throws IllegalStateException - if there is no current transaction
- */
-T T execute(AdministrationActionT action);
-
-/**
- * Commits the current transaction.
- *
- * @throws TransactionException - if the transaction is unable to be
- * committed
- */
-void commit() throws TransactionException;
-
-/**
- * Rolls back the current transaction.
- */
-void rollback();
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
 
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
deleted file mode 100644
index 2d2ef82..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionBuilder.java
+++ /dev/null
@@ -1,25 +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.admin.service.transaction;
-
-/**
- *
- */
-public interface TransactionBuilder {
-
-Transaction start() throws TransactionException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
 
b/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
deleted file mode 100644
index 924e01f..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/administration/src/main/java/org/apache/nifi/admin/service/transaction/TransactionException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *

[34/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/wali/pom.xml
--
diff --git a/nifi/commons/wali/pom.xml b/nifi/commons/wali/pom.xml
deleted file mode 100644
index 0d653f8..000
--- a/nifi/commons/wali/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-?xml version=1.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.
---
-project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
-modelVersion4.0.0/modelVersion
-
-parent
-groupIdorg.apache.nifi/groupId
-artifactIdnifi-commons-parent/artifactId
-version0.0.1-incubating-SNAPSHOT/version
-/parent
-
-artifactIdwali/artifactId
-version0.0.1-incubating-SNAPSHOT/version
-packagingjar/packaging
-
-nameWALI : Write-Ahead Log Implementation/name
-
-dependencies
-dependency
-groupIdorg.slf4j/groupId
-artifactIdslf4j-api/artifactId
-/dependency
-dependency
-groupIdorg.apache.nifi/groupId
-artifactIdnifi-utils/artifactId
-/dependency
-/dependencies
-/project

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
--
diff --git 
a/nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java 
b/nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
deleted file mode 100644
index 19208d3..000
--- a/nifi/commons/wali/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
+++ /dev/null
@@ -1,1008 +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.wali;
-
-import static java.util.Objects.requireNonNull;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.channels.FileChannel;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.regex.Pattern;
-
-import org.apache.nifi.stream.io.BufferedInputStream;
-import org.apache.nifi.stream.io.BufferedOutputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- *

[49/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
--
diff --git a/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java 
b/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
new file mode 100644
index 000..da03182
--- /dev/null
+++ b/nifi-nar-maven-plugin/src/main/java/org/apache/nifi/NarMojo.java
@@ -0,0 +1,613 @@
+/*
+ * 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;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.installer.ArtifactInstaller;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
+import org.apache.maven.plugin.dependency.utils.DependencyUtil;
+import org.apache.maven.plugin.dependency.utils.filters.DestFileFilter;
+import org.apache.maven.plugin.dependency.utils.resolvers.ArtifactsResolver;
+import 
org.apache.maven.plugin.dependency.utils.resolvers.DefaultArtifactsResolver;
+import org.apache.maven.plugin.dependency.utils.translators.ArtifactTranslator;
+import 
org.apache.maven.plugin.dependency.utils.translators.ClassifierTypeTranslator;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.project.MavenProjectHelper;
+import 
org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
+import org.apache.maven.shared.artifact.filter.collection.ClassifierFilter;
+import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
+import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
+import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
+import 
org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter;
+import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
+import org.codehaus.plexus.archiver.jar.ManifestException;
+import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * Packages the current project as an Apache NiFi Archive (NAR).
+ *
+ * The following code is derived from maven-dependencies-plugin and
+ * maven-jar-plugin. The functionality of CopyDependenciesMojo and JarMojo was
+ * simplified to the use case of NarMojo.
+ *
+ */
+@Mojo(name = nar, defaultPhase = LifecyclePhase.PACKAGE, threadSafe = false, 
requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class NarMojo extends AbstractMojo {
+
+private static final String[] DEFAULT_EXCLUDES = new 
String[]{**/package.html};
+private static

[18/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
 
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
deleted file mode 100644
index 339d904..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowManagementService.java
+++ /dev/null
@@ -1,115 +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.cluster.flow;
-
-import java.util.Set;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-
-/**
- * A service for managing the cluster's flow. The service will attempt to keep
- * the cluster's dataflow current while respecting the value of the configured
- * retrieval delay.
- *
- * The eligible retrieval time is reset with the configured delay every time 
the
- * flow state is set to STALE. If the state is set to UNKNOWN or CURRENT, then
- * the flow will not be retrieved.
- *
- * Clients must call start() and stop() to initialize and stop the instance.
- *
- * @author unattributed
- */
-public interface DataFlowManagementService {
-
-/**
- * Starts the instance. Start may only be called if the instance is not
- * running.
- */
-void start();
-
-/**
- * Stops the instance. Stop may only be called if the instance is running.
- */
-void stop();
-
-/**
- * @return true if the instance is started; false otherwise.
- */
-boolean isRunning();
-
-/**
- * Loads the dataflow.
- *
- * @return the dataflow or null if no dataflow exists
- */
-ClusterDataFlow loadDataFlow();
-
-/**
- * Updates the dataflow with the given primary node identifier.
- *
- * @param nodeId the node identifier
- *
- * @throws DaoException if the update failed
- */
-void updatePrimaryNode(NodeIdentifier nodeId) throws DaoException;
-
-/**
- * Sets the state of the flow.
- *
- * @param flowState the state
- *
- * @see PersistedFlowState
- */
-void setPersistedFlowState(PersistedFlowState flowState);
-
-/**
- * @return the state of the flow
- */
-PersistedFlowState getPersistedFlowState();
-
-/**
- * @return true if the flow is current; false otherwise.
- */
-boolean isFlowCurrent();
-
-/**
- * Sets the node identifiers to use when attempting to retrieve the flow.
- *
- * @param nodeIds the node identifiers
- */
-void setNodeIds(SetNodeIdentifier nodeIds);
-
-/**
- * Returns the set of node identifiers the service is using to retrieve the
- * flow.
- *
- * @return the set of node identifiers the service is using to retrieve the
- * flow.
- */
-SetNodeIdentifier getNodeIds();
-
-/**
- * @return the retrieval delay in seconds
- */
-int getRetrievalDelaySeconds();
-
-/**
- * Sets the retrieval delay.
- *
- * @param delay the retrieval delay in seconds
- */
-void setRetrievalDelay(String delay);
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
 
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
deleted file mode 100644
index b3afc6e..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See

[43/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
--
diff --git 
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
 
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
deleted file mode 100644
index faa8f0a..000
--- 
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
+++ /dev/null
@@ -1,39 +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.attribute.expression.language.evaluation.functions;
-
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-import 
org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
-import 
org.apache.nifi.attribute.expression.language.evaluation.StringQueryResult;
-
-public class UuidEvaluator extends StringEvaluator {
-
-@Override
-public QueryResultString evaluate(final MapString, String attributes) {
-return new StringQueryResult(UUID.randomUUID().toString());
-}
-
-@Override
-public Evaluator? getSubjectEvaluator() {
-return null;
-}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
--
diff --git 
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
 
b/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
deleted file mode 100644
index a085423..000
--- 
a/nifi/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
+++ /dev/null
@@ -1,44 +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.attribute.expression.language.evaluation.literals;
-
-import java.util.Map;
-
-import 
org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
-import 
org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
-import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
-
-public class BooleanLiteralEvaluator extends BooleanEvaluator {
-
-private final boolean value;
-
-public BooleanLiteralEvaluator(final boolean value) {
-this.value = value;
-}
-
-@Override
-public QueryResultBoolean evaluate(final MapString, String attributes) 
{
-return new BooleanQueryResult(value);
-}
-
-@Override
-public Evaluator? getSubjectEvaluator() {
-return null;
-}
-
-}

[02/10] incubator-nifi git commit: NIFI-270 prepare for next development iteration

2015-01-30 Thread joewitt

NIFI-270 prepare for next development iteration


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

Branch: refs/heads/develop
Commit: 4431d9c2cf8b3e77c566718d941ef6f0ef581414
Parents: 6e69d99
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:28:41 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:28:41 2015 -0500

--
 nifi-nar-maven-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4431d9c2/nifi-nar-maven-plugin/pom.xml
--
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index d032da7..79e437e 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-maven-plugin/artifactId
-version1.0.0-incubating/version
+version1.0.1-incubating-SNAPSHOT/version
 packagingmaven-plugin/packaging
 descriptionApache NiFi Nar Plugin. It is currently a part of the Apache 
Incubator./description
 urlhttp://nifi.incubator.apache.org/maven-site//url
@@ -58,7 +58,7 @@
 
connectionscm:git:git://git.apache.org/incubator-nifi.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection
 urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url
-tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag
+tagHEAD/tag
 /scm
 issueManagement
 systemJIRA/system

[07/10] incubator-nifi git commit: NIFI-270 prepare for next development iteration

2015-01-30 Thread joewitt

NIFI-270 prepare for next development iteration


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

Branch: refs/heads/develop
Commit: 418e932ce68b7f21a4ac900e3223972b20edd487
Parents: 3a76259
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:36:35 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:36:35 2015 -0500

--
 nifi/nifi-api/pom.xml   |  4 +-
 nifi/nifi-assembly/pom.xml  |  4 +-
 nifi/nifi-bootstrap/pom.xml |  2 +-
 .../nifi-data-provenance-utils/pom.xml  |  4 +-
 .../nifi-expression-language/pom.xml|  4 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |  4 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml|  4 +-
 .../nifi-processor-utilities/pom.xml|  4 +-
 nifi/nifi-commons/nifi-properties/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-socket-utils/pom.xml |  4 +-
 nifi/nifi-commons/nifi-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |  4 +-
 nifi/nifi-commons/pom.xml   |  2 +-
 nifi/nifi-docs/pom.xml  |  2 +-
 nifi/nifi-mock/pom.xml  |  4 +-
 .../nifi-framework-nar/pom.xml  |  4 +-
 .../nifi-framework/nifi-administration/pom.xml  |  4 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |  2 +-
 .../nifi-cluster-authorization-provider/pom.xml |  2 +-
 .../nifi-cluster-protocol/pom.xml   |  2 +-
 .../nifi-framework/nifi-cluster-web/pom.xml |  2 +-
 .../nifi-framework/nifi-cluster/pom.xml |  2 +-
 .../nifi-file-authorization-provider/pom.xml|  4 +-
 .../nifi-framework-core-api/pom.xml |  4 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |  2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |  2 +-
 .../nifi-framework/nifi-resources/pom.xml   |  2 +-
 .../nifi-framework/nifi-runtime/pom.xml |  2 +-
 .../nifi-framework/nifi-security/pom.xml|  4 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|  4 +-
 .../nifi-framework/nifi-user-actions/pom.xml|  4 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |  2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |  2 +-
 .../nifi-web/nifi-web-api/pom.xml   |  4 +-
 .../nifi-web/nifi-web-docs/pom.xml  |  2 +-
 .../nifi-web/nifi-web-error/pom.xml |  2 +-
 .../nifi-web-optimistic-locking/pom.xml |  2 +-
 .../nifi-web/nifi-web-security/pom.xml  |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |  2 +-
 .../nifi-framework/nifi-web/pom.xml | 10 +--
 .../nifi-framework/pom.xml  |  4 +-
 .../nifi-framework-bundle/pom.xml   | 36 +--
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |  4 +-
 .../nifi-hdfs-processors/pom.xml|  2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |  6 +-
 .../nifi-hadoop-libraries-nar/pom.xml   |  4 +-
 .../nifi-hadoop-libraries-bundle/pom.xml|  4 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |  4 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml|  4 +-
 .../nifi-kafka-processors/pom.xml   |  2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |  4 +-
 .../pom.xml |  2 +-
 .../nifi-provenance-repository-nar/pom.xml  |  4 +-
 .../nifi-volatile-provenance-repository/pom.xml |  2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |  8 +--
 .../nifi-standard-nar/pom.xml   |  4 +-
 .../nifi-standard-prioritizers/pom.xml  |  2 +-
 .../nifi-standard-processors/pom.xml|  2 +-
 .../nifi-standard-reporting-tasks/pom.xml   |  2 +-
 .../nifi-standard-bundle/pom.xml| 10 +--
 .../pom.xml |  2 +-
 .../pom.xml |  2 +-
 .../nifi-distributed-cache-protocol/pom.xml |  2 +-
 .../nifi-distributed-cache-server/pom.xml   |  2 +-
 .../nifi-distributed-cache-services-nar/pom.xml |  4 +-
 .../pom.xml |  4 +-
 .../nifi-load-distribution-service-api/pom.xml  |  4 +-
 .../nifi-ssl-context-nar/pom.xml|  4 +-
 .../nifi-ssl-context-service/pom.xml|  2 +-
 .../nifi-ssl-context-bundle/pom.xml |  4 +-
 .../nifi-ssl-context-service-api/pom.xml|  2 +-
 .../nifi-standard-services-api-nar/pom.xml  |  4 +-
 .../nifi-standard-services/pom.xml  |  4 +-
 .../nifi-update-attribute-model/pom.xml

[01/10] incubator-nifi git commit: NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3

2015-01-30 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop bafa945a7 - 21619da1b


NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3


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

Branch: refs/heads/develop
Commit: 6e69d99444e22772df300cd777096dc21a7c8e35
Parents: 43e646e
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:28:31 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:28:31 2015 -0500

--
 nifi-nar-maven-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6e69d994/nifi-nar-maven-plugin/pom.xml
--
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index c0f3583..d032da7 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-maven-plugin/artifactId
-version1.0.0-incubating-SNAPSHOT/version
+version1.0.0-incubating/version
 packagingmaven-plugin/packaging
 descriptionApache NiFi Nar Plugin. It is currently a part of the Apache 
Incubator./description
 urlhttp://nifi.incubator.apache.org/maven-site//url
@@ -58,7 +58,7 @@
 
connectionscm:git:git://git.apache.org/incubator-nifi.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection
 urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url
-tagHEAD/tag
+tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag
 /scm
 issueManagement
 systemJIRA/system

[5/5] incubator-nifi git commit: Merge branch 'master' into develop

2015-01-30 Thread joewitt

Merge branch 'master' into develop


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

Branch: refs/heads/develop
Commit: 037f36dd98833d6524e6e8c6c6b1942d7fafbcbb
Parents: 21619da e713258
Author: joewitt joew...@apache.org
Authored: Fri Jan 30 23:22:23 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 30 23:22:23 2015 -0500

--

--

svn commit: r1656162 - /incubator/nifi/site/trunk/content/development/release-guide.md

2015-01-30 Thread joewitt

Author: joewitt
Date: Sat Jan 31 04:49:46 2015
New Revision: 1656162

URL: http://svn.apache.org/r1656162
Log:
added steps learned from 0.0.1 release

Modified:
incubator/nifi/site/trunk/content/development/release-guide.md

Modified: incubator/nifi/site/trunk/content/development/release-guide.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1656162r1=1656161r2=1656162view=diff
==
--- incubator/nifi/site/trunk/content/development/release-guide.md (original)
+++ incubator/nifi/site/trunk/content/development/release-guide.md Sat Jan 31 
04:49:46 2015
@@ -148,13 +148,13 @@ This command `mvn install -Pcheck-licens
 Now its time to have maven prepare the release so execute `mvn release:prepare 
-Psigned_release -DscmCommentPrefix=NIFI-270-RC1  -Darguments=-DskipTests`.
 Maven will ask:
 
-`What is the release version for Apache NiFi NAR Plugin? 
(org.apache.nifi:nifi) 0.0.1-incubating: :`
+`What is the release version for Apache NiFi? (org.apache.nifi:nifi) 
0.0.1-incubating: :`
 
 Just hit enter to accept the default.
 
 Maven will then ask:
 
-`What is SCM release tag or label for Apache NiFi NAR Plugin? 
(org.apache.nifi:nifi) nifi-0.0.1-incubating: : `
+`What is SCM release tag or label for Apache NiFi? (org.apache.nifi:nifi) 
nifi-0.0.1-incubating: : `
 
 Enter `nifi-0.0.1-incubating-RC1` or whatever the appropriate release 
candidate (RC) number is.
 Maven will then ask:
@@ -263,7 +263,7 @@ If so forward the vote to the IPMC.  Sen
  The vote will be open for 72 hours. 
  Please download the release candidate and evaluate the necessary items 
  including checking hashes, signatures, build from source, and test.  The 
  please vote:
  
- [ ] +1 Release this package as nar-maven-plugin-0.0.1-incubating
+ [ ] +1 Release this package as nifi-0.0.1-incubating
  [ ] +0 no opinion
  [ ] -1 Do not release this package because because...
 
@@ -291,7 +291,7 @@ Here are the steps of the release once t
 2. To produce binary convenience release build the application from the raw 
source in staging.  For each binary convenience artifact:  
 - Generate ascii armored detached signature by running `gpg -a -b 
nifi-0.0.1-incubating-bin.tar.gz`
 - Generate md5 hash summary by running `md5sum 
nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,32)}'   
nifi-0.0.1-incubating-bin.tar.gz.md5`
-- Generate sha1 hash summary by running 'sha1sum 
nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,40)}'   
nifi-0.0.1-incubating-bin.tar.gz.sha1'
+- Generate sha1 hash summary by running `sha1sum 
nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,40)}'   
nifi-0.0.1-incubating-bin.tar.gz.sha1`
 - Upload the bin, asc, sha1, md5 for each binary convenience build to the 
same location as the source release
 
 3.  In repository.apache.org go to the staging repository and select `release` 
and follow instructions on the site.

[22/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml 
b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml
deleted file mode 100644
index bad5a29..000
--- a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!--
-  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.
---
-project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
-modelVersion4.0.0/modelVersion
-parent
-groupIdorg.apache.nifi/groupId
-artifactIdnifi-framework-parent/artifactId
-version0.0.1-incubating-SNAPSHOT/version
-/parent
-artifactIdframework-cluster-protocol/artifactId
-packagingjar/packaging
-nameNiFi Framework Cluster Protocol/name
-descriptionThe messaging protocol for clustered NiFi/description
-dependencies
-
-!-- application dependencies --
-dependency
-groupIdorg.apache.nifi/groupId
-artifactIdnifi-api/artifactId
-/dependency
-dependency
-groupIdorg.apache.nifi/groupId
-artifactIdnifi-properties/artifactId
-/dependency
-dependency
-groupIdorg.apache.nifi/groupId
-artifactIdnifi-logging-utils/artifactId
-/dependency
-dependency
-groupIdorg.apache.nifi/groupId
-artifactIdnifi-socket-utils/artifactId
-/dependency
-dependency
-groupIdorg.apache.nifi/groupId
-artifactIdnifi-security/artifactId
-/dependency
-dependency
-groupIdorg.apache.nifi/groupId
-artifactIdcore-api/artifactId
-/dependency
-
-!-- spring dependencies --
-dependency
-groupIdorg.springframework/groupId
-artifactIdspring-core/artifactId
-/dependency
-dependency
-groupIdorg.springframework/groupId
-artifactIdspring-beans/artifactId
-/dependency
-dependency
-groupIdorg.springframework/groupId
-artifactIdspring-context/artifactId
-/dependency
-/dependencies
-/project

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java
 
b/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java
deleted file mode 100644
index fa1547f..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ClusterManagerProtocolSender.java
+++ /dev/null
@@ -1,69 +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.cluster.protocol;
-
-import

[15/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
 
b/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
deleted file mode 100644
index 511bb7d..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ /dev/null
@@ -1,3620 +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.cluster.manager.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.regex.Pattern;
-
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.StreamingOutput;
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
-import org.apache.nifi.admin.service.AuditService;
-import org.apache.nifi.cluster.BulletinsPayload;
-import org.apache.nifi.cluster.ClusterNodeInformation;
-import org.apache.nifi.cluster.HeartbeatPayload;
-import org.apache.nifi.cluster.NodeInformation;
-import org.apache.nifi.cluster.context.ClusterContext;
-import org.apache.nifi.cluster.context.ClusterContextImpl;
-import org.apache.nifi.cluster.event.Event;
-import org.apache.nifi.cluster.event.EventManager;
-import org.apache.nifi.cluster.firewall.ClusterNodeFirewall;
-import org.apache.nifi.cluster.flow.ClusterDataFlow;
-import org.apache.nifi.cluster.flow.DaoException;
-import org.apache.nifi.cluster.flow.DataFlowManagementService;
-import org.apache.nifi.cluster.flow.PersistedFlowState;
-import org.apache.nifi.cluster.manager.HttpClusterManager;
-import org.apache.nifi.cluster.manager.HttpRequestReplicator;
-import org.apache.nifi.cluster.manager.HttpResponseMapper;
-import org.apache.nifi.cluster.manager.NodeResponse;
-import 
org.apache.nifi.cluster.manager.exception.ConnectingNodeMutableRequestException;
-import 
org.apache.nifi.cluster.manager.exception.DisconnectedNodeMutableRequestException;
-import org.apache.nifi.cluster.manager.exception.IllegalClusterStateException;
-import org.apache.nifi.cluster.manager.exception.IllegalNodeDeletionException;
-import 
org.apache.nifi.cluster.manager.exception.IllegalNodeDisconnectionException;
-import 
org.apache.nifi.cluster.manager.exception.IllegalNodeReconnectionException;
-import 
org.apache.nifi.cluster.manager.exception.IneligiblePrimaryNodeException;
-import org.apache.nifi.cluster.manager.exception.NoConnectedNodesException;
-import org.apache.nifi.cluster.manager.exception.NoResponseFromNodesException;
-import

[47/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV2.java
--
diff --git 
a/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV2.java
 
b/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV2.java
deleted file mode 100644
index 500015f..000
--- 
a/nifi/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV2.java
+++ /dev/null
@@ -1,143 +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.util;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-public class FlowFileUnpackagerV2 implements FlowFileUnpackager {
-
-private final byte readBuffer[] = new byte[8192];
-private MapString, String nextAttributes = null;
-private boolean haveReadSomething = false;
-
-@Override
-public boolean hasMoreData() throws IOException {
-return nextAttributes != null || !haveReadSomething;
-}
-
-protected MapString, String readAttributes(final InputStream in) throws 
IOException {
-final MapString, String attributes = new HashMap();
-final Integer numAttributes = readFieldLength(in); //read number of 
attributes
-if (numAttributes == null) {
-return null;
-}
-if (numAttributes == 0) {
-throw new IOException(flow files cannot have zero attributes);
-}
-for (int i = 0; i  numAttributes; i++) { //read each attribute 
key/value pair
-final String key = readString(in);
-final String value = readString(in);
-attributes.put(key, value);
-}
-
-return attributes;
-}
-
-@Override
-public MapString, String unpackageFlowFile(final InputStream in, final 
OutputStream out) throws IOException {
-final MapString, String attributes;
-if (nextAttributes != null) {
-attributes = nextAttributes;
-} else {
-attributes = readAttributes(in);
-}
-
-final long expectedNumBytes = readLong(in); // read length of payload
-copy(in, out, expectedNumBytes); // read payload
-
-nextAttributes = readAttributes(in);
-haveReadSomething = true;
-
-return attributes;
-}
-
-protected String readString(final InputStream in) throws IOException {
-final Integer numBytes = readFieldLength(in);
-if (numBytes == null) {
-throw new EOFException();
-}
-final byte[] bytes = new byte[numBytes];
-fillBuffer(in, bytes, numBytes);
-return new String(bytes, UTF-8);
-}
-
-private void fillBuffer(final InputStream in, final byte[] buffer, final 
int length) throws IOException {
-int bytesRead;
-int totalBytesRead = 0;
-while ((bytesRead = in.read(buffer, totalBytesRead, length - 
totalBytesRead))  0) {
-totalBytesRead += bytesRead;
-}
-if (totalBytesRead != length) {
-throw new EOFException();
-}
-}
-
-protected long copy(final InputStream in, final OutputStream out, final 
long numBytes) throws IOException {
-int bytesRead;
-long totalBytesRead = 0L;
-while ((bytesRead = in.read(readBuffer, 0, (int) 
Math.min(readBuffer.length, numBytes - totalBytesRead)))  0) {
-out.write(readBuffer, 0, bytesRead);
-totalBytesRead += bytesRead;
-}
-
-if (totalBytesRead  numBytes) {
-throw new EOFException(Expected  + numBytes +  but received  + 
totalBytesRead);
-}
-
-return totalBytesRead;
-}
-
-protected long readLong(final InputStream in) throws IOException {
-fillBuffer(in, readBuffer, 8);
-return (((long) readBuffer[0]  56)
-+ ((long) (readBuffer[1]  255)  48)
-+ ((long) (readBuffer[2]  255)  40)
-+ ((long) (readBuffer[3]  255)  32)
-

[48/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
--
diff --git 
a/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
 
b/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
deleted file mode 100644
index afb56e8..000
--- 
a/nifi/commons/data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
+++ /dev/null
@@ -1,324 +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.provenance;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.nifi.provenance.lineage.ComputeLineageResult;
-import org.apache.nifi.provenance.lineage.EdgeNode;
-import org.apache.nifi.provenance.lineage.EventNode;
-import org.apache.nifi.provenance.lineage.FlowFileNode;
-import org.apache.nifi.provenance.lineage.LineageEdge;
-import org.apache.nifi.provenance.lineage.LineageNode;
-
-/**
- *
- */
-public class StandardLineageResult implements ComputeLineageResult {
-
-public static final int TTL = (int) TimeUnit.MILLISECONDS.convert(30, 
TimeUnit.MINUTES);
-private static final Logger logger = 
LoggerFactory.getLogger(StandardLineageResult.class);
-
-private final CollectionString flowFileUuids;
-private final CollectionProvenanceEventRecord relevantRecords = new 
ArrayList();
-private final SetLineageNode nodes = new HashSet();
-private final SetLineageEdge edges = new HashSet();
-private final int numSteps;
-private final long creationNanos;
-private long computationNanos;
-
-private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
-private final Lock readLock = rwLock.readLock();
-private final Lock writeLock = rwLock.writeLock();
-
-private Date expirationDate = null;
-private String error = null;
-private int numCompletedSteps = 0;
-
-private volatile boolean canceled = false;
-
-public StandardLineageResult(final int numSteps, final CollectionString 
flowFileUuids) {
-this.numSteps = numSteps;
-this.creationNanos = System.nanoTime();
-this.flowFileUuids = flowFileUuids;
-
-updateExpiration();
-}
-
-@Override
-public ListLineageNode getNodes() {
-readLock.lock();
-try {
-return new ArrayList(nodes);
-} finally {
-readLock.unlock();
-}
-}
-
-@Override
-public ListLineageEdge getEdges() {
-readLock.lock();
-try {
-return new ArrayList(edges);
-} finally {
-readLock.unlock();
-}
-}
-
-public int getNumberOfEdges() {
-readLock.lock();
-try {
-return edges.size();
-} finally {
-readLock.unlock();
-}
-}
-
-public int getNumberOfNodes() {
-readLock.lock();
-try {
-return nodes.size();
-} finally {
-readLock.unlock();
-}
-}
-
-public long getComputationTime(final TimeUnit timeUnit) {
-readLock.lock();
-try {
-return timeUnit.convert(computationNanos, TimeUnit.NANOSECONDS);
-} finally {
-readLock.unlock();
-}
-}
-
-@Override
-public Date getExpiration() {
-readLock.lock();
-try {
-return expirationDate;
-} finally {
-readLock.unlock();
-}
-}
-
-@Override
-public String getError() {
-readLock.lock();
-try {
-return error;
-

[02/62] [abbrv] [partial] incubator-nifi git commit: NIFI-270 Made all changes identified by adam, mark, joey to prep for a cleaner build

2015-01-30 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f6d9354b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
--
diff --git 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
 
b/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
deleted file mode 100644
index 6c27470..000
--- 
a/nifi/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
+++ /dev/null
@@ -1,111 +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.controller.reporting;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.apache.nifi.controller.AbstractConfiguredComponent;
-import org.apache.nifi.controller.Availability;
-import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.controller.ControllerServiceLookup;
-import org.apache.nifi.controller.ProcessScheduler;
-import org.apache.nifi.controller.ReportingTaskNode;
-import org.apache.nifi.controller.ValidationContextFactory;
-import org.apache.nifi.controller.service.ControllerServiceProvider;
-import org.apache.nifi.controller.service.StandardConfigurationContext;
-import org.apache.nifi.reporting.ReportingTask;
-import org.apache.nifi.scheduling.SchedulingStrategy;
-import org.apache.nifi.util.FormatUtils;
-
-public abstract class AbstractReportingTaskNode extends 
AbstractConfiguredComponent implements ReportingTaskNode {
-
-private final ReportingTask reportingTask;
-private final ProcessScheduler processScheduler;
-private final ControllerServiceLookup serviceLookup;
-
-private final AtomicReferenceSchedulingStrategy schedulingStrategy = new 
AtomicReference(SchedulingStrategy.TIMER_DRIVEN);
-private final AtomicReferenceString schedulingPeriod = new 
AtomicReference(5 mins);
-private final AtomicReferenceAvailability availability = new 
AtomicReference(Availability.NODE_ONLY);
-
-public AbstractReportingTaskNode(final ReportingTask reportingTask, final 
String id,
-final ControllerServiceProvider controllerServiceProvider, final 
ProcessScheduler processScheduler,
-final ValidationContextFactory validationContextFactory) {
-super(reportingTask, id, validationContextFactory, 
controllerServiceProvider);
-this.reportingTask = reportingTask;
-this.processScheduler = processScheduler;
-this.serviceLookup = controllerServiceProvider;
-}
-
-@Override
-public Availability getAvailability() {
-return availability.get();
-}
-
-@Override
-public void setAvailability(final Availability availability) {
-this.availability.set(availability);
-}
-
-@Override
-public void setSchedulingStrategy(final SchedulingStrategy 
schedulingStrategy) {
-this.schedulingStrategy.set(schedulingStrategy);
-}
-
-@Override
-public SchedulingStrategy getSchedulingStrategy() {
-return schedulingStrategy.get();
-}
-
-@Override
-public String getSchedulingPeriod() {
-return schedulingPeriod.get();
-}
-
-@Override
-public long getSchedulingPeriod(final TimeUnit timeUnit) {
-return FormatUtils.getTimeDuration(schedulingPeriod.get(), timeUnit);
-}
-
-@Override
-public void setScheduldingPeriod(final String schedulingPeriod) {
-this.schedulingPeriod.set(schedulingPeriod);
-}
-
-@Override
-public ReportingTask getReportingTask() {
-return reportingTask;
-}
-
-@Override
-public boolean isRunning() {
-return processScheduler.isScheduled(this) || 
processScheduler.getActiveThreadCount(this)  0;
-}
-
-@Override
-public ConfigurationContext getConfigurationContext() {
-return new StandardConfigurationContext(this, serviceLookup);
-}
-
-@Override
-public void verifyModifiable() throws

[62/62] [abbrv] incubator-nifi git commit: Merge tag 'nifi-0.0.1-incubating-RC3'

2015-01-30 Thread joewitt

Merge tag 'nifi-0.0.1-incubating-RC3'

NIFI-270 copy for tag nifi-0.0.1-incubating-RC3


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

Branch: refs/heads/master
Commit: d2c1144870694876552dbf5d487d6cb415223fe9
Parents: 8cd461e 3a76259
Author: joewitt joew...@apache.org
Authored: Fri Jan 30 22:42:12 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 30 22:42:12 2015 -0500

--
 nifi-nar-maven-plugin/pom.xml   |  4 +-
 nifi/nifi-api/pom.xml   |  4 +-
 nifi/nifi-assembly/pom.xml  |  6 +-
 nifi/nifi-bootstrap/pom.xml |  2 +-
 .../nifi-data-provenance-utils/pom.xml  |  4 +-
 .../nifi-expression-language/pom.xml|  4 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |  4 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml|  4 +-
 .../nifi-processor-utilities/pom.xml|  4 +-
 nifi/nifi-commons/nifi-properties/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-socket-utils/pom.xml |  4 +-
 nifi/nifi-commons/nifi-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |  4 +-
 nifi/nifi-commons/pom.xml   |  5 +-
 nifi/nifi-docs/pom.xml  |  6 +-
 nifi/nifi-mock/pom.xml  |  4 +-
 .../nifi-framework-nar/pom.xml  |  4 +-
 .../nifi-framework/nifi-administration/pom.xml  |  4 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |  2 +-
 .../nifi-cluster-authorization-provider/pom.xml |  2 +-
 .../nifi-cluster-protocol/pom.xml   |  2 +-
 .../nifi-framework/nifi-cluster-web/pom.xml |  2 +-
 .../nifi-framework/nifi-cluster/pom.xml |  2 +-
 .../nifi-file-authorization-provider/pom.xml|  4 +-
 .../nifi-framework-core-api/pom.xml |  4 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |  2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |  2 +-
 .../nifi-framework/nifi-resources/pom.xml   |  2 +-
 .../nifi-framework/nifi-runtime/pom.xml |  2 +-
 .../nifi-framework/nifi-security/pom.xml|  4 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|  4 +-
 .../nifi-framework/nifi-user-actions/pom.xml|  4 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |  2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |  2 +-
 .../nifi-web/nifi-web-api/pom.xml   |  4 +-
 .../nifi-web/nifi-web-docs/pom.xml  |  2 +-
 .../nifi-web/nifi-web-error/pom.xml |  2 +-
 .../nifi-web-optimistic-locking/pom.xml |  2 +-
 .../nifi-web/nifi-web-security/pom.xml  |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |  2 +-
 .../nifi-framework/nifi-web/pom.xml | 10 +--
 .../nifi-framework/pom.xml  |  4 +-
 .../nifi-framework-bundle/pom.xml   | 36 +--
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |  4 +-
 .../nifi-hdfs-processors/pom.xml|  2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |  6 +-
 .../nifi-hadoop-libraries-nar/pom.xml   |  4 +-
 .../nifi-hadoop-libraries-bundle/pom.xml|  4 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |  4 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml|  4 +-
 .../nifi-kafka-processors/pom.xml   |  2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |  4 +-
 .../pom.xml |  2 +-
 .../nifi-provenance-repository-nar/pom.xml  |  4 +-
 .../nifi-volatile-provenance-repository/pom.xml |  2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |  8 +--
 .../nifi-standard-nar/pom.xml   |  4 +-
 .../nifi-standard-prioritizers/pom.xml  |  2 +-
 .../nifi-standard-processors/pom.xml|  2 +-
 .../nifi-standard-reporting-tasks/pom.xml   |  2 +-
 .../nifi-standard-bundle/pom.xml| 10 +--
 .../pom.xml |  2 +-
 .../pom.xml |  2 +-
 .../nifi-distributed-cache-protocol/pom.xml |  2 +-
 .../nifi-distributed-cache-server/pom.xml   |  2 +-
 .../nifi-distributed-cache-services-nar/pom.xml |  4 +-
 .../pom.xml |  4 +-
 .../nifi-load-distribution-service-api/pom.xml  |  4 +-
 .../nifi-ssl-context-nar/pom.xml|  4 +-
 .../nifi-ssl-context-service/pom.xml|  2 +-
 .../nifi-ssl-context-bundle/pom.xml |  4 +-
 .../nifi-ssl-context-service-api/pom.xml|  2 +-
 .../nifi-standard-services-api-nar/pom.xml  |  4

svn commit: r938457 - /websites/production/nifi/content/

2015-01-30 Thread joewitt

Author: joewitt
Date: Sat Jan 31 04:59:36 2015
New Revision: 938457

Log:
Publishing svnmucc operation to nifi site by joewitt

Added:
websites/production/nifi/content/
  - copied from r938456, websites/staging/nifi/trunk/content/

svn commit: r1654207 - /incubator/nifi/site/trunk/content/people.md

2015-01-23 Thread joewitt

Author: joewitt
Date: Fri Jan 23 13:37:27 2015
New Revision: 1654207

URL: http://svn.apache.org/r1654207
Log:
CMS commit to nifi by joewitt

Modified:
incubator/nifi/site/trunk/content/people.md

Modified: incubator/nifi/site/trunk/content/people.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/people.md?rev=1654207r1=1654206r2=1654207view=diff
==
--- incubator/nifi/site/trunk/content/people.md (original)
+++ incubator/nifi/site/trunk/content/people.md Fri Jan 23 13:37:27 2015
@@ -64,6 +64,11 @@ The team is comprised of Project Managem
 td/td
 /tr
 tr
+tdjbarnabee/td
+tdJenn Barnabee/td
+td/td
+/tr
+tr
 tdmcgilman/td
 tdMatt Gilman/td
 td/td

Git Push Summary

2015-01-22 Thread joewitt

Repository: incubator-nifi
Updated Tags:  refs/tags/nifi-0.0.1-incubating-RC3 [created] 800bd3028

[1/7] incubator-nifi git commit: NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3

2015-01-22 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/NIFI-270-RC3 [created] 418e932ce


NIFI-270 prepare release nifi-nar-maven-plugin-1.0.0-incubating-RC3


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

Branch: refs/heads/NIFI-270-RC3
Commit: 6e69d99444e22772df300cd777096dc21a7c8e35
Parents: 43e646e
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:28:31 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:28:31 2015 -0500

--
 nifi-nar-maven-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6e69d994/nifi-nar-maven-plugin/pom.xml
--
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index c0f3583..d032da7 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-maven-plugin/artifactId
-version1.0.0-incubating-SNAPSHOT/version
+version1.0.0-incubating/version
 packagingmaven-plugin/packaging
 descriptionApache NiFi Nar Plugin. It is currently a part of the Apache 
Incubator./description
 urlhttp://nifi.incubator.apache.org/maven-site//url
@@ -58,7 +58,7 @@
 
connectionscm:git:git://git.apache.org/incubator-nifi.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection
 urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url
-tagHEAD/tag
+tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag
 /scm
 issueManagement
 systemJIRA/system

[2/7] incubator-nifi git commit: NIFI-270 prepare for next development iteration

2015-01-22 Thread joewitt

NIFI-270 prepare for next development iteration


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

Branch: refs/heads/NIFI-270-RC3
Commit: 4431d9c2cf8b3e77c566718d941ef6f0ef581414
Parents: 6e69d99
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:28:41 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:28:41 2015 -0500

--
 nifi-nar-maven-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4431d9c2/nifi-nar-maven-plugin/pom.xml
--
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index d032da7..79e437e 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-maven-plugin/artifactId
-version1.0.0-incubating/version
+version1.0.1-incubating-SNAPSHOT/version
 packagingmaven-plugin/packaging
 descriptionApache NiFi Nar Plugin. It is currently a part of the Apache 
Incubator./description
 urlhttp://nifi.incubator.apache.org/maven-site//url
@@ -58,7 +58,7 @@
 
connectionscm:git:git://git.apache.org/incubator-nifi.git/connection
 
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git/developerConnection
 urlhttps://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git/url
-tagnifi-nar-maven-plugin-1.0.0-incubating-RC3/tag
+tagHEAD/tag
 /scm
 issueManagement
 systemJIRA/system

[7/7] incubator-nifi git commit: NIFI-270 prepare for next development iteration

2015-01-22 Thread joewitt

NIFI-270 prepare for next development iteration


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

Branch: refs/heads/NIFI-270-RC3
Commit: 418e932ce68b7f21a4ac900e3223972b20edd487
Parents: 3a76259
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:36:35 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:36:35 2015 -0500

--
 nifi/nifi-api/pom.xml   |  4 +-
 nifi/nifi-assembly/pom.xml  |  4 +-
 nifi/nifi-bootstrap/pom.xml |  2 +-
 .../nifi-data-provenance-utils/pom.xml  |  4 +-
 .../nifi-expression-language/pom.xml|  4 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |  4 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml|  4 +-
 .../nifi-processor-utilities/pom.xml|  4 +-
 nifi/nifi-commons/nifi-properties/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-socket-utils/pom.xml |  4 +-
 nifi/nifi-commons/nifi-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |  4 +-
 nifi/nifi-commons/pom.xml   |  2 +-
 nifi/nifi-docs/pom.xml  |  2 +-
 nifi/nifi-mock/pom.xml  |  4 +-
 .../nifi-framework-nar/pom.xml  |  4 +-
 .../nifi-framework/nifi-administration/pom.xml  |  4 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |  2 +-
 .../nifi-cluster-authorization-provider/pom.xml |  2 +-
 .../nifi-cluster-protocol/pom.xml   |  2 +-
 .../nifi-framework/nifi-cluster-web/pom.xml |  2 +-
 .../nifi-framework/nifi-cluster/pom.xml |  2 +-
 .../nifi-file-authorization-provider/pom.xml|  4 +-
 .../nifi-framework-core-api/pom.xml |  4 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |  2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |  2 +-
 .../nifi-framework/nifi-resources/pom.xml   |  2 +-
 .../nifi-framework/nifi-runtime/pom.xml |  2 +-
 .../nifi-framework/nifi-security/pom.xml|  4 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|  4 +-
 .../nifi-framework/nifi-user-actions/pom.xml|  4 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |  2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |  2 +-
 .../nifi-web/nifi-web-api/pom.xml   |  4 +-
 .../nifi-web/nifi-web-docs/pom.xml  |  2 +-
 .../nifi-web/nifi-web-error/pom.xml |  2 +-
 .../nifi-web-optimistic-locking/pom.xml |  2 +-
 .../nifi-web/nifi-web-security/pom.xml  |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |  2 +-
 .../nifi-framework/nifi-web/pom.xml | 10 +--
 .../nifi-framework/pom.xml  |  4 +-
 .../nifi-framework-bundle/pom.xml   | 36 +--
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |  4 +-
 .../nifi-hdfs-processors/pom.xml|  2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |  6 +-
 .../nifi-hadoop-libraries-nar/pom.xml   |  4 +-
 .../nifi-hadoop-libraries-bundle/pom.xml|  4 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |  4 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml|  4 +-
 .../nifi-kafka-processors/pom.xml   |  2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |  4 +-
 .../pom.xml |  2 +-
 .../nifi-provenance-repository-nar/pom.xml  |  4 +-
 .../nifi-volatile-provenance-repository/pom.xml |  2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |  8 +--
 .../nifi-standard-nar/pom.xml   |  4 +-
 .../nifi-standard-prioritizers/pom.xml  |  2 +-
 .../nifi-standard-processors/pom.xml|  2 +-
 .../nifi-standard-reporting-tasks/pom.xml   |  2 +-
 .../nifi-standard-bundle/pom.xml| 10 +--
 .../pom.xml |  2 +-
 .../pom.xml |  2 +-
 .../nifi-distributed-cache-protocol/pom.xml |  2 +-
 .../nifi-distributed-cache-server/pom.xml   |  2 +-
 .../nifi-distributed-cache-services-nar/pom.xml |  4 +-
 .../pom.xml |  4 +-
 .../nifi-load-distribution-service-api/pom.xml  |  4 +-
 .../nifi-ssl-context-nar/pom.xml|  4 +-
 .../nifi-ssl-context-service/pom.xml|  2 +-
 .../nifi-ssl-context-bundle/pom.xml |  4 +-
 .../nifi-ssl-context-service-api/pom.xml|  2 +-
 .../nifi-standard-services-api-nar/pom.xml  |  4 +-
 .../nifi-standard-services/pom.xml  |  4 +-
 .../nifi-update-attribute-model/pom.xml

[3/7] incubator-nifi git commit: NIFI 270 updating nar version

2015-01-22 Thread joewitt

NIFI 270 updating nar version


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

Branch: refs/heads/NIFI-270-RC3
Commit: 0b692b1d8205007a796b41b5df692e00d68addc4
Parents: 4431d9c
Author: joewitt joew...@apache.org
Authored: Fri Jan 23 01:30:27 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 23 01:30:27 2015 -0500

--
 nifi/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/0b692b1d/nifi/pom.xml
--
diff --git a/nifi/pom.xml b/nifi/pom.xml
index 9dac476..fb94135 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -973,7 +973,7 @@
 plugin
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-maven-plugin/artifactId
-version1.0.0-incubating-SNAPSHOT/version
+version1.0.0-incubating/version
 extensionstrue/extensions
 /plugin
 /plugins

[6/7] incubator-nifi git commit: NIFI-270 prepare for next development iteration

2015-01-22 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
index 64215c6..deb787f 100644
--- 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
@@ -18,7 +18,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-processor/artifactId

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
index 70aefc6..04b9ad6 100644
--- 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
@@ -18,7 +18,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 artifactIdnifi-update-attribute-ui/artifactId
 packagingwar/packaging

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
--
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
index e20e77b..dcb63e4 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
@@ -18,11 +18,11 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-bundles/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 packagingpom/packaging
 
 modules
@@ -37,18 +37,18 @@
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-model/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-processor/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-ui/artifactId
 typewar/type
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /dependency
 /dependencies
 /dependencyManagement

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/418e932c/nifi/nifi-nar-bundles/pom.xml
--
diff --git a/nifi/nifi-nar-bundles/pom.xml b/nifi/nifi-nar-bundles/pom.xml
index fa65abe..4ee6875 100644
--- a/nifi/nifi-nar-bundles/pom.xml
+++ b/nifi/nifi-nar-bundles/pom.xml
@@ -19,12 +19,12 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /parent
 
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-bundles/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 packagingpom/packaging
 
 modules
@@ -43,70 +43,70 @@
 dependency
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-distributed-cache-client-service/artifactId
-version0.0.1-incubating/version
+version0.0.2-incubating-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.nifi/groupId
 
artifactIdnifi-distributed-cache-client-service-api/artifactId
-version0.0.1-incubating/version
+

svn commit: r1656265 - /incubator/nifi/site/trunk/content/downloads/index.md

2015-01-31 Thread joewitt

Author: joewitt
Date: Sun Feb  1 04:09:49 2015
New Revision: 1656265

URL: http://svn.apache.org/r1656265
Log:
fixed path to sigs and hashes

Modified:
incubator/nifi/site/trunk/content/downloads/index.md

Modified: incubator/nifi/site/trunk/content/downloads/index.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/downloads/index.md?rev=1656265r1=1656264r2=1656265view=diff
==
--- incubator/nifi/site/trunk/content/downloads/index.md (original)
+++ incubator/nifi/site/trunk/content/downloads/index.md Sun Feb  1 04:09:49 
2015
@@ -14,7 +14,7 @@ Releases
 *  0.0.1-incubating
 *  [Release 
Notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020version=12329078)
 *  Sources:
-*  
[nifi-0.0.1-incubating-source-release.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip)
 ( 
[asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc),
 
[md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5),
 
[sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1)
 )
+*  
[nifi-0.0.1-incubating-source-release.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip)
 ( 
[asc](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc),
 
[md5](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5),
 
[sha1](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1)
 )
 *  Binaries:
-*  
[nifi-0.0.1-incubating-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz)
 ( 
[asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.asc),
 
[md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.md5),
 
[sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.sha1)
 )
-*  
[nifi-0.0.1-incubating-bin.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip)
 ( 
[asc](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.asc),
 
[md5](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.md5),
 
[sha1](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.sha1)
 )
\ No newline at end of file
+*  
[nifi-0.0.1-incubating-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz)
 ( 
[asc](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.asc),
 
[md5](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.md5),
 
[sha1](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.tar.gz.sha1)
 )
+*  
[nifi-0.0.1-incubating-bin.zip](https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip)
 ( 
[asc](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.asc),
 
[md5](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.md5),
 
[sha1](https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating/nifi-0.0.1-incubating-bin.zip.sha1)
 )
\ No newline at end of file

svn commit: r1656385 - /incubator/nifi/site/trunk/content/development/quickstart.md

2015-02-01 Thread joewitt

Author: joewitt
Date: Mon Feb  2 03:40:33 2015
New Revision: 1656385

URL: http://svn.apache.org/r1656385
Log:
cleaned up a bit

Modified:
incubator/nifi/site/trunk/content/development/quickstart.md

Modified: incubator/nifi/site/trunk/content/development/quickstart.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/quickstart.md?rev=1656385r1=1656384r2=1656385view=diff
==
--- incubator/nifi/site/trunk/content/development/quickstart.md (original)
+++ incubator/nifi/site/trunk/content/development/quickstart.md Mon Feb  2 
03:40:33 2015
@@ -10,12 +10,6 @@ Apache NiFi source code is version contr
 
 The code is also mirrored to [Github][githubrepo]
 
-The code as it was initially contributed and entered the incubator is on the 
'master' branch.
-
-To view the lastest codebase as we work toward an initial release checkout the 
'develop' branch.
-
-All guidance that follows assumes you are working on the 'develop' branch.
-
 ## Issue Tracking
 
 Track issues on the NIFI Project on the Apache Jira ([browse][jira]).
@@ -35,11 +29,15 @@ Then checkout the 'develop' branch
 ### Build steps
 
 1. You need a recent Java 7 (or newer) JDK.
-2. You need Apache [Maven 3.X][maven]. We've successfully used 3.2.3 and as 
far back as 3.0.5
-3. Build the maven plugins.  In the root dir of the source tree cd to 
`nifi-nar-maven-plugin`.
-   Run `mvn clean install`
-4. Build the entire code base.  In the root dir of the source tree cd to 
`nifi` and run `mvn -T C2.0 clean install`
-   You can tweak the maven build settings as you like but the previous command 
will execute with 2 threads per core.
+2. You need Apache [Maven 3.X][maven]. 
+- We've successfully used 3.2.3 and as far back as 3.0.5
+3. [OPTIONAL] Build the nifi nar maven plugin.  
+- In the root dir of the source tree cd to `nifi-nar-maven-plugin`.
+- Run `mvn clean install`
+4. Build the main nifi code base.  
+- In the root dir of the source tree cd to `nifi` 
+- run `mvn -T C2.0 clean install`
+- You can tweak the maven build settings as you like but the previous 
command will execute with 2 threads per core.
 
 Now you should have a fully functioning build off the latest code in the 
develop branch.

svn commit: r1656386 - /incubator/nifi/site/trunk/content/development/quickstart.md

2015-02-01 Thread joewitt

Author: joewitt
Date: Mon Feb  2 03:47:01 2015
New Revision: 1656386

URL: http://svn.apache.org/r1656386
Log:
cleaned up a bit

Modified:
incubator/nifi/site/trunk/content/development/quickstart.md

Modified: incubator/nifi/site/trunk/content/development/quickstart.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/quickstart.md?rev=1656386r1=1656385r2=1656386view=diff
==
--- incubator/nifi/site/trunk/content/development/quickstart.md (original)
+++ incubator/nifi/site/trunk/content/development/quickstart.md Mon Feb  2 
03:47:01 2015
@@ -2,7 +2,6 @@ Title: Apache NiFi Development Quick
 
 # img alt=NiFi logo style=float: right 
src=/images/niFi-logo-horizontal.png / Apache NiFi Development Quickstart
 
-This documentation is in progress, but should get many started at building 
Apache NiFi.
 
 ## Source Code

svn commit: r938613 - /websites/production/nifi/content/

2015-02-01 Thread joewitt

Author: joewitt
Date: Mon Feb  2 03:47:39 2015
New Revision: 938613

Log:
Publishing svnmucc operation to nifi site by joewitt

Added:
websites/production/nifi/content/
  - copied from r938612, websites/staging/nifi/trunk/content/

svn commit: r1656381 - /incubator/nifi/site/trunk/templates/skeleton.html

2015-02-01 Thread joewitt

Author: joewitt
Date: Mon Feb  2 02:36:38 2015
New Revision: 1656381

URL: http://svn.apache.org/r1656381
Log:
trying to address funky text formatting

Modified:
incubator/nifi/site/trunk/templates/skeleton.html

Modified: incubator/nifi/site/trunk/templates/skeleton.html
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/templates/skeleton.html?rev=1656381r1=1656380r2=1656381view=diff
==
--- incubator/nifi/site/trunk/templates/skeleton.html (original)
+++ incubator/nifi/site/trunk/templates/skeleton.html Mon Feb  2 02:36:38 2015
@@ -32,11 +32,11 @@
 
   {% include nav.html %}
 
-  div class=jumbotron
-!--div id=content--
+  !--div class=jumbotron--
+div id=content
   {% block content %}{{ content|markdown }}{% endblock %}
-!--/div--
-  /div
+/div
+  !--/div--
 div id=footer
   a alt=Apache Software Foundation href=http://www.apache.org;
img id=asf-logo alt=Apache Software Foundation 
src=/images/feather-small.gif

svn commit: r1656380 - /incubator/nifi/site/trunk/templates/skeleton.html

2015-02-01 Thread joewitt

Author: joewitt
Date: Mon Feb  2 02:33:33 2015
New Revision: 1656380

URL: http://svn.apache.org/r1656380
Log:
trying to address funky text formatting

Modified:
incubator/nifi/site/trunk/templates/skeleton.html

Modified: incubator/nifi/site/trunk/templates/skeleton.html
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/templates/skeleton.html?rev=1656380r1=1656379r2=1656380view=diff
==
--- incubator/nifi/site/trunk/templates/skeleton.html (original)
+++ incubator/nifi/site/trunk/templates/skeleton.html Mon Feb  2 02:33:33 2015
@@ -33,9 +33,9 @@
   {% include nav.html %}
 
   div class=jumbotron
-div id=content
+!--div id=content--
   {% block content %}{{ content|markdown }}{% endblock %}
-/div
+!--/div--
   /div
 div id=footer
   a alt=Apache Software Foundation href=http://www.apache.org;

svn commit: r938605 - /websites/production/nifi/content/

2015-02-01 Thread joewitt

Author: joewitt
Date: Mon Feb  2 02:54:04 2015
New Revision: 938605

Log:
Publishing svnmucc operation to nifi site by joewitt

Added:
websites/production/nifi/content/
  - copied from r938604, websites/staging/nifi/trunk/content/

svn commit: r1656379 - /incubator/nifi/site/trunk/content/index.mdtext

2015-02-01 Thread joewitt

Author: joewitt
Date: Mon Feb  2 02:24:52 2015
New Revision: 1656379

URL: http://svn.apache.org/r1656379
Log:
simplified description/messaging

Modified:
incubator/nifi/site/trunk/content/index.mdtext

Modified: incubator/nifi/site/trunk/content/index.mdtext
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/index.mdtext?rev=1656379r1=1656378r2=1656379view=diff
==
--- incubator/nifi/site/trunk/content/index.mdtext (original)
+++ incubator/nifi/site/trunk/content/index.mdtext Mon Feb  2 02:24:52 2015
@@ -18,17 +18,28 @@ Notice:Licensed to the Apache Softwa
 
 # img alt=NiFi logo style=float: right 
src=/images/niFi-logo-horizontal.png / Apache NiFi
 
-Apache NiFi is a dataflow system based on the concepts of flow-based 
programming. It is currently a part of the Apache Incubator.
+Apache NiFi is an easy to use, powerful, and reliable system to process and 
distribute data.
 
 ## Features
 
-Apache NiFi supports powerful and scalable directed graphs of data routing, 
transformation, and system mediation logic. Some of the high-level capabilities 
and objectives of Apache NiFi include:
+Apache NiFi was born for dataflow.  It supports highly configurable directed 
graphs of data routing, transformation, and system mediation logic.  Some of 
its key features include:
 
-- Web-based user interface for seamless experience between design, control, 
feedback, and monitoring of data flows
-- Highly configurable along several dimensions of quality of service such as 
loss tolerant versus guaranteed delivery, low latency versus high throughput, 
and priority based queuing
-- Fine-grained data provenance for all data received, forked, joined, cloned, 
modified, sent, and ultimately dropped as data reaches its configured end-state
-- Component-based extension model along well defined interfaces enabling rapid 
development and effective testing
-- Security: Supports various forms of SSL, SSH, HTTPS for system to system 
flows and content encryption/decryption.  And SSL, PKI, pluggable authorization 
for users.
+- Web-based user interface 
+- Seamless and intuitive experience between design, control, and monitoring
+- Highly configurable
+- Loss tolerant vs guaranteed delivery
+- Low latency vs high throughput
+- Dynamic prioritization
+- Flows can be modified at runtime
+- Back pressure
+- Data Provenance
+- Track data from beginning to end even across multiple generations
+- Designed for extension
+- Build your own processors and more
+- Enables rapid development and effective testing
+- Secure
+- SSL, SSH, HTTPS, encrypted content, etc...
+- Pluggable role-based authentication/authorization
 
 ## Disclaimer

incubator-nifi git commit: NIFI-225 updating error handling to provide more context in output for date format parsing

2015-01-06 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop 7e70fd53e - d8b4a781d


NIFI-225 updating error handling to provide more context in output for date 
format parsing


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

Branch: refs/heads/develop
Commit: d8b4a781d2b1ced7deb42b19b41bf6c3c463f623
Parents: 7e70fd5
Author: joewitt joew...@apache.org
Authored: Tue Jan 6 09:23:19 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Tue Jan 6 09:23:19 2015 -0500

--
 .../expression/language/evaluation/cast/DateCastEvaluator.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8b4a781/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
--
diff --git 
a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
 
b/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
index b6d758c..2a18240 100644
--- 
a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
+++ 
b/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
@@ -72,7 +72,8 @@ public class DateCastEvaluator extends DateEvaluator {
 final Date date = sdf.parse(value);
 return new DateQueryResult(date);
 } catch (final ParseException pe) {
-throw new AttributeExpressionLanguageException(Could 
not parse input as date, pe);
+final String details = Format: ' + 
DATE_TO_STRING_FORMAT + ' Value: ' + value + ';
+throw new AttributeExpressionLanguageException(Could 
not parse date using  + details, pe);
 }
 } else if (NUMBER_PATTERN.matcher(value).matches()) {
 return new DateQueryResult(new Date(Long.valueOf(value)));

svn commit: r935770 - /websites/production/nifi/content/

2015-01-10 Thread joewitt

Author: joewitt
Date: Sun Jan 11 01:33:55 2015
New Revision: 935770

Log:
Publishing svnmucc operation to nifi site by joewitt

Added:
websites/production/nifi/content/
  - copied from r935769, websites/staging/nifi/trunk/content/

incubator-nifi git commit: NIFI-242 RTC process deviation as this changeset is for must-have license headers. Apache RAT now integrated and working in build

2015-01-10 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop ed8b2f602 - 7d85962e4


NIFI-242 RTC process deviation as this changeset is for must-have license 
headers.  Apache RAT now integrated and working in build


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

Branch: refs/heads/develop
Commit: 7d85962e4d5274e1e3cda9e3ca9adb40bbd65762
Parents: ed8b2f6
Author: joewitt joew...@apache.org
Authored: Sat Jan 10 22:29:13 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Sat Jan 10 22:29:13 2015 -0500

--
 LICENSE |   3 +
 .../output/AttributeExpressionLexer.tokens  |  16 +++
 .../src/main/resources/conf/bootstrap.conf  |  17 +++
 .../apache/nifi/processors/kafka/GetKafka.java  |  16 +++
 .../org.apache.nifi.processor.Processor |  14 ++
 .../nifi/processors/kafka/TestPutKafka.java |  16 +++
 .../ui/src/main/webapp/META-INF/nifi-processor  |  16 ++-
 .../index.html  |  51 
 .../ui/src/main/webapp/META-INF/nifi-processor  |  16 ++-
 nar-maven-plugin/pom.xml| 131 +--
 pom.xml |  16 +++
 11 files changed, 301 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 3757939..d10784d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -584,3 +584,6 @@ For details see http://aopalliance.sourceforge.net
 This product bundles 'json2.js' which is available in the 'public domain'.  
 For details see https://github.com/douglascrockford/JSON-js
 
+This product bundles 'reset.css' which is available in the 'public domain'.
+For details see http://meyerweb.com/eric/tools/css/reset/
+

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens
--
diff --git 
a/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens
 
b/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens
index 1b973c8..0265bfb 100755
--- 
a/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens
+++ 
b/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 ALL_ATTRIBUTES=4
 ALL_DELINEATED_VALUES=5
 ALL_MATCHING_ATTRIBUTES=6

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
--
diff --git 
a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
 
b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
index 8568e64..c1536d8 100644
--- 
a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
+++ 
b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
@@ -1,3 +1,20 @@
+#
+# 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

incubator-nifi git commit: NIFI-242 additional rat exclusion for ide generated file already ignored by Git - wish Rat honored Git ignores

2015-01-10 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop 7d85962e4 - 7ded9970a


NIFI-242 additional rat exclusion for ide generated file already ignored by Git 
- wish Rat honored Git ignores


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

Branch: refs/heads/develop
Commit: 7ded9970a2ec9cacd8862aa9d06e5513dd07cfbf
Parents: 7d85962
Author: joewitt joew...@apache.org
Authored: Sat Jan 10 22:49:57 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Sat Jan 10 22:49:57 2015 -0500

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7ded9970/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a297ddd..9ff1e83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -987,6 +987,7 @@
 excludesrc/main/webapp/css/reset.css/exclude
 excludesrc/test/resources//exclude !-- Test 
datasets --
 excludenb-configuration.xml/exclude
+excludenbactions.xml/exclude
 excludenar-maven-plugin//exclude
 /excludes
 /configuration

[3/3] incubator-nifi git commit: NIFI-245: make the maven plugin releasable.

2015-01-11 Thread joewitt

NIFI-245: make the maven plugin releasable.

Signed-off-by: joewitt joew...@apache.org


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

Branch: refs/heads/develop
Commit: 83dc133472e36a118bc797da9e9df9f7c10d4fff
Parents: 7ded997
Author: Benson Margulies ben...@basistech.com
Authored: Sun Jan 11 08:45:25 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Sun Jan 11 14:41:10 2015 -0500

--
 nar-maven-plugin/pom.xml | 29 ++---
 1 file changed, 18 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/83dc1334/nar-maven-plugin/pom.xml
--
diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml
index 7d1a7e6..8ace19f 100644
--- a/nar-maven-plugin/pom.xml
+++ b/nar-maven-plugin/pom.xml
@@ -163,17 +163,24 @@
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-release-plugin/artifactId
 version2.5.1/version
-configuration
-arguments-P apache-release,check-licenses/arguments
-autoVersionSubmodulestrue/autoVersionSubmodules
-goalsclean compile javadoc:aggregate deploy/goals
-preparationGoalsclean compile javadoc:aggregate 
verify/preparationGoals
-tagNameFormat@{project.version}/tagNameFormat
-releaseProfilesseal-jars/releaseProfiles
-useReleaseProfilefalse/useReleaseProfile
-pushChangesfalse/pushChanges
-localCheckouttrue/localCheckout
-/configuration
+executions
+  execution
+iddefault/id
+goals
+  goalprepare/goal
+  goalperform/goal
+/goals
+configuration
+  pomFileNameplatform/pom.xml/pomFileName
+  arguments-P 
apache-release,check-licenses/arguments
+  autoVersionSubmodulestrue/autoVersionSubmodules
+  goalsdeploy/goals
+  tagNameFormat@{project.version}/tagNameFormat
+  pushChangesfalse/pushChanges
+  localCheckouttrue/localCheckout
+/configuration
+  /execution
+/executions
 /plugin
 plugin
 groupIdorg.apache.maven.plugins/groupId

svn commit: r1651033 - /incubator/nifi/site/trunk/templates/nav.html

2015-01-11 Thread joewitt

Author: joewitt
Date: Mon Jan 12 04:18:00 2015
New Revision: 1651033

URL: http://svn.apache.org/r1651033
Log:
updated to use scaled nifi image

Modified:
incubator/nifi/site/trunk/templates/nav.html

Modified: incubator/nifi/site/trunk/templates/nav.html
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/templates/nav.html?rev=1651033r1=1651032r2=1651033view=diff
==
--- incubator/nifi/site/trunk/templates/nav.html (original)
+++ incubator/nifi/site/trunk/templates/nav.html Mon Jan 12 04:18:00 2015
@@ -8,7 +8,7 @@
 span class=icon-bar/span
 span class=icon-bar/span
 /button
-a class=navbar-brand href=/index.htmlimg alt=Apache NiFi 
src=/images/logo76x32.png//a
+a class=navbar-brand href=/index.htmlimg alt=Apache NiFi 
src=/images/niFi-logo-horizontal-scaled.png//a
 /div
 div id=navbar class=navbar-collapse collapse
 ul class=nav navbar-nav

Git Push Summary

2015-01-11 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/NIFI-240 [deleted] a76e91bcc

[2/2] incubator-nifi git commit: Merge branch 'NIFI-240' into develop

2015-01-11 Thread joewitt

Merge branch 'NIFI-240' into develop


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

Branch: refs/heads/develop
Commit: 67362a99084d7c50304d43df846c840ab965923d
Parents: aaa2992 a76e91b
Author: joewitt joew...@apache.org
Authored: Sun Jan 11 21:40:43 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Sun Jan 11 21:40:43 2015 -0500

--
 .../src/main/webapp/images/bg-error.png | Bin 90275 - 63766 bytes
 .../src/main/webapp/images/bgNifiLogo.png   | Bin 1682 - 4232 bytes
 .../src/main/webapp/images/loadAnimation.gif| Bin 7854 - 10789 bytes
 .../src/main/webapp/images/nifi16.ico   | Bin 1150 - 1150 bytes
 .../src/main/webapp/images/nifi_about.png   | Bin 18958 - 16323 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
--

incubator-nifi git commit: NIFI-162 added some content to the administrator guide

2015-01-09 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop 3b16d010c - d996060db


NIFI-162 added some content to the administrator guide


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

Branch: refs/heads/develop
Commit: d996060dbfa63b1e1384289ca32d80e851d0edd7
Parents: 3b16d01
Author: joewitt joew...@apache.org
Authored: Fri Jan 9 13:33:34 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 9 13:33:34 2015 -0500

--
 .../src/main/asciidoc/administration-guide.adoc | 73 ++--
 1 file changed, 67 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d996060d/nifi-docs/src/main/asciidoc/administration-guide.adoc
--
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc 
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 529bddf..9f8c2bc 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -19,18 +19,79 @@ NiFi System Administrator's Guide
 Apache NiFi Team d...@nifi.incubator.apache.org
 :homepage: http://nifi.incubator.apache.org
 
-How to install
---
-Installation instructions...
+How to install and start NiFi
+-
+NOTE: This section is incomplete.
+
+* Linux
+** Decompress and untar into desired installation directory.
+** Make any desired edits in files found under installdir/conf
+** Execute the following commands
+*** start: starts NiFi in the background
+*** stop: stops NiFi that is running in the background
+*** status: provides the current status of NiFi
+*** run: runs NiFi in the foreground and waits for a Ctl-C to initiate 
shutdown of NiFi
+*** intall: installs NiFi as a service that can then be controlled via
+ service nifi start
+ service nifi stop
+ service nifi status
 
 Best Practice Configuration
 ---
-The following are things which are good to check...
+NOTE: Typical Linux defaults are not necessarily well tuned for the needs of 
an IO intensive application like
+NiFi.  For all of these areas your distributions requirements may vary.  Use 
these sections as advice but
+consult your distribution specific documentation for how best to achieve these 
recommendations.
+
+Maximum File Handles::
+NiFi will at any one time potentially have a very large number of file handles 
open.  Increase the limits by
+editing '/etc/security/limits.conf' to add
+something like
+
+*  hard  nofile  5
+*  soft  nofile  5
+
+Maximum Forked Processes::
+NiFi may be configured to generate a significant number of threads.  To 
increase the allowable number edit '/etc/security/limits.conf'
+
+*  hard  nproc  1
+*  soft  nproc  1
+
+And your distribution may require an edit to 
/etc/security/limits.d/90-nproc.conf by adding
+
+*  soft  nproc  1
+
+
+Increase the number of TCP socket ports available::
+This is particularly important if your flow will be setting up and tearing 
+down a large number of sockets in small period of time.
+
+sudo sysctl -w net.ipv4.ip_local_port_range=1 65000
+
+
+Set how long sockets stay in a TIMED_WAIT state when closed::
+You don't want your sockets to sit and linger too long given that you want to 
be 
+able to quickly setup and teardown new sockets.  It is a good idea to read 
more about
+it but to adjust do something like
+
+sudo sysctl -w net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait=1
+
+
+Tell linux you never want NiFi to swap::
+Swapping is fantastic for some applications.  It isn't good for something like
+NiFi that always wants to be running.  To tell linux you'd like swapping off 
you
+can edit '/etc/sysctl.conf' to add the following line
+
+vm.swappiness = 0
+
+For the partions handling the various NiFi repos turn off things like 'atime'.
+Doing so can cause a surprising bump in throughput.  Edit the '/etc/fstab' file
+and for the partition(s) of interest add the 'noatime' option.
 
 Security Configuration
 --
-Two-way SSL...
+NOTE: This section is incomplete.
+
 
 Controlling Levels of Access
 
-Within the web-ui 
+NOTE: This section is incomplete.
\ No newline at end of file

incubator-nifi git commit: NIFI-239: Updated deprecated methods and classes for GetHTTP

2015-01-09 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop 002926882 - 591134276


NIFI-239: Updated deprecated methods and classes for GetHTTP

Signed-off-by: joewitt joew...@apache.org


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

Branch: refs/heads/develop
Commit: 59113427667b679d0c71cda1ed8878be5cc7db71
Parents: 0029268
Author: Mark Payne marka...@hotmail.com
Authored: Fri Jan 9 15:25:14 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 9 15:28:28 2015 -0500

--
 .../nifi/processors/standard/GetHTTP.java   | 175 ++
 .../processors/standard/HelloWorldServlet.java  |  41 +
 .../nifi/processors/standard/TestGetHTTP.java   | 176 +-
 .../processors/standard/TestInvokeHTTP.java |  46 +
 .../nifi/processors/standard/TestServer.java| 177 +++
 5 files changed, 464 insertions(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/59113427/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
--
diff --git 
a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
 
b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
index 85fc1ac..35873b1 100644
--- 
a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
+++ 
b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
@@ -20,8 +20,15 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -42,6 +49,24 @@ import java.util.regex.Pattern;
 
 import javax.net.ssl.SSLContext;
 
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContexts;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.ValidationContext;
 import org.apache.nifi.components.ValidationResult;
@@ -62,21 +87,6 @@ import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.ssl.SSLContextService;
 import org.apache.nifi.ssl.SSLContextService.ClientAuth;
 import org.apache.nifi.util.StopWatch;
-import org.apache.http.Header;
-import org.apache.http.HttpResponse;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.params.ClientPNames;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.BasicClientConnectionManager;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
 
 @Tags({get, fetch, poll, http, https, ingest, source, input})
 @CapabilityDescription(Fetches a file via HTTP)
@@ -263,6 +273,28 @@ public class GetHTTP extends 
AbstractSessionFactoryProcessor {
 return results;
 }
 
+
+private

incubator-nifi git commit: NIFI-242 added section for generating release sources and signing and running apache rat - borrowed from accumulo

2015-01-09 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop d996060db - 002926882


NIFI-242 added section for generating release sources and signing and running 
apache rat - borrowed from accumulo


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

Branch: refs/heads/develop
Commit: 002926882bbe8e6669236c241087c0bcaef3120b
Parents: d996060
Author: joewitt joew...@apache.org
Authored: Fri Jan 9 14:56:59 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Fri Jan 9 14:56:59 2015 -0500

--
 pom.xml | 89 
 1 file changed, 89 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/00292688/pom.xml
--
diff --git a/pom.xml b/pom.xml
index dc751a1..7cd64c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -950,4 +950,93 @@
 /plugin
 /plugins
 /build
+profiles
+profile
+idapache-release/id
+build
+plugins
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-assembly-plugin/artifactId
+dependencies
+dependency
+groupIdorg.apache.apache.resources/groupId
+
artifactIdapache-source-release-assembly-descriptor/artifactId
+version1.0.4/version
+/dependency
+/dependencies
+executions
+execution
+idsource-release-assembly/id
+goals
+goalsingle/goal
+/goals
+phasevalidate/phase
+configuration
+
runOnlyAtExecutionRoottrue/runOnlyAtExecutionRoot
+
finalNamenifi-${project.version}/finalName
+descriptorRefs
+
descriptorRefsource-release-zip-tar/descriptorRef
+/descriptorRefs
+tarLongFileFormatgnu/tarLongFileFormat
+/configuration
+/execution
+/executions
+/plugin
+plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdexec-maven-plugin/artifactId
+executions
+execution
+idrename-source-release-assembly/id
+goals
+goalexec/goal
+/goals
+phasevalidate/phase
+configuration
+executablemv/executable
+
workingDirectory${project.build.directory}/workingDirectory
+commandlineArgs-n 
nifi-${project.version}-source-release.tar.gz 
nifi-${project.version}-src.tar.gz/commandlineArgs
+successCodes
+successCode0/successCode
+successCode1/successCode
+/successCodes
+/configuration
+/execution
+/executions
+/plugin
+/plugins
+/build
+/profile
+profile
+!-- Seal jars and skip tests when the
+apache-release profile is activated. --
+idseal-jars/id
+properties
+sealJarstrue/sealJars
+skipTeststrue/skipTests
+/properties
+/profile
+profile
+!-- Automatically check for licenses.
+Activate with -P check-licenses --
+idcheck-licenses/id
+build
+plugins
+plugin
+groupIdorg.apache.rat/groupId
+artifactIdapache-rat-plugin/artifactId
+executions
+execution
+goals

incubator-nifi git commit: NIFI-228 fixed build to always create assembly non-attached and to use curren maven approaches

2015-01-06 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop 23dcdeb61 - 33ad7934e


NIFI-228 fixed build to always create assembly non-attached and to use curren 
maven approaches


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

Branch: refs/heads/develop
Commit: 33ad7934eaaf257190c3e96f6ecf46b378808912
Parents: 23dcdeb
Author: joewitt joew...@apache.org
Authored: Tue Jan 6 13:43:54 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Tue Jan 6 13:43:54 2015 -0500

--
 assembly/pom.xml| 114 ++---
 assembly/src/main/assembly/dependencies.xml | 121 ---
 2 files changed, 116 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/33ad7934/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0d00da3..e785c45 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -28,68 +28,26 @@
 build
 plugins
 plugin
-artifactIdmaven-dependency-plugin/artifactId
-executions
-execution
-idunpack-shared-resources/id
-goals
-goalunpack-dependencies/goal
-/goals
-phasegenerate-resources/phase
-configuration
-
outputDirectory${project.build.directory}/generated-resources/outputDirectory
-
includeArtifactIdsnifi-resources/includeArtifactIds
-includeGroupIdsorg.apache.nifi/includeGroupIds
-excludeTransitivefalse/excludeTransitive
-/configuration
-/execution
-execution
-idunpack-docs/id
-goals
-goalunpack-dependencies/goal
-/goals
-phasegenerate-resources/phase
-configuration
-
outputDirectory${project.build.directory}/generated-docs/outputDirectory
-includeArtifactIdsnifi-docs/includeArtifactIds
-includeGroupIdsorg.apache.nifi/includeGroupIds
-excludeTransitivefalse/excludeTransitive
-/configuration
-/execution
-/executions
-/plugin
-plugin
 artifactIdmaven-assembly-plugin/artifactId
 configuration
-descriptors
-
descriptorsrc/main/assembly/dependencies.xml/descriptor
-/descriptors
+attachtrue/attach
 /configuration
-/plugin
-plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdexec-maven-plugin/artifactId
 executions
 execution
+idmake shared resource/id
 goals
-goalexec/goal
+goalsingle/goal
 /goals
+phasepackage/phase
+configuration
+descriptors
+
descriptorsrc/main/assembly/dependencies.xml/descriptor
+/descriptors
+/configuration
 /execution
-/executions
-configuration
-
executable${project.build.directory}/${project.artifactId}-${project.version}-${nifi.assembly.id}.dir/${nifi.executable}/executable
-/configuration
+/executions
 /plugin
 /plugins
-resources
-resource
-directory${basedir}/src/main/resources/directory
-/resource
-resource
-
directory${project.build.directory}/generated-resources/directory
-filteringtrue/filtering
-/resource
-/resources
 /build
 dependencies
 dependency
@@ -133,14 +91,14 @@
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-resources/artifactId
 classifierresources/classifier
-scopeprovided/scope !-- Provided - we don't want the zip in 
the libs --
+scoperuntime/scope

[1/2] incubator-nifi git commit: NIFI-162 In the User Guide, I added an overview (stolen from the web page), added the Data Provenance section, and copy-edited all the existing sections.

2015-01-06 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop 4b322b8f5 - 4d11ff783


NIFI-162 In the User Guide, I added an overview (stolen from the web page), 
added the Data Provenance section, and copy-edited all the existing sections.

Signed-off-by: joewitt joew...@apache.org


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

Branch: refs/heads/develop
Commit: c27f7b05745279491e9c58f8678abd8fe49d6db5
Parents: 4b322b8
Author: Jenn Barnabee jennifer.barna...@gmail.com
Authored: Tue Jan 6 19:26:33 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Tue Jan 6 21:31:04 2015 -0500

--
 .../main/asciidoc/images/event-attributes.png   | Bin 0 - 94668 bytes
 .../src/main/asciidoc/images/event-content.png  | Bin 0 - 88726 bytes
 .../src/main/asciidoc/images/event-details.png  | Bin 0 - 139736 bytes
 .../src/main/asciidoc/images/expand-event.png   | Bin 0 - 40476 bytes
 .../main/asciidoc/images/expanded-events.png| Bin 0 - 76082 bytes
 .../src/main/asciidoc/images/find-parents.png   | Bin 0 - 35831 bytes
 .../src/main/asciidoc/images/iconLineage.png| Bin 0 - 2214 bytes
 .../src/main/asciidoc/images/iconProvenance.png | Bin 0 - 2268 bytes
 .../main/asciidoc/images/iconViewDetails.png| Bin 0 - 1788 bytes
 .../main/asciidoc/images/lineage-flowfile.png   | Bin 0 - 3855 bytes
 .../asciidoc/images/lineage-graph-annotated.png | Bin 0 - 170122 bytes
 .../src/main/asciidoc/images/parent-found.png   | Bin 0 - 42814 bytes
 .../asciidoc/images/provenance-annotated.png| Bin 0 - 530929 bytes
 .../main/asciidoc/images/provenance-table.png   | Bin 0 - 466599 bytes
 .../src/main/asciidoc/images/search-events.png  | Bin 0 - 62626 bytes
 .../images/search-receive-event-abc.png | Bin 0 - 67817 bytes
 nifi-docs/src/main/asciidoc/user-guide.adoc | 320 ---
 17 files changed, 208 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c27f7b05/nifi-docs/src/main/asciidoc/images/event-attributes.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/event-attributes.png 
b/nifi-docs/src/main/asciidoc/images/event-attributes.png
new file mode 100644
index 000..2ac4f43
Binary files /dev/null and 
b/nifi-docs/src/main/asciidoc/images/event-attributes.png differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c27f7b05/nifi-docs/src/main/asciidoc/images/event-content.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/event-content.png 
b/nifi-docs/src/main/asciidoc/images/event-content.png
new file mode 100644
index 000..f7b32a5
Binary files /dev/null and 
b/nifi-docs/src/main/asciidoc/images/event-content.png differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c27f7b05/nifi-docs/src/main/asciidoc/images/event-details.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/event-details.png 
b/nifi-docs/src/main/asciidoc/images/event-details.png
new file mode 100644
index 000..066aa99
Binary files /dev/null and 
b/nifi-docs/src/main/asciidoc/images/event-details.png differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c27f7b05/nifi-docs/src/main/asciidoc/images/expand-event.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/expand-event.png 
b/nifi-docs/src/main/asciidoc/images/expand-event.png
new file mode 100644
index 000..95eb8ab
Binary files /dev/null and 
b/nifi-docs/src/main/asciidoc/images/expand-event.png differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c27f7b05/nifi-docs/src/main/asciidoc/images/expanded-events.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/expanded-events.png 
b/nifi-docs/src/main/asciidoc/images/expanded-events.png
new file mode 100644
index 000..18bec5d
Binary files /dev/null and 
b/nifi-docs/src/main/asciidoc/images/expanded-events.png differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c27f7b05/nifi-docs/src/main/asciidoc/images/find-parents.png
--
diff --git a/nifi-docs/src/main/asciidoc/images/find-parents.png 
b/nifi-docs/src/main/asciidoc/images/find-parents.png
new file mode 100644
index 000..57fe72e
Binary files /dev/null and 
b/nifi-docs/src/main/asciidoc/images/find-parents.png differ

http://git-wip-us.apache.org/repos

[2/2] incubator-nifi git commit: NIFI-150 small mod to fix references title

2015-01-06 Thread joewitt

NIFI-150 small mod to fix references title


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

Branch: refs/heads/develop
Commit: 4d11ff78303b2039cbe89f5a675bb595388259f8
Parents: c27f7b0
Author: joewitt joew...@apache.org
Authored: Tue Jan 6 21:54:29 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Tue Jan 6 21:54:29 2015 -0500

--
 nifi-docs/src/main/asciidoc/overview.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4d11ff78/nifi-docs/src/main/asciidoc/overview.adoc
--
diff --git a/nifi-docs/src/main/asciidoc/overview.adoc 
b/nifi-docs/src/main/asciidoc/overview.adoc
index 158dbc5..fa1a5f1 100644
--- a/nifi-docs/src/main/asciidoc/overview.adoc
+++ b/nifi-docs/src/main/asciidoc/overview.adoc
@@ -283,7 +283,8 @@ Clustering (scale-out)::
 help.  Use of NiFi's 'site-to-site' feature is also very effective as it 
is a protocol that allows NiFi and a client (could be another NiFi cluster) to 
talk to each other, share information
 about loading, and to exchange data on specific authorized ports.
 
-# References
+References
+--
 [bibliography]
 - [[[eip]]] Gregor Hohpe. Enterprise Integration Patterns [online].  
Retrieved: 27 Dec 2014, from: http://www.enterpriseintegrationpatterns.com/
 - [[[soa]]] Wikipedia. Service Oriented Architecture [online]. Retrieved: 27 
Dec 2014, from: http://en.wikipedia.org/wiki/Service-oriented_architecture

svn commit: r936004 - /websites/production/nifi/content/

2015-01-12 Thread joewitt

Author: joewitt
Date: Tue Jan 13 03:37:29 2015
New Revision: 936004

Log:
Publishing svnmucc operation to nifi site by joewitt

Added:
websites/production/nifi/content/
  - copied from r936003, websites/staging/nifi/trunk/content/

svn commit: r935999 - /websites/production/nifi/content/

2015-01-12 Thread joewitt

Author: joewitt
Date: Tue Jan 13 03:15:40 2015
New Revision: 935999

Log:
Publishing svnmucc operation to nifi site by joewitt

Added:
websites/production/nifi/content/
  - copied from r935998, websites/staging/nifi/trunk/content/

svn commit: r1651271 - /incubator/nifi/site/trunk/content/people.md

2015-01-12 Thread joewitt

Author: joewitt
Date: Tue Jan 13 03:25:28 2015
New Revision: 1651271

URL: http://svn.apache.org/r1651271
Log:
CMS commit to nifi by joewitt

Modified:
incubator/nifi/site/trunk/content/people.md

Modified: incubator/nifi/site/trunk/content/people.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/people.md?rev=1651271r1=1651270r2=1651271view=diff
==
--- incubator/nifi/site/trunk/content/people.md (original)
+++ incubator/nifi/site/trunk/content/people.md Tue Jan 13 03:25:28 2015
@@ -7,7 +7,7 @@ A successful project requires many peopl
 The team is comprised of Project Management Committee Members and 
Contributors. Members have direct access to the source of a project and 
actively evolve the code-base. Contributors improve the project through 
submission of patches and suggestions to the Members. The number of 
Contributors to the project is unbounded. Get involved today. All contributions 
to the project are greatly appreciated.
 
 ## PPMC Members
-table class=table table-striped table-condensed
+table class=table table-striped table-condensed width=60%
 tr
 thId/th
 thName/th
@@ -88,7 +88,7 @@ The team is comprised of Project Managem
 ## Committers
 The following is a list of developers with commit privileges that have 
directly contributed to the project in one way or another.
 
-table class=table table-striped table-condensed
+table class=table table-striped table-condensed width=60%
 tr
 thId/th
 thName/th

svn commit: r1651270 - /incubator/nifi/site/trunk/content/people.md

2015-01-12 Thread joewitt

Author: joewitt
Date: Tue Jan 13 03:23:27 2015
New Revision: 1651270

URL: http://svn.apache.org/r1651270
Log:
condensed table

Modified:
incubator/nifi/site/trunk/content/people.md

Modified: incubator/nifi/site/trunk/content/people.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/people.md?rev=1651270r1=1651269r2=1651270view=diff
==
--- incubator/nifi/site/trunk/content/people.md (original)
+++ incubator/nifi/site/trunk/content/people.md Tue Jan 13 03:23:27 2015
@@ -7,7 +7,7 @@ A successful project requires many peopl
 The team is comprised of Project Management Committee Members and 
Contributors. Members have direct access to the source of a project and 
actively evolve the code-base. Contributors improve the project through 
submission of patches and suggestions to the Members. The number of 
Contributors to the project is unbounded. Get involved today. All contributions 
to the project are greatly appreciated.
 
 ## PPMC Members
-table class=table table-striped
+table class=table table-striped table-condensed
 tr
 thId/th
 thName/th
@@ -88,7 +88,7 @@ The team is comprised of Project Managem
 ## Committers
 The following is a list of developers with commit privileges that have 
directly contributed to the project in one way or another.
 
-table class=table table-striped
+table class=table table-striped table-condensed
 tr
 thId/th
 thName/th

svn commit: r1651272 - /incubator/nifi/site/trunk/content/development/quickstart.md

2015-01-12 Thread joewitt

Author: joewitt
Date: Tue Jan 13 03:45:20 2015
New Revision: 1651272

URL: http://svn.apache.org/r1651272
Log:
CMS commit to nifi by joewitt

Modified:
incubator/nifi/site/trunk/content/development/quickstart.md

Modified: incubator/nifi/site/trunk/content/development/quickstart.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/quickstart.md?rev=1651272r1=1651271r2=1651272view=diff
==
--- incubator/nifi/site/trunk/content/development/quickstart.md (original)
+++ incubator/nifi/site/trunk/content/development/quickstart.md Tue Jan 13 
03:45:20 2015
@@ -34,9 +34,7 @@ Then checkout the 'develop' branch
 
 ### Build steps
 
-We're planning on revising these steps, our build process, and tests for much 
more deterministic builds. For now, the steps are not automated.
-
-1. You need a recent Java 7 JDK.
+1. You need a recent Java 7 (or newer) JDK.
 2. You need Apache [Maven 3.X][maven]. We've successfully used 3.2.3 and as 
far back as 3.0.5
 3. Build the nar maven plugin.  In the root dir of the source tree cd to 
`nar-maven-plugin`.
Run `mvn clean install`

[2/4] incubator-nifi git commit: NIFI-291 made all the licensing/notice changes for source v binary and so on as suggested in last release

2015-02-04 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4a49ba7f/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE
 
b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE
new file mode 100644
index 000..3600719
--- /dev/null
+++ 
b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,359 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  License shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  Licensor shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  Legal Entity shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  control means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  You (or Your) shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  Source form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  Object form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  Work shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  Derivative Works shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  Contribution shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, submitted
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as Not a Contribution.
+
+  Contributor shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and

[3/4] incubator-nifi git commit: NIFI-291 made all the licensing/notice changes for source v binary and so on as suggested in last release

2015-02-04 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4a49ba7f/nifi/nifi-assembly/NOTICE
--
diff --git a/nifi/nifi-assembly/NOTICE b/nifi/nifi-assembly/NOTICE
new file mode 100644
index 000..7d42538
--- /dev/null
+++ b/nifi/nifi-assembly/NOTICE
@@ -0,0 +1,529 @@
+nifi-assembly
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+===
+Apache Software License v2
+===
+
+The following binary components are provided under the Apache Software License 
v2
+
+  (ASLv2) Apache Commons IO
+The following NOTICE information applies:
+  Apache Commons IO
+  Copyright 2002-2012 The Apache Software Foundation
+
+  (ASLv2) Apache Commons Net
+The following NOTICE information applies:
+  Apache Commons Net
+  Copyright 2001-2013 The Apache Software Foundation
+
+  (ASLv2) Apache Commons Collections
+The following NOTICE information applies:
+  Apache Commons Collections
+  Copyright 2001-2013 The Apache Software Foundation   
+
+  (ASLv2) Apache Commons Compress
+The following NOTICE information applies:
+  Apache Commons Compress
+  Copyright 2002-2014 The Apache Software Foundation
+
+  The files in the package org.apache.commons.compress.archivers.sevenz
+  were derived from the LZMA SDK, version 9.20 (C/ and CPP/7zip/),
+  which has been placed in the public domain:
+
+  LZMA SDK is placed in the public domain. 
(http://www.7-zip.org/sdk.html)
+
+  (ASLv2) Jettison
+The following NOTICE information applies:
+ Copyright 2006 Envoi Solutions LLC
+
+  (ASLv2) Jasypt
+The following NOTICE information applies:
+ Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org)
+
+  (ASLv2) Apache Commons Codec
+The following NOTICE information applies:
+  Apache Commons Codec
+  Copyright 2002-2014 The Apache Software Foundation
+
+  src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+  contains test data from http://aspell.net/test/orig/batch0.tab.
+  Copyright (C) 2002 Kevin Atkinson (kev...@gnu.org)
+
+  
===
+
+  The content of package org.apache.commons.codec.language.bm has been 
translated
+  from the original php source code available at 
http://stevemorse.org/phoneticinfo.htm
+  with permission from the original authors.
+  Original source copyright:
+  Copyright (c) 2008 Alexander Beider  Stephen P. Morse.
+
+  (ASLv2) Apache HttpComponents
+The following NOTICE information applies:
+  Apache HttpClient
+  Copyright 1999-2014 The Apache Software Foundation
+  
+  Apache HttpCore
+  Copyright 2005-2014 The Apache Software Foundation
+
+  This project contains annotations derived from JCIP-ANNOTATIONS
+  Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
+
+  (ASLv2) Apache Jakarta HttpClient
+The following NOTICE information applies:
+  Apache Jakarta HttpClient
+  Copyright 1999-2007 The Apache Software Foundation
+
+  (ASLv2) Apache Commons Logging
+The following NOTICE information applies:
+  Apache Commons Logging
+  Copyright 2003-2013 The Apache Software Foundation
+
+  (ASLv2) Apache Commons Lang
+The following NOTICE information applies:
+  Apache Commons Lang
+  Copyright 2001-2014 The Apache Software Foundation
+
+  This product includes software from the Spring Framework,
+  under the Apache License 2.0 (see: StringUtils.containsWhitespace())
+
+  (ASLv2) Spring Framework
+The following NOTICE information applies:
+  Spring Framework 4.1.4.RELEASE
+  Copyright (c) 2002-2014 Pivotal, Inc.
+
+  (ASLv2) Apache Commons CLI
+The following NOTICE information applies:
+  Apache Commons CLI
+  Copyright 2001-2009 The Apache Software Foundation
+
+  (ASLv2) Apache Commons Math
+The following NOTICE information applies:
+  Apache Commons Math
+  Copyright 2001-2012 The Apache Software Foundation
+
+  This product includes software developed by
+  The Apache Software Foundation (http://www.apache.org/).
+
+  
===
+
+  The BracketFinder (package 
org.apache.commons.math3.optimization.univariate)
+  and PowellOptimizer (package 
org.apache.commons.math3.optimization.general)
+  classes are based on the Python code in module optimize.py (version 
0.5)
+  developed by Travis E. Oliphant for the SciPy library 
(http://www.scipy.org/)
+  Copyright Â© 2003-2009 SciPy Developers.
+  
===
+
+  The

[4/4] incubator-nifi git commit: NIFI-291 made all the licensing/notice changes for source v binary and so on as suggested in last release

2015-02-04 Thread joewitt

NIFI-291 made all the licensing/notice changes for source v binary and so on as 
suggested in last release


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

Branch: refs/heads/develop
Commit: 4a49ba7f706f2fe7c9ef77524e9dc1353c238ec8
Parents: ed53b46
Author: joewitt joew...@apache.org
Authored: Thu Feb 5 00:42:12 2015 -0500
Committer: joewitt joew...@apache.org
Committed: Thu Feb 5 00:42:12 2015 -0500

--
 nifi/LICENSE| 328 +++-
 nifi/NOTICE |   8 -
 nifi/README.md  |  26 +-
 nifi/nifi-assembly/LICENSE  | 780 +++
 nifi/nifi-assembly/NOTICE   | 529 +
 nifi/nifi-assembly/README.md| 124 +++
 nifi/nifi-assembly/pom.xml  |   6 +-
 .../src/main/assembly/dependencies.xml  |   6 +-
 .../src/main/resources/META-INF/LICENSE | 264 +++
 .../src/main/resources/META-INF/NOTICE  | 131 
 .../nifi-web/nifi-web-api/pom.xml   |   2 +-
 .../src/main/resources/META-INF/NOTICE  |  27 +
 .../src/main/resources/META-INF/NOTICE  |  19 +
 .../src/main/resources/META-INF/LICENSE | 434 +++
 .../src/main/resources/META-INF/NOTICE  |  35 +
 .../src/main/resources/META-INF/LICENSE | 359 +
 .../src/main/resources/META-INF/NOTICE  | 237 ++
 .../src/main/resources/META-INF/NOTICE  |  37 +
 .../src/main/resources/META-INF/LICENSE | 299 +++
 .../src/main/resources/META-INF/NOTICE  |  72 ++
 .../src/main/resources/META-INF/NOTICE  | 202 +
 .../src/main/resources/META-INF/LICENSE | 292 +++
 .../src/main/resources/META-INF/NOTICE  | 119 +++
 .../src/main/resources/META-INF/NOTICE  |  19 +
 .../src/main/resources/META-INF/NOTICE  |  19 +
 .../src/main/resources/META-INF/NOTICE  |  19 +
 .../src/main/resources/META-INF/LICENSE | 238 ++
 .../src/main/resources/META-INF/NOTICE  |  49 ++
 nifi/pom.xml|   3 +-
 29 files changed, 4419 insertions(+), 264 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4a49ba7f/nifi/LICENSE
--
diff --git a/nifi/LICENSE b/nifi/LICENSE
index d10784d..6832114 100644
--- a/nifi/LICENSE
+++ b/nifi/LICENSE
@@ -208,139 +208,8 @@ notices and license terms. Your use of the source code 
for the these
 subcomponents is subject to the terms and conditions of the following
 licenses. 
 
-The binary distribution of this product bundles 'Antlr 3' which is available
-under a 3-clause BSD license.  For details see 
http://www.antlr3.org/license.html
-
-Copyright (c) 2010 Terence Parr
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, 
this 
-list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, 
-this list of conditions and the following disclaimer in the documentation 
-and/or other materials provided with the distribution.
-Neither the name of the author nor the names of its contributors may be 
used 
-to endorse or promote products derived from this software without specific 
-prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS 
IS 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-THE POSSIBILITY OF SUCH DAMAGE.
-
-The binary distribution of this product bundles 'Paranamer Core' which is 
-available under a 3-clause BSD license.  
-For details see http://paranamer.codehaus.org/paranamer
-
-Copyright (c

svn commit: r1657479 - /incubator/nifi/site/trunk/templates/nav.html

2015-02-04 Thread joewitt

Author: joewitt
Date: Thu Feb  5 06:04:54 2015
New Revision: 1657479

URL: http://svn.apache.org/r1657479
Log:
added entry for upcoming licensing guide

Modified:
incubator/nifi/site/trunk/templates/nav.html

Modified: incubator/nifi/site/trunk/templates/nav.html
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/templates/nav.html?rev=1657479r1=1657478r2=1657479view=diff
==
--- incubator/nifi/site/trunk/templates/nav.html (original)
+++ incubator/nifi/site/trunk/templates/nav.html Thu Feb  5 06:04:54 2015
@@ -47,6 +47,7 @@
 ul class=dropdown-menu role=menu
 lia 
href=/development/quickstart.htmlQuickstart/a/li
lia 
href=/development/release-guide.htmlRelease Guide/a/li
+   lia 
href=/development/licensing-guide.htmlLicensing Guide/a/li
lia 
href=/docs/nifi-docs/developer-guide.htmlDeveloper Guide/a/li
 
 lia 
href=https://git-wip-us.apache.org/repos/asf/incubator-nifi.git;span 
class=glyphicon glyphicon-link aria-hidden=true/span Source/a/li

incubator-nifi git commit: NIFI-410 removed unecessary NOTICE for JsonPath PathCompiler

2015-03-14 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop cc890e291 - cf49dad27


NIFI-410 removed unecessary NOTICE for JsonPath PathCompiler


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

Branch: refs/heads/develop
Commit: cf49dad2712a92cf8c3e53e0d3070b33482cc97b
Parents: cc890e2
Author: joewitt joew...@apache.org
Authored: Sat Mar 14 22:36:14 2015 -0400
Committer: joewitt joew...@apache.org
Committed: Sat Mar 14 22:36:14 2015 -0400

--
 nifi/NOTICE | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cf49dad2/nifi/NOTICE
--
diff --git a/nifi/NOTICE b/nifi/NOTICE
index 43af4d1..9686fba 100644
--- a/nifi/NOTICE
+++ b/nifi/NOTICE
@@ -4,8 +4,3 @@ Copyright 2014-2015 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-The source release of this product bundles a modified 
-version of PathCompiler from https://github.com/jayway/JsonPath 
-The following notice information applies
-Copyright 2011 Kalle Stenflo, Jochen Berger 
-

svn commit: r1666773 - /incubator/nifi/site/trunk/content/development/release-guide.md

2015-03-14 Thread joewitt

Author: joewitt
Date: Sun Mar 15 03:12:43 2015
New Revision: 1666773

URL: http://svn.apache.org/r1666773
Log:
NIFI-410 simplified hash/signature check guidance

Modified:
incubator/nifi/site/trunk/content/development/release-guide.md

Modified: incubator/nifi/site/trunk/content/development/release-guide.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1666773r1=1666772r2=1666773view=diff
==
--- incubator/nifi/site/trunk/content/development/release-guide.md (original)
+++ incubator/nifi/site/trunk/content/development/release-guide.md Sun Mar 15 
03:12:43 2015
@@ -71,10 +71,8 @@ There are two lists here: one of specifi
 - Validate the hashes of the sources artifact do in fact match:
   - 
`https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5`
   - 
`https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1`
-- Validate the signatures of the sources artifact and of each of the 
hashes.  Here are example paths:
+- Validate the signature of the source artifact.  Here is an example path:
   - 
`https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc`
-  - 
`https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc.md5`
-  - 
`https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc.sha1`
   - Need a quick reminder on how to [verify a 
signature](http://www.apache.org/dev/release-signing.html#verifying-signature)?
   - Do all sources have necessary headers?
 - Unzip the sources file into a directory and execute `mvn install 
-Pcheck-licenses`

[3/9] incubator-nifi git commit: NIFI-402-RC1 prepare for next development iteration

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/171dae3c/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
index de343e5..dccc7a0 100644
--- 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
@@ -17,7 +17,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-standard-services/artifactId
-version0.0.2-incubating/version
+version0.0.3-incubating-SNAPSHOT/version
 /parent
 artifactIdnifi-ssl-context-service-api/artifactId
 packagingjar/packaging

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/171dae3c/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
index 60a6a8c..d914ef6 100644
--- 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
@@ -17,7 +17,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-standard-services/artifactId
-version0.0.2-incubating/version
+version0.0.3-incubating-SNAPSHOT/version
 /parent
 artifactIdnifi-standard-services-api-nar/artifactId
 packagingnar/packaging

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/171dae3c/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
--
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml 
b/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
index 9d32647..a27b6ca 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
@@ -18,7 +18,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-nar-bundles/artifactId
-version0.0.2-incubating/version
+version0.0.3-incubating-SNAPSHOT/version
 /parent
 artifactIdnifi-standard-services/artifactId
 packagingpom/packaging

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/171dae3c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
index 493bac2..1b425f2 100644
--- 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
@@ -18,7 +18,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.2-incubating/version
+version0.0.3-incubating-SNAPSHOT/version
 /parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-model/artifactId

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/171dae3c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
index 530281f..8c83fe7 100644
--- 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
@@ -17,7 +17,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-update-attribute-bundle/artifactId
-version0.0.2-incubating/version
+version0.0.3-incubating-SNAPSHOT/version
 /parent
 artifactIdnifi-update-attribute-nar/artifactId
 packagingnar/packaging

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/171dae3c/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
index ed348f8..4222574 100644
---

[07/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
new file mode 100644
index 000..4233d88
--- /dev/null
+++ 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
@@ -0,0 +1,171 @@
+/*
+ * 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.cluster.protocol.impl;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.InetSocketAddress;
+import java.net.MulticastSocket;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.nifi.cluster.protocol.ProtocolContext;
+import org.apache.nifi.cluster.protocol.ProtocolException;
+import org.apache.nifi.cluster.protocol.ProtocolHandler;
+import org.apache.nifi.cluster.protocol.ProtocolMessageMarshaller;
+import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
+import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
+import org.apache.nifi.cluster.protocol.message.MulticastProtocolMessage;
+import org.apache.nifi.cluster.protocol.message.PingMessage;
+import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
+import org.apache.nifi.io.socket.multicast.MulticastConfiguration;
+import org.apache.nifi.io.socket.multicast.MulticastUtils;
+import org.junit.After;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * @author unattributed
+ */
+public class MulticastProtocolListenerTest {
+
+private MulticastProtocolListener listener;
+
+private MulticastSocket socket;
+
+private InetSocketAddress address;
+
+private MulticastConfiguration configuration;
+
+private ProtocolContext protocolContext;
+
+@Before
+public void setup() throws Exception {
+
+address = new InetSocketAddress(226.1.1.1, 6);
+configuration = new MulticastConfiguration();
+
+protocolContext = new 
JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
+
+listener = new MulticastProtocolListener(5, address, configuration, 
protocolContext);
+listener.start();
+
+socket = MulticastUtils.createMulticastSocket(address.getPort(), 
configuration);
+}
+
+@After
+public void teardown() throws IOException {
+try {
+if(listener.isRunning()) {
+listener.stop();
+}
+} finally {
+MulticastUtils.closeQuietly(socket);
+}
+}
+
+@Ignore(Test needs to be reworked.  Fails if on a system without actiev 
network connection)
+@Test
+public void testBadRequest() throws Exception {
+DelayedProtocolHandler handler = new DelayedProtocolHandler(0);
+listener.addHandler(handler);
+DatagramPacket packet = new DatagramPacket(new byte[] {5}, 1, address);
+socket.send(packet);
+Thread.sleep(250);
+assertEquals(0, handler.getMessages().size());
+}
+
+@Ignore(this test works sometimes and fails others - needs work to be 
reliable)
+@Test
+public void testRequest() throws Exception {
+
+ReflexiveProtocolHandler handler = new ReflexiveProtocolHandler();
+listener.addHandler(handler);
+
+ProtocolMessage msg = new PingMessage();
+MulticastProtocolMessage multicastMsg = new 
MulticastProtocolMessage(some-id, msg);
+
+// marshal message to output stream
+ProtocolMessageMarshaller marshaller =

[13/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
deleted file mode 100644
index 4d5455f..000
--- 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ /dev/null
@@ -1,3628 +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.cluster.manager.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.regex.Pattern;
-
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.StreamingOutput;
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.nifi.admin.service.AuditService;
-import org.apache.nifi.cluster.BulletinsPayload;
-import org.apache.nifi.cluster.HeartbeatPayload;
-import org.apache.nifi.cluster.context.ClusterContext;
-import org.apache.nifi.cluster.context.ClusterContextImpl;
-import org.apache.nifi.cluster.event.Event;
-import org.apache.nifi.cluster.event.EventManager;
-import org.apache.nifi.cluster.firewall.ClusterNodeFirewall;
-import org.apache.nifi.cluster.flow.ClusterDataFlow;
-import org.apache.nifi.cluster.flow.DaoException;
-import org.apache.nifi.cluster.flow.DataFlowManagementService;
-import org.apache.nifi.cluster.flow.PersistedFlowState;
-import org.apache.nifi.cluster.manager.HttpClusterManager;
-import org.apache.nifi.cluster.manager.HttpRequestReplicator;
-import org.apache.nifi.cluster.manager.HttpResponseMapper;
-import org.apache.nifi.cluster.manager.NodeResponse;
-import 
org.apache.nifi.cluster.manager.exception.ConnectingNodeMutableRequestException;
-import 
org.apache.nifi.cluster.manager.exception.DisconnectedNodeMutableRequestException;
-import org.apache.nifi.cluster.manager.exception.IllegalClusterStateException;
-import org.apache.nifi.cluster.manager.exception.IllegalNodeDeletionException;
-import 
org.apache.nifi.cluster.manager.exception.IllegalNodeDisconnectionException;
-import 
org.apache.nifi.cluster.manager.exception.IllegalNodeReconnectionException;
-import 
org.apache.nifi.cluster.manager.exception.IneligiblePrimaryNodeException;
-import org.apache.nifi.cluster.manager.exception.NoConnectedNodesException;
-import org.apache.nifi.cluster.manager.exception.NoResponseFromNodesException;
-import

[19/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
deleted file mode 100644
index 933e5fa..000
--- 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
+++ /dev/null
@@ -1,118 +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.cluster.protocol.impl;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import org.apache.nifi.cluster.protocol.ClusterManagerProtocolSender;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.ProtocolListener;
-import org.apache.nifi.cluster.protocol.message.DisconnectMessage;
-import org.apache.nifi.cluster.protocol.message.FlowRequestMessage;
-import org.apache.nifi.cluster.protocol.message.FlowResponseMessage;
-import org.apache.nifi.cluster.protocol.message.PrimaryRoleAssignmentMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionRequestMessage;
-import org.apache.nifi.cluster.protocol.message.ReconnectionResponseMessage;
-import org.apache.nifi.reporting.BulletinRepository;
-
-/**
- * A wrapper class for consolidating a protocol sender and listener for the 
cluster
- * manager.
- * 
- * @author unattributed
- */
-public class ClusterManagerProtocolSenderListener implements 
ClusterManagerProtocolSender, ProtocolListener {
-
-private final ClusterManagerProtocolSender sender;
-
-private final ProtocolListener listener;
-
-public ClusterManagerProtocolSenderListener(final 
ClusterManagerProtocolSender sender, final ProtocolListener listener) {
-if(sender == null) {
-throw new IllegalArgumentException(ClusterManagerProtocolSender 
may not be null.);
-} else if(listener == null) {
-throw new IllegalArgumentException(ProtocolListener may not be 
null.);
-}
-this.sender = sender;
-this.listener = listener;
-}
-
-@Override
-public void stop() throws IOException {
-if(!isRunning()) {
-throw new IllegalStateException(Instance is already stopped.);
-}
-listener.stop();
-}
-
-@Override
-public void start() throws IOException {
-if(isRunning()) {
-throw new IllegalStateException(Instance is already started.);
-}
-listener.start();
-}
-
-@Override
-public boolean isRunning() {
-return listener.isRunning();
-}
-
-@Override
-public boolean removeHandler(final ProtocolHandler handler) {
-return listener.removeHandler(handler);
-}
-
-@Override
-public CollectionProtocolHandler getHandlers() {
-return listener.getHandlers();
-}
-
-@Override
-public void addHandler(final ProtocolHandler handler) {
-listener.addHandler(handler);
-}
-
-@Override
-public void setBulletinRepository(final BulletinRepository 
bulletinRepository) {
-listener.setBulletinRepository(bulletinRepository);
-sender.setBulletinRepository(bulletinRepository);
-}
-
-@Override
-public FlowResponseMessage requestFlow(final FlowRequestMessage msg) 
throws ProtocolException {
-return sender.requestFlow(msg);
-}
-
-@Override
-public ReconnectionResponseMessage requestReconnection(final 
ReconnectionRequestMessage msg) throws ProtocolException {
-return sender.requestReconnection(msg);
-}
-
-@Override
-public void

[06/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
new file mode 100644
index 000..b3afc6e
--- /dev/null
+++ 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
@@ -0,0 +1,37 @@
+/*
+ * 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.cluster.flow;
+
+/**
+ * Represents the various state of a flow managed by the cluster.
+ *
+ * The semantics of the values are:
+ * ul
+ * li CURRENT - the flow is current /li
+ * li STALE - the flow is not current, but is eligible to be updated. /li
+ * li UNKNOWN - the flow is not current and is not eligible to be updated.
+ * /li
+ * /ul
+ *
+ * @author unattributed
+ */
+public enum PersistedFlowState {
+
+CURRENT,
+STALE,
+UNKNOWN
+}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
new file mode 100644
index 000..ce5a08b
--- /dev/null
+++ 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
@@ -0,0 +1,42 @@
+/*
+ * 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.cluster.flow;
+
+/**
+ * Represents the exceptional case when a caller is requesting the current 
flow,
+ * but a current flow is not available.
+ *
+ * @author unattributed
+ */
+public class StaleFlowException extends RuntimeException {
+
+public StaleFlowException(String message, Throwable cause) {
+super(message, cause);
+}
+
+public StaleFlowException(String message) {
+super(message);
+}
+
+public StaleFlowException(Throwable cause) {
+super(cause);
+}
+
+public StaleFlowException() {
+}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
new file mode 100644

[12/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
deleted file mode 100644
index 84565da..000
--- 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
+++ /dev/null
@@ -1,252 +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.cluster.node;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.nifi.cluster.HeartbeatPayload;
-import org.apache.nifi.cluster.protocol.Heartbeat;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Represents a connected flow controller. Nodes always have an immutable
- * identifier and a status. The status may be changed, but never null.
- *
- * A Node may be cloned, but the cloning is a shallow copy of the instance.
- *
- * This class overrides hashCode and equals and considers two instances to be
- * equal if they have the equal NodeIdentifiers.
- *
- * @author unattributed
- */
-public class Node implements Cloneable, ComparableNode {
-
-private static final Logger lockLogger = 
LoggerFactory.getLogger(cluster.lock);
-
-/**
- * The semantics of a Node status are as follows:
- * ul
- * liCONNECTED -- a flow controller that is connected to the cluster. A
- * connecting node transitions to connected after the cluster receives the
- * flow controller's first heartbeat. A connected node can transition to
- * disconnecting./li
- * liCONNECTING -- a flow controller has issued a connection request to
- * the cluster, but has not yet sent a heartbeat. A connecting node can
- * transition to disconnecting or connected. The cluster will not accept 
any
- * external requests to change the flow while any node is connecting./li
- * liDISCONNECTED -- a flow controller that is not connected to the
- * cluster. A disconnected node can transition to connecting./li
- * liDISCONNECTING -- a flow controller that is in the process of
- * disconnecting from the cluster. A disconnecting node will always
- * transition to disconnected./li
- * /ul
- */
-public static enum Status {
-
-CONNECTED,
-CONNECTING,
-DISCONNECTED,
-DISCONNECTING
-}
-
-/**
- * the node's unique identifier
- */
-private final NodeIdentifier nodeId;
-
-/**
- * the node statue
- */
-private Status status;
-
-/**
- * the last heartbeat received by from the node
- */
-private Heartbeat lastHeartbeat;
-
-/**
- * the payload of the last heartbeat received from the node
- */
-private HeartbeatPayload lastHeartbeatPayload;
-
-/**
- * the last time the connection for this node was requested
- */
-private AtomicLong connectionRequestedTimestamp = new AtomicLong(0L);
-
-/**
- * a flag to indicate this node was disconnected because of a lack of
- * heartbeat
- */
-private boolean heartbeatDisconnection;
-
-public Node(final NodeIdentifier id, final Status status) {
-if (id == null) {
-throw new IllegalArgumentException(ID may not be null.);
-} else if (status == null) {
-throw new IllegalArgumentException(Status may not be null.);
-}
-this.nodeId = id;
-this.status = status;
-}
-
-public NodeIdentifier getNodeId() {
-return nodeId;
-}
-
-/**
- * Returns the last received heartbeat or null if no heartbeat has been 
set.
- *
- * @return a heartbeat or null
- */
-public Heartbeat getHeartbeat() {
-return lastHeartbeat;
-}
-
-

[04/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
new file mode 100644
index 000..4d5455f
--- /dev/null
+++ 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
@@ -0,0 +1,3628 @@
+/*
+ * 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.cluster.manager.impl;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.regex.Pattern;
+
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.StreamingOutput;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.admin.service.AuditService;
+import org.apache.nifi.cluster.BulletinsPayload;
+import org.apache.nifi.cluster.HeartbeatPayload;
+import org.apache.nifi.cluster.context.ClusterContext;
+import org.apache.nifi.cluster.context.ClusterContextImpl;
+import org.apache.nifi.cluster.event.Event;
+import org.apache.nifi.cluster.event.EventManager;
+import org.apache.nifi.cluster.firewall.ClusterNodeFirewall;
+import org.apache.nifi.cluster.flow.ClusterDataFlow;
+import org.apache.nifi.cluster.flow.DaoException;
+import org.apache.nifi.cluster.flow.DataFlowManagementService;
+import org.apache.nifi.cluster.flow.PersistedFlowState;
+import org.apache.nifi.cluster.manager.HttpClusterManager;
+import org.apache.nifi.cluster.manager.HttpRequestReplicator;
+import org.apache.nifi.cluster.manager.HttpResponseMapper;
+import org.apache.nifi.cluster.manager.NodeResponse;
+import 
org.apache.nifi.cluster.manager.exception.ConnectingNodeMutableRequestException;
+import 
org.apache.nifi.cluster.manager.exception.DisconnectedNodeMutableRequestException;
+import org.apache.nifi.cluster.manager.exception.IllegalClusterStateException;
+import org.apache.nifi.cluster.manager.exception.IllegalNodeDeletionException;
+import 
org.apache.nifi.cluster.manager.exception.IllegalNodeDisconnectionException;
+import 
org.apache.nifi.cluster.manager.exception.IllegalNodeReconnectionException;
+import 
org.apache.nifi.cluster.manager.exception.IneligiblePrimaryNodeException;
+import org.apache.nifi.cluster.manager.exception.NoConnectedNodesException;
+import org.apache.nifi.cluster.manager.exception.NoResponseFromNodesException;
+import

[17/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
deleted file mode 100644
index 07ea7a4..000
--- 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!--
-  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.
---
-!-- marked as lazy so that cluster protocol beans are not created when 
applications runs in standalone mode --
-beans default-lazy-init=true
-   xmlns=http://www.springframework.org/schema/beans;
-   xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-   xmlns:util=http://www.springframework.org/schema/util;
-   xsi:schemaLocation=http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util-3.1.xsd;
-
-!-- protocol context --
-bean id=protocolContext 
class=org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext
-constructor-arg
-util:constant 
static-field=org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils.JAXB_CONTEXT/
-/constructor-arg
-/bean
-
-!-- socket configuration --
-bean id=protocolSocketConfiguration 
class=org.apache.nifi.cluster.protocol.spring.SocketConfigurationFactoryBean
-property name=properties ref=nifiProperties/
-/bean
-
-!-- server socket configuration --
-bean id=protocolServerSocketConfiguration 
class=org.apache.nifi.cluster.protocol.spring.ServerSocketConfigurationFactoryBean
-property name=properties ref=nifiProperties/
-/bean
-
-!-- multicast configuration --
-bean id=protocolMulticastConfiguration 
class=org.apache.nifi.cluster.protocol.spring.MulticastConfigurationFactoryBean
-property name=properties ref=nifiProperties/
-/bean
-
-!-- cluster manager protocol sender --
-bean id=clusterManagerProtocolSender 
class=org.apache.nifi.cluster.protocol.impl.ClusterManagerProtocolSenderImpl
-constructor-arg ref=protocolSocketConfiguration/
-constructor-arg ref=protocolContext/
-property name=handshakeTimeout
-bean factory-bean=nifiProperties 
factory-method=getClusterProtocolConnectionHandshakeTimeout/
-/property
-/bean
-
-!-- cluster manager protocol listener --
-bean id=clusterManagerProtocolListener 
class=org.apache.nifi.cluster.protocol.impl.SocketProtocolListener
-constructor-arg index=0
-bean factory-bean=nifiProperties 
factory-method=getClusterManagerProtocolThreads/
-/constructor-arg
-constructor-arg index=1
-bean factory-bean=nifiProperties 
factory-method=getClusterManagerProtocolPort/
-/constructor-arg
-constructor-arg ref=protocolServerSocketConfiguration index=2/
-constructor-arg ref=protocolContext index=3/
-/bean
-
-!-- cluster manager sender/listener --
-bean id=clusterManagerProtocolSenderListener 
class=org.apache.nifi.cluster.protocol.impl.ClusterManagerProtocolSenderListener
-constructor-arg ref=clusterManagerProtocolSender/
-constructor-arg ref=clusterManagerProtocolListener/
-/bean
-
-!-- node protocol sender --
-bean id=nodeProtocolSender 
class=org.apache.nifi.cluster.protocol.impl.NodeProtocolSenderImpl
-constructor-arg ref=clusterManagerProtocolServiceLocator/
-constructor-arg ref=protocolSocketConfiguration/
-constructor-arg ref=protocolContext/
-/bean
-
-!-- node protocol listener --
-bean id=nodeProtocolListener

[8/9] incubator-nifi git commit: Merge branch 'develop' into NIFI-353

2015-03-16 Thread joewitt

Merge branch 'develop' into NIFI-353


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

Branch: refs/heads/NIFI-353
Commit: 2b07b0bc1da9f4da6f40c31258c66afed30ffa4e
Parents: f920902 eb757a4
Author: joewitt joew...@apache.org
Authored: Mon Mar 16 16:38:08 2015 -0400
Committer: joewitt joew...@apache.org
Committed: Mon Mar 16 16:38:08 2015 -0400

--
 nifi/NOTICE |   5 -
 nifi/nifi-api/pom.xml   |   2 +-
 nifi/nifi-assembly/pom.xml  |   2 +-
 nifi/nifi-bootstrap/pom.xml |   2 +-
 .../nifi-data-provenance-utils/pom.xml  |   2 +-
 .../nifi-expression-language/pom.xml|   2 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml|   2 +-
 .../nifi-processor-utilities/pom.xml|   2 +-
 nifi/nifi-commons/nifi-properties/pom.xml   |   2 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |   2 +-
 .../nifi-site-to-site-client/pom.xml|   8 +-
 nifi/nifi-commons/nifi-socket-utils/pom.xml |   2 +-
 nifi/nifi-commons/nifi-utils/pom.xml|   4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml|   2 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |   2 +-
 nifi/nifi-commons/pom.xml   |   2 +-
 nifi/nifi-docs/pom.xml  |   2 +-
 nifi/nifi-external/nifi-spark-receiver/pom.xml  |  72 +++
 nifi/nifi-external/pom.xml  |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml |   6 +-
 nifi/nifi-maven-archetypes/pom.xml  |   5 +-
 nifi/nifi-mock/pom.xml  |   2 +-
 .../nifi-framework-nar/pom.xml  |   2 +-
 .../nifi-framework/nifi-administration/pom.xml  |   2 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |   2 +-
 .../nifi-cluster-authorization-provider/pom.xml |   2 +-
 .../nifi-cluster-protocol/pom.xml   |   2 +-
 .../nifi-framework/nifi-cluster-web/pom.xml |   2 +-
 .../nifi-framework/nifi-cluster/pom.xml |   2 +-
 .../nifi-file-authorization-provider/pom.xml|   2 +-
 .../nifi-framework-core-api/pom.xml |   2 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |   2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |   2 +-
 .../nifi-framework/nifi-resources/LICENSE   | 202 +++
 .../nifi-framework/nifi-resources/NOTICE|   5 +
 .../nifi-framework/nifi-resources/pom.xml   |   2 +-
 .../src/main/assembly/dependencies.xml  |  16 ++
 .../nifi-framework/nifi-runtime/pom.xml |   2 +-
 .../nifi-framework/nifi-security/pom.xml|   2 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|   2 +-
 .../nifi-framework/nifi-user-actions/pom.xml|   2 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |   2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |   2 +-
 .../nifi-web/nifi-web-api/pom.xml   |   4 +-
 .../nifi-web/nifi-web-docs/pom.xml  |   2 +-
 .../nifi-web/nifi-web-error/pom.xml |   2 +-
 .../nifi-web-optimistic-locking/pom.xml |   2 +-
 .../nifi-web/nifi-web-security/pom.xml  |   2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |   2 +-
 .../nifi-framework/nifi-web/pom.xml |  10 +-
 .../nifi-framework/pom.xml  |   2 +-
 .../nifi-framework-bundle/pom.xml   |  34 ++--
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |   2 +-
 .../nifi-hdfs-processors/pom.xml|   2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |   4 +-
 .../nifi-hadoop-libraries-nar/pom.xml   |   5 +-
 .../nifi-hadoop-libraries-bundle/pom.xml|   2 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |   2 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml|   2 +-
 .../nifi-kafka-processors/pom.xml   |   2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |   4 +-
 .../nifi-kite-bundle/nifi-kite-nar/pom.xml  |   2 +-
 .../nifi-kite-processors/pom.xml|   2 +-
 nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml  |   4 +-
 .../pom.xml |   2 +-
 .../nifi-provenance-repository-nar/pom.xml  |   2 +-
 .../nifi-volatile-provenance-repository/pom.xml |   2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |   6 +-
 .../nifi-standard-nar/pom.xml   |   2 +-
 .../nifi-standard-prioritizers/pom.xml  |   2 +-
 .../nifi-standard-processors/pom.xml|   2 +-
 .../nifi-standard-reporting-tasks/pom.xml   |   2 +-
 .../nifi-standard-bundle/pom.xml|   8 +-
 .../pom.xml

[7/9] incubator-nifi git commit: Merge branch 'NIFI-402-RC1' into develop

2015-03-16 Thread joewitt

Merge branch 'NIFI-402-RC1' into develop


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

Branch: refs/heads/NIFI-353
Commit: eb757a484ebd7856238e13841fb9b994a1174840
Parents: 2de2134 171dae3
Author: joewitt joew...@apache.org
Authored: Mon Mar 16 10:34:00 2015 -0400
Committer: joewitt joew...@apache.org
Committed: Mon Mar 16 10:34:00 2015 -0400

--
 nifi/nifi-api/pom.xml   |  2 +-
 nifi/nifi-assembly/pom.xml  |  2 +-
 nifi/nifi-bootstrap/pom.xml |  2 +-
 .../nifi-data-provenance-utils/pom.xml  |  2 +-
 .../nifi-expression-language/pom.xml|  2 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |  2 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml|  2 +-
 .../nifi-processor-utilities/pom.xml|  2 +-
 nifi/nifi-commons/nifi-properties/pom.xml   |  2 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |  2 +-
 .../nifi-site-to-site-client/pom.xml|  8 +--
 nifi/nifi-commons/nifi-socket-utils/pom.xml |  2 +-
 nifi/nifi-commons/nifi-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml|  2 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |  2 +-
 nifi/nifi-commons/pom.xml   |  2 +-
 nifi/nifi-docs/pom.xml  |  2 +-
 nifi/nifi-external/nifi-spark-receiver/pom.xml  | 72 ++--
 nifi/nifi-external/pom.xml  |  2 +-
 .../nifi-processor-bundle-archetype/pom.xml |  6 +-
 nifi/nifi-maven-archetypes/pom.xml  |  5 +-
 nifi/nifi-mock/pom.xml  |  2 +-
 .../nifi-framework-nar/pom.xml  |  2 +-
 .../nifi-framework/nifi-administration/pom.xml  |  2 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |  2 +-
 .../nifi-cluster-authorization-provider/pom.xml |  2 +-
 .../nifi-cluster-protocol/pom.xml   |  2 +-
 .../nifi-framework/nifi-cluster-web/pom.xml |  2 +-
 .../nifi-framework/nifi-cluster/pom.xml |  2 +-
 .../nifi-file-authorization-provider/pom.xml|  2 +-
 .../nifi-framework-core-api/pom.xml |  2 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |  2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |  2 +-
 .../nifi-framework/nifi-resources/pom.xml   |  2 +-
 .../nifi-framework/nifi-runtime/pom.xml |  2 +-
 .../nifi-framework/nifi-security/pom.xml|  2 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|  2 +-
 .../nifi-framework/nifi-user-actions/pom.xml|  2 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |  2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |  2 +-
 .../nifi-web/nifi-web-api/pom.xml   |  4 +-
 .../nifi-web/nifi-web-docs/pom.xml  |  2 +-
 .../nifi-web/nifi-web-error/pom.xml |  2 +-
 .../nifi-web-optimistic-locking/pom.xml |  2 +-
 .../nifi-web/nifi-web-security/pom.xml  |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |  2 +-
 .../nifi-framework/nifi-web/pom.xml | 10 +--
 .../nifi-framework/pom.xml  |  2 +-
 .../nifi-framework-bundle/pom.xml   | 34 -
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |  2 +-
 .../nifi-hdfs-processors/pom.xml|  2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |  4 +-
 .../nifi-hadoop-libraries-nar/pom.xml   |  5 +-
 .../nifi-hadoop-libraries-bundle/pom.xml|  2 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |  2 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml|  2 +-
 .../nifi-kafka-processors/pom.xml   |  2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |  4 +-
 .../nifi-kite-bundle/nifi-kite-nar/pom.xml  |  2 +-
 .../nifi-kite-processors/pom.xml|  2 +-
 nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml  |  4 +-
 .../pom.xml |  2 +-
 .../nifi-provenance-repository-nar/pom.xml  |  2 +-
 .../nifi-volatile-provenance-repository/pom.xml |  2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |  6 +-
 .../nifi-standard-nar/pom.xml   |  2 +-
 .../nifi-standard-prioritizers/pom.xml  |  2 +-
 .../nifi-standard-processors/pom.xml|  2 +-
 .../nifi-standard-reporting-tasks/pom.xml   |  2 +-
 .../nifi-standard-bundle/pom.xml|  8 +--
 .../pom.xml |  2 +-
 .../pom.xml |  2 +-
 .../nifi-distributed-cache-protocol/pom.xml |  2 +-
 .../nifi-distributed-cache-server/pom.xml   |  2 +-
 .../nifi-distributed-cache-services-nar/pom.xml |  2 +-
 .../pom.xml

[2/9] incubator-nifi git commit: NIFI-402-RC1 prepare release nifi-0.0.2-incubating-RC1

2015-03-16 Thread joewitt

NIFI-402-RC1 prepare release nifi-0.0.2-incubating-RC1


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

Branch: refs/heads/NIFI-353
Commit: 22c6735126ed42dce33386e3ae31e0715d742c89
Parents: 96e0f31
Author: joewitt joew...@apache.org
Authored: Mon Mar 9 21:10:11 2015 -0400
Committer: joewitt joew...@apache.org
Committed: Mon Mar 9 21:10:11 2015 -0400

--
 nifi/nifi-api/pom.xml   |  2 +-
 nifi/nifi-assembly/pom.xml  |  2 +-
 nifi/nifi-bootstrap/pom.xml |  2 +-
 .../nifi-data-provenance-utils/pom.xml  |  2 +-
 .../nifi-expression-language/pom.xml|  2 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |  2 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml|  2 +-
 .../nifi-processor-utilities/pom.xml|  2 +-
 nifi/nifi-commons/nifi-properties/pom.xml   |  2 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |  2 +-
 .../nifi-site-to-site-client/pom.xml|  8 +--
 nifi/nifi-commons/nifi-socket-utils/pom.xml |  2 +-
 nifi/nifi-commons/nifi-utils/pom.xml|  4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml|  2 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |  2 +-
 nifi/nifi-commons/pom.xml   |  2 +-
 nifi/nifi-docs/pom.xml  |  2 +-
 nifi/nifi-external/nifi-spark-receiver/pom.xml  | 72 ++--
 nifi/nifi-external/pom.xml  |  2 +-
 .../nifi-processor-bundle-archetype/pom.xml |  6 +-
 nifi/nifi-maven-archetypes/pom.xml  |  5 +-
 nifi/nifi-mock/pom.xml  |  2 +-
 .../nifi-framework-nar/pom.xml  |  2 +-
 .../nifi-framework/nifi-administration/pom.xml  |  2 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |  2 +-
 .../nifi-cluster-authorization-provider/pom.xml |  2 +-
 .../nifi-cluster-protocol/pom.xml   |  2 +-
 .../nifi-framework/nifi-cluster-web/pom.xml |  2 +-
 .../nifi-framework/nifi-cluster/pom.xml |  2 +-
 .../nifi-file-authorization-provider/pom.xml|  2 +-
 .../nifi-framework-core-api/pom.xml |  2 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |  2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |  2 +-
 .../nifi-framework/nifi-resources/pom.xml   |  2 +-
 .../nifi-framework/nifi-runtime/pom.xml |  2 +-
 .../nifi-framework/nifi-security/pom.xml|  2 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|  2 +-
 .../nifi-framework/nifi-user-actions/pom.xml|  2 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |  2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |  2 +-
 .../nifi-web/nifi-web-api/pom.xml   |  4 +-
 .../nifi-web/nifi-web-docs/pom.xml  |  2 +-
 .../nifi-web/nifi-web-error/pom.xml |  2 +-
 .../nifi-web-optimistic-locking/pom.xml |  2 +-
 .../nifi-web/nifi-web-security/pom.xml  |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |  2 +-
 .../nifi-framework/nifi-web/pom.xml | 10 +--
 .../nifi-framework/pom.xml  |  2 +-
 .../nifi-framework-bundle/pom.xml   | 34 -
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |  2 +-
 .../nifi-hdfs-processors/pom.xml|  2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |  4 +-
 .../nifi-hadoop-libraries-nar/pom.xml   |  5 +-
 .../nifi-hadoop-libraries-bundle/pom.xml|  2 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |  2 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml|  2 +-
 .../nifi-kafka-processors/pom.xml   |  2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |  4 +-
 .../nifi-kite-bundle/nifi-kite-nar/pom.xml  |  2 +-
 .../nifi-kite-processors/pom.xml|  2 +-
 nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml  |  4 +-
 .../pom.xml |  2 +-
 .../nifi-provenance-repository-nar/pom.xml  |  2 +-
 .../nifi-volatile-provenance-repository/pom.xml |  2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |  6 +-
 .../nifi-standard-nar/pom.xml   |  2 +-
 .../nifi-standard-prioritizers/pom.xml  |  2 +-
 .../nifi-standard-processors/pom.xml|  2 +-
 .../nifi-standard-reporting-tasks/pom.xml   |  2 +-
 .../nifi-standard-bundle/pom.xml|  8 +--
 .../pom.xml |  2 +-
 .../pom.xml |  2 +-
 .../nifi-distributed-cache-protocol/pom.xml |  2 +-
 .../nifi-distributed-cache-server/pom.xml   |  2 +-
 .../nifi-distributed-cache-services-nar/pom.xml |  2 +-
 .../pom.xml

[1/9] incubator-nifi git commit: NIFI-402-RC1 prepare release nifi-0.0.2-incubating-RC1

2015-03-16 Thread joewitt

Repository: incubator-nifi
Updated Branches:
  refs/heads/NIFI-353 f92090233 - 1a05c9db6


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/22c67351/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
index abf78db..f28c1e9 100644
--- 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
@@ -17,7 +17,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-http-context-map-bundle/artifactId
-version0.0.2-incubating-SNAPSHOT/version
+version0.0.2-incubating/version
 /parent

 artifactIdnifi-http-context-map/artifactId

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/22c67351/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
index 5539bd8..9e627e7 100644
--- 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
@@ -17,7 +17,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-standard-services/artifactId
-version0.0.2-incubating-SNAPSHOT/version
+version0.0.2-incubating/version
 /parent
 
 artifactIdnifi-http-context-map-bundle/artifactId

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/22c67351/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
index 079ac60..76a0370 100644
--- 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
@@ -17,7 +17,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-standard-services/artifactId
-version0.0.2-incubating-SNAPSHOT/version
+version0.0.2-incubating/version
 /parent
 artifactIdnifi-load-distribution-service-api/artifactId
 packagingjar/packaging

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/22c67351/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
index a9d62d6..a0cf7e5 100644
--- 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
@@ -17,7 +17,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-ssl-context-bundle/artifactId
-version0.0.2-incubating-SNAPSHOT/version
+version0.0.2-incubating/version
 /parent
 artifactIdnifi-ssl-context-service-nar/artifactId
 packagingnar/packaging

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/22c67351/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
index 498c095..44f26ee 100644
--- 
a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
+++ 
b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
@@ -17,7 +17,7 @@
 parent
 groupIdorg.apache.nifi/groupId
 artifactIdnifi-ssl-context-bundle/artifactId
-version0.0.2-incubating-SNAPSHOT/version
+version0.0.2-incubating/version
 /parent
 artifactIdnifi-ssl-context-service/artifactId
 packagingjar/packaging

svn commit: r1667164 - /incubator/nifi/site/trunk/content/development/release-guide.md

2015-03-16 Thread joewitt

Author: joewitt
Date: Tue Mar 17 02:42:47 2015
New Revision: 1667164

URL: http://svn.apache.org/r1667164
Log:
decided to go with specific rat exclusions so don't need that check anymore

Modified:
incubator/nifi/site/trunk/content/development/release-guide.md

Modified: incubator/nifi/site/trunk/content/development/release-guide.md
URL: 
http://svn.apache.org/viewvc/incubator/nifi/site/trunk/content/development/release-guide.md?rev=1667164r1=1667163r2=1667164view=diff
==
--- incubator/nifi/site/trunk/content/development/release-guide.md (original)
+++ incubator/nifi/site/trunk/content/development/release-guide.md Tue Mar 17 
02:42:47 2015
@@ -99,8 +99,6 @@ Follow the steps outlined in the [Quicks
 
 At this point you're on the latest 'develop' branch and are able to build 
the entire application
 
-Validate that any new test resources added since the last release.  This is 
important because we have a broad exlusion for the RAT licensing/header checks 
for test resources.  The broad exclusion is validly because we have lots of 
test resources which intentionally do not have apache license headers as we're 
testing the objects as they would be in the wild.  However, in every case we 
can have the header we should have the header.  So it is necessary to check and 
ensure items aren't put in there which could cause problems for the source 
release.
-
 Create a JIRA ticket for the release tasks and use that ticket number for the 
commit messages.  For example we'll consider NIFI-270 as our ticket.  Also
 have in mind the release version you are planning for.  For example we'll 
consider '0.0.1-incubating'.

svn commit: r944055 - /websites/production/nifi/content/

2015-03-16 Thread joewitt

Author: joewitt
Date: Tue Mar 17 02:43:08 2015
New Revision: 944055

Log:
Publishing svnmucc operation to nifi site by joewitt

Added:
websites/production/nifi/content/
  - copied from r944054, websites/staging/nifi/trunk/content/

[14/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
deleted file mode 100644
index 81bb7a7..000
--- 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImpl.java
+++ /dev/null
@@ -1,531 +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.cluster.manager.impl;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
-import org.apache.nifi.cluster.manager.HttpRequestReplicator;
-import org.apache.nifi.cluster.manager.NodeResponse;
-import org.apache.nifi.cluster.manager.exception.UriConstructionException;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.logging.NiFiLog;
-import org.apache.nifi.util.FormatUtils;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * An implementation of the codeHttpRequestReplicator/code interface. This
- * implementation parallelizes the node HTTP requests using the given
- * codeExecutorService/code instance. Individual requests may have
- * connection and read timeouts set, which may be set during instance
- * construction. Otherwise, the default is not to timeout.
- *
- * If a node protocol scheme is provided during construction, then all requests
- * will be replicated using the given scheme. If null is provided as the scheme
- * (the default), then the requests will be replicated using the scheme of the
- * original URI.
- *
- * Clients must call start() and stop() to initialize and shutdown the 
instance.
- * The instance must be started before issuing any replication requests.
- *
- * @author unattributed
- */
-public class HttpRequestReplicatorImpl implements HttpRequestReplicator {
-
-// defaults
-private static final int DEFAULT_SHUTDOWN_REPLICATOR_SECONDS = 30;
-
-// logger
-private static final Logger logger = new 
NiFiLog(LoggerFactory.getLogger(HttpRequestReplicatorImpl.class));
-
-// final members
-private final Client client;// the client to use for issuing 
requests
-private final int numThreads;   // number of threads to use for 
request replication
-private final int connectionTimeoutMs;  // connection timeout per node 
request
-private final int readTimeoutMs;// read timeout per node request
-
-// members
-private ExecutorService executorService;
-private int shutdownReplicatorSeconds = 
DEFAULT_SHUTDOWN_REPLICATOR_SECONDS;
-
-// guarded by synchronized method access in support of multithreaded 
replication
-

[03/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
new file mode 100644
index 000..84565da
--- /dev/null
+++ 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
@@ -0,0 +1,252 @@
+/*
+ * 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.cluster.node;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.nifi.cluster.HeartbeatPayload;
+import org.apache.nifi.cluster.protocol.Heartbeat;
+import org.apache.nifi.cluster.protocol.NodeIdentifier;
+import org.apache.nifi.cluster.protocol.ProtocolException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Represents a connected flow controller. Nodes always have an immutable
+ * identifier and a status. The status may be changed, but never null.
+ *
+ * A Node may be cloned, but the cloning is a shallow copy of the instance.
+ *
+ * This class overrides hashCode and equals and considers two instances to be
+ * equal if they have the equal NodeIdentifiers.
+ *
+ * @author unattributed
+ */
+public class Node implements Cloneable, ComparableNode {
+
+private static final Logger lockLogger = 
LoggerFactory.getLogger(cluster.lock);
+
+/**
+ * The semantics of a Node status are as follows:
+ * ul
+ * liCONNECTED -- a flow controller that is connected to the cluster. A
+ * connecting node transitions to connected after the cluster receives the
+ * flow controller's first heartbeat. A connected node can transition to
+ * disconnecting./li
+ * liCONNECTING -- a flow controller has issued a connection request to
+ * the cluster, but has not yet sent a heartbeat. A connecting node can
+ * transition to disconnecting or connected. The cluster will not accept 
any
+ * external requests to change the flow while any node is connecting./li
+ * liDISCONNECTED -- a flow controller that is not connected to the
+ * cluster. A disconnected node can transition to connecting./li
+ * liDISCONNECTING -- a flow controller that is in the process of
+ * disconnecting from the cluster. A disconnecting node will always
+ * transition to disconnected./li
+ * /ul
+ */
+public static enum Status {
+
+CONNECTED,
+CONNECTING,
+DISCONNECTED,
+DISCONNECTING
+}
+
+/**
+ * the node's unique identifier
+ */
+private final NodeIdentifier nodeId;
+
+/**
+ * the node statue
+ */
+private Status status;
+
+/**
+ * the last heartbeat received by from the node
+ */
+private Heartbeat lastHeartbeat;
+
+/**
+ * the payload of the last heartbeat received from the node
+ */
+private HeartbeatPayload lastHeartbeatPayload;
+
+/**
+ * the last time the connection for this node was requested
+ */
+private AtomicLong connectionRequestedTimestamp = new AtomicLong(0L);
+
+/**
+ * a flag to indicate this node was disconnected because of a lack of
+ * heartbeat
+ */
+private boolean heartbeatDisconnection;
+
+public Node(final NodeIdentifier id, final Status status) {
+if (id == null) {
+throw new IllegalArgumentException(ID may not be null.);
+} else if (status == null) {
+throw new IllegalArgumentException(Status may not be null.);
+}
+this.nodeId = id;
+this.status = status;
+}
+
+public NodeIdentifier getNodeId() {
+return nodeId;
+}
+
+/**
+ * Returns the last received heartbeat or null if no heartbeat has been 
set.
+ *
+ * @return a heartbeat or null
+ */
+public Heartbeat getHeartbeat() {
+

[02/20] incubator-nifi git commit: NIFI-410 pushed RAT exclusions down to the relevant modules and stopped doing broad test resource exclusion - is now specific

2015-03-16 Thread joewitt

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/761e64a4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
--
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
new file mode 100644
index 000..35380dd
--- /dev/null
+++ 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
@@ -0,0 +1,239 @@
+/*
+ * 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.cluster.manager.testutils;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.core.MediaType;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Encapsulates an HTTP request. The toString method returns the
+ * specification-compliant request.
+ *
+ * @author unattributed
+ */
+public class HttpRequest {
+
+private String method;
+private String uri;
+private String rawUri;
+private String version;
+private String body;
+private String rawRequest;
+private MapString, String headers = new HashMap();
+private MapString, ListString parameters = new HashMap();
+
+public static HttpRequestBuilder createFromRequestLine(final String 
requestLine) {
+return new HttpRequestBuilder(requestLine);
+}
+
+public String getBody() {
+return body;
+}
+
+public MapString, String getHeaders() {
+return Collections.unmodifiableMap(headers);
+}
+
+public String getHeaderValue(final String header) {
+for (final Map.EntryString, String entry : getHeaders().entrySet()) {
+if (entry.getKey().equalsIgnoreCase(header)) {
+return entry.getValue();
+}
+}
+return null;
+}
+
+public String getMethod() {
+return method;
+}
+
+public MapString, ListString getParameters() {
+final MapString, ListString result = new HashMap();
+for (final Map.EntryString, ListString entry : 
parameters.entrySet()) {
+result.put(entry.getKey(), 
Collections.unmodifiableList(entry.getValue()));
+}
+return Collections.unmodifiableMap(result);
+}
+
+public String getUri() {
+return uri;
+}
+
+public String getRawUri() {
+return rawUri;
+}
+
+public String getVersion() {
+return version;
+}
+
+@Override
+public String toString() {
+return rawRequest;
+}
+
+/**
+ * A builder for constructing basic HTTP requests. It handles only enough 
of
+ * the HTTP specification to support basic unit testing, and it should not
+ * be used otherwise.
+ */
+public static class HttpRequestBuilder {
+
+private String method;
+private String uri;
+private String rawUri;
+private String version;
+private MapString, String headers = new HashMap();
+private MapString, ListString parameters = new HashMap();
+private int contentLength = 0;
+private String contentType;
+private String body = ;
+private StringBuilder rawRequest = new StringBuilder();
+
+private HttpRequestBuilder(final String requestLine) {
+
+final String[] tokens = requestLine.split( );
+if (tokens.length != 3) {
+throw new IllegalArgumentException(Invalid HTTP Request Line: 
 + requestLine);
+}
+
+method = tokens[0];
+if (HttpMethod.GET.equalsIgnoreCase(method) || 
HttpMethod.HEAD.equalsIgnoreCase(method) ||

< 1 2 3 4 5 6 7 8 9 >

401 - 500 of 868 matches

Mail list logo