.*<\/div>/g,
to: '.*<\/title>/g,
+ to: '<title>NiFi Rest Api '
}]
}
},
@@ -295,9 +305,10 @@ module.exports = function (grunt) {
grunt.registerTask('img', ['newer:copy']);
grunt.registerTask('css', ['clean:css', 'compass']);
grunt.registerTask('js', ['clean:js', 'concat']);
- grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated', 'replace:addGoogleAnalytics', 'replace:moveTearDrop', 'replace:removeVersion']);
+// grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated', 'replace:addGoogleAnalytics', 'replace:moveTearDrop', 'replace:removeVersion']);
- grunt.registerTask('build', ['assemble', 'css', 'js', 'img', 'generate-docs', 'copy:dist']);
+ grunt.registerTask('build', ['assemble', 'css', 'js', 'img', 'copy:dist']);
+// grunt.registerTask('build', ['assemble', 'css', 'js', 'img', 'generate-docs', 'copy:dist']);
grunt.registerTask('deploy', ['clean:all', 'prompt:username', 'exec:checkout', 'build', 'exec:status', 'prompt:commit']);
grunt.registerTask('dev', ['default', 'watch']);
diff --git a/nifi-site/src/images/flow-th.png b/nifi-site/src/images/flow-th.png
new file mode 100644
index 0000000000..7042b879ff
Binary files /dev/null and b/nifi-site/src/images/flow-th.png differ
diff --git a/nifi-site/src/includes/topbar.hbs b/nifi-site/src/includes/topbar.hbs
index 959771c65a..e91b0814c2 100644
--- a/nifi-site/src/includes/topbar.hbs
+++ b/nifi-site/src/includes/topbar.hbs
@@ -28,11 +28,8 @@
diff --git a/nifi-site/src/pages/html/administrator-guide.hbs b/nifi-site/src/pages/html/administrator-guide.hbs
deleted file mode 100644
index a58e8d281e..0000000000
--- a/nifi-site/src/pages/html/administrator-guide.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Apache NiFi Administrator Guide
----
-
-
NiFi Rest Api
'
+ }, {
+ from: /- FAQ
- Screencasts -
- NiFi Overview -
- User Guide -
- Developer Guide -
- Admin Guide -
- Rest Api +
- NiFi Docs +
- Wiki
-
-
\ No newline at end of file
diff --git a/nifi-site/src/pages/html/developer-guide.hbs b/nifi-site/src/pages/html/developer-guide.hbs
index 690923ea53..6a2e1c15b5 100644
--- a/nifi-site/src/pages/html/developer-guide.hbs
+++ b/nifi-site/src/pages/html/developer-guide.hbs
@@ -3,5 +3,5 @@ title: Apache NiFi Developer Guide
---
-
+
\ No newline at end of file
diff --git a/nifi-site/src/pages/html/docs.hbs b/nifi-site/src/pages/html/docs.hbs
new file mode 100644
index 0000000000..3dd95aa461
--- /dev/null
+++ b/nifi-site/src/pages/html/docs.hbs
@@ -0,0 +1,7 @@
+---
+title: Apache NiFi Documentation
+---
+
+
+
+
\ No newline at end of file
diff --git a/nifi-site/src/pages/html/download.hbs b/nifi-site/src/pages/html/download.hbs
index 9e4ba7cb3a..28fced1814 100644
--- a/nifi-site/src/pages/html/download.hbs
+++ b/nifi-site/src/pages/html/download.hbs
@@ -23,6 +23,25 @@ title: Apache NiFi Downloads
Releases
-
+
- 0.1.0-incubating
+
-
+
- Release Notes +
-
+ Sources:
+
-
+
- nifi-0.1.0-incubating-source-release.zip ( asc, md5, sha1 ) +
+ -
+ Binaries
+
-
+
- nifi-0.1.0-incubating-bin.tar.gz ( asc, md5, sha1 ) +
- nifi-0.1.0-incubating-bin.zip ( asc, md5, sha1 ) +
+
+
- 0.0.2-incubating
- Release Notes diff --git a/nifi-site/src/pages/html/faq.hbs b/nifi-site/src/pages/html/faq.hbs index d4fd3274a6..eaf0d1b152 100644 --- a/nifi-site/src/pages/html/faq.hbs +++ b/nifi-site/src/pages/html/faq.hbs @@ -22,9 +22,9 @@ title: Apache NiFi FAQs
-
Where can I find documentation on how to understand and configure NiFi?
-
-
- Our draft/preview of the User Guide is now available under the docs dropdown. -
- We're working on completing that and having it fully integrated to the application. -
- The developer guide is also in the works. +
- Documentation is available under the NiFi Docs link within the Documentation dropdown. +
- A Developer Guide is also available under the Development dropdown. +
- View the Apache NiFi Wiki for additional information related to the project as well as how to contribute.
- For more information on presently outstanding documentation work please click here.
diff --git a/nifi-site/src/pages/html/index.hbs b/nifi-site/src/pages/html/index.hbs
index 8ee8208f76..966bfad242 100644
--- a/nifi-site/src/pages/html/index.hbs
+++ b/nifi-site/src/pages/html/index.hbs
@@ -23,7 +23,9 @@ title: Apache NiFi
- 
+
+ 
+
diff --git a/nifi-site/src/pages/html/overview.hbs b/nifi-site/src/pages/html/overview.hbs
deleted file mode 100644
index b2eae1ca09..0000000000
--- a/nifi-site/src/pages/html/overview.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Apache NiFi Overview
----
-
-
+
+
+
-
-
\ No newline at end of file
diff --git a/nifi-site/src/pages/html/people.hbs b/nifi-site/src/pages/html/people.hbs
index 66ab0d0f72..3a834b6f12 100644
--- a/nifi-site/src/pages/html/people.hbs
+++ b/nifi-site/src/pages/html/people.hbs
@@ -115,6 +115,16 @@ title: Apache NiFi Team
-
-
\ No newline at end of file
diff --git a/nifi-site/src/pages/html/user-guide.hbs b/nifi-site/src/pages/html/user-guide.hbs
deleted file mode 100644
index 8fa6c7d9c9..0000000000
--- a/nifi-site/src/pages/html/user-guide.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Apache NiFi User Guide
----
-
-
-
-
\ No newline at end of file
diff --git a/nifi/nifi-api/pom.xml b/nifi/nifi-api/pom.xml
index 0321a43c80..0d6324b2c0 100644
--- a/nifi/nifi-api/pom.xml
+++ b/nifi/nifi-api/pom.xml
@@ -18,7 +18,7 @@
+ * The NiFiDataPacket provides a packaging around a NiFi FlowFile. It wraps both + * a FlowFile's content and its attributes so that they can be processed by + * Storm + *
+ */ +public interface NiFiDataPacket { + + /** + * @return the contents of a NiFi FlowFile + */ + byte[] getContent(); + + /** + * @return a Map of attributes that are associated with the NiFi FlowFile + */ + Map
+ * The NiFiSpout provides a way to pull data from Apache NiFi so
+ * that it can be processed by Apache Storm. The NiFi Spout connects to a NiFi
+ * instance provided in the config and requests data from the OutputPort that
+ * is named. In NiFi, when an OutputPort is added to the root process group,
+ * it acts as a queue of data for remote clients. This spout is then able to
+ * pull that data from NiFi reliably.
+ *
+ * It is important to note that if pulling data from a NiFi cluster, the URL + * that should be used is that of the NiFi Cluster Manager. The Receiver will + * automatically handle determining the nodes in that cluster and pull from + * those nodes as appropriate. + *
+ * + *+ * In order to use the NiFiSpout, you will need to first build a + * {@link SiteToSiteClientConfig} to provide to the constructor. This can be + * achieved by using the {@link SiteToSiteClient.Builder}. Below is an example + * snippet of driver code to pull data from NiFi that is running on + * localhost:8080. This example assumes that NiFi exposes an OutputPort on the + * root group named "Data For Storm". Additionally, it assumes that the data + * that it will receive from this OutputPort is text data, as it will map the + * byte array received from NiFi to a UTF-8 Encoded string. + *
+ * + *
+ *
+ * {@code
+ *
+ * // Build a Site-To-Site client config
+ * SiteToSiteClientConfig clientConfig = new SiteToSiteClient.Builder()
+ * .url("http://localhost:8080/nifi")
+ * .portName("Data for Storm")
+ * .buildConfig();
+ *
+ * // Build a topology starting with a NiFiSpout
+ * TopologyBuilder builder = new TopologyBuilder();
+ * builder.setSpout("nifi", new NiFiSpout(clientConfig));
+ *
+ * // Add a bolt that prints the attributes and content
+ * builder.setBolt("print", new BaseBasicBolt() {
+ * @Override
+ * public void execute(Tuple tuple, BasicOutputCollector collector) {
+ * NiFiDataPacket dp = (NiFiDataPacket) tuple.getValueByField("nifiDataPacket");
+ * System.out.println("Attributes: " + dp.getAttributes());
+ * System.out.println("Content: " + new String(dp.getContent()));
+ * }
+ *
+ * @Override
+ * public void declareOutputFields(OutputFieldsDeclarer declarer) {}
+ *
+ * }).shuffleGrouping("nifi");
+ *
+ * // Submit the topology running in local mode
+ * Config conf = new Config();
+ * LocalCluster cluster = new LocalCluster();
+ * cluster.submitTopology("test", conf, builder.createTopology());
+ *
+ * Utils.sleep(90000);
+ * cluster.shutdown();
+ * }
+ *
+ *
+ */
+public class NiFiSpout extends BaseRichSpout {
+
+ private static final long serialVersionUID = 3067274587595578836L;
+
+ public static final Logger LOGGER = LoggerFactory.getLogger(NiFiSpout.class);
+
+ private NiFiSpoutReceiver spoutReceiver;
+ private LinkedBlockingQueuetrue if the FlowFile is known in this session,
+ * false otherwise.
+ */
+ boolean isFlowFileKnown(final FlowFile flowFile) {
+ final FlowFile curFlowFile = currentVersions.get(flowFile.getId());
+ if (curFlowFile == null) {
+ return false;
+ }
+
+ final String curUuid = curFlowFile.getAttribute(CoreAttributes.UUID.key());
+ final String providedUuid = curFlowFile.getAttribute(CoreAttributes.UUID.key());
+ if (!curUuid.equals(providedUuid)) {
+ return false;
+ }
+
+ return true;
+ }
}
diff --git a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProvenanceReporter.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProvenanceReporter.java
index 097eafdbef..8c9a3200da 100644
--- a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProvenanceReporter.java
+++ b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProvenanceReporter.java
@@ -17,186 +17,437 @@
package org.apache.nifi.util;
import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.FlowFileHandlingException;
+import org.apache.nifi.provenance.ProvenanceEventBuilder;
+import org.apache.nifi.provenance.ProvenanceEventRecord;
+import org.apache.nifi.provenance.ProvenanceEventType;
import org.apache.nifi.provenance.ProvenanceReporter;
+import org.apache.nifi.provenance.StandardProvenanceEventRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MockProvenanceReporter implements ProvenanceReporter {
+ private static final Logger logger = LoggerFactory.getLogger(MockProvenanceReporter.class);
+ private final MockProcessSession session;
+ private final String processorId;
+ private final String processorType;
+ private final SharedSessionState sharedSessionState;
+ private final Settrue if the FlowFile is known in this session, false otherwise.
+ */
+ boolean isFlowFileKnown(final FlowFile flowFile) {
+ return records.containsKey(flowFile);
+ }
+
@Override
public FlowFile create(final FlowFile parent) {
final Map