another round of site improvements
diff --git a/pom.xml b/pom.xml
index 2d52ec3..e461cdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,7 +271,7 @@
<clean.plugin.version>2.6</clean.plugin.version>
<dependency.plugin.version>2.8</dependency.plugin.version>
<depgraph.plugin.version>1.0.3</depgraph.plugin.version>
- <docker.plugin.version>0.11.5-M1</docker.plugin.version>
+ <docker.plugin.version>0.15.0</docker.plugin.version>
<enforcer.plugin.version>1.3.1</enforcer.plugin.version>
<failsafe.plugin.version>2.17</failsafe.plugin.version>
<jar.plugin.version>2.6</jar.plugin.version>
@@ -282,7 +282,7 @@
<reports.plugin.version>2.9</reports.plugin.version>
<resources.plugin.version>2.7</resources.plugin.version>
<scm.plugin.version>1.9.4</scm.plugin.version>
- <shade.plugin.version>2.3</shade.plugin.version>
+ <shade.plugin.version>2.4.3</shade.plugin.version>
<site.plugin.version>3.4</site.plugin.version>
<source.plugin.version>2.4</source.plugin.version>
<surefire.plugin.version>2.17</surefire.plugin.version>
@@ -852,22 +852,6 @@
<artifactId>json</artifactId>
<version>${orgjson.version}</version>
</dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojure</artifactId>
- <version>${clojure.version}</version>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojure-contrib</artifactId>
- <version>${clojure.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
- <version>${storm.version}</version>
- <scope>provided</scope>
- </dependency>
<!-- JsonPath -->
<dependency>
<groupId>com.jayway.jsonpath</groupId>
diff --git a/src/site/markdown/downloads.md b/src/site/markdown/downloads.md
index 4d1857a..e1f6fff 100644
--- a/src/site/markdown/downloads.md
+++ b/src/site/markdown/downloads.md
@@ -5,4 +5,4 @@
| Artifact | Version | Source | asc | md5 | sha1 |
|----------|---------|
-| streams-project | 0.2-incubating | <a class="externalLink" href="https://dist.apache.org/repos/dist/release/incubator/streams/releases/streams-project/streams-project/streams-project-0.2-incubating-source-release.zip">zip</a> | <a class="externalLink" href="https://dist.apache.org/repos/dist/release/incubator/streams/releases/0.2-incubating/streams-project/streams-project-0.2-incubating-source-release.zip.asc">asc</a> | <a class="externalLink" href="https://dist.apache.org/repos/dist/release/incubator/streams/releases/0.2-incubating/streams-project/streams-project-0.2-incubating-source-release.zip.md5">md5</a> | <a class="externalLink" href="https://dist.apache.org/repos/dist/release/incubator/streams/releases/0.2-incubating/streams-project/streams-project-0.2-incubating-source-release.zip.sha1">sha1</a> |
+| streams-project | 0.2-incubating | <a class="externalLink" href="dist.apache.org/repos/dist/release/incubator/streams/releases/streams-project/streams-project/streams-project-0.2-incubating-source-release.zip">zip</a> | <a class="externalLink" href="dist.apache.org/repos/dist/release/incubator/streams/releases/0.2-incubating/streams-project/streams-project-0.2-incubating-source-release.zip.asc">asc</a> | <a class="externalLink" href="dist.apache.org/repos/dist/release/incubator/streams/releases/0.2-incubating/streams-project/streams-project-0.2-incubating-source-release.zip.md5">md5</a> | <a class="externalLink" href="dist.apache.org/repos/dist/release/incubator/streams/releases/0.2-incubating/streams-project/streams-project-0.2-incubating-source-release.zip.sha1">sha1</a> |
diff --git a/src/site/markdown/faq.md b/src/site/markdown/faq.md
index 0fc950e..9c202ad 100644
--- a/src/site/markdown/faq.md
+++ b/src/site/markdown/faq.md
@@ -6,7 +6,7 @@
### What organizations exchange data in activity streams formats?
-A short list of organizations and products that support activity streams format is compiled [who](who.html "here").
+A short list of organizations and products that support activity streams format is compiled [here](who.html "here").
If your organization supports activity streams, please let us know on the project mailing list.
diff --git a/src/site/markdown/tutorial/build.md b/src/site/markdown/tutorial/build.md
index 37ef3fd..a940bdc 100644
--- a/src/site/markdown/tutorial/build.md
+++ b/src/site/markdown/tutorial/build.md
@@ -13,7 +13,7 @@
#### Git
- `git -version`
+ git -version
| Possible result | Explanation |
|-----------------|-------------|
@@ -25,7 +25,7 @@
Run from your command line:
- `mvn -version`
+ mvn -version
| Possible result | Explanation |
|-----------------|-------------|
@@ -41,7 +41,7 @@
Run from your command line:
- `docker version`
+ docker version
| Possible result | Explanation |
|-----------------|-------------|
diff --git a/src/site/markdown/tutorial/database.md b/src/site/markdown/tutorial/database.md
index 9dc1b69..1d7d752 100644
--- a/src/site/markdown/tutorial/database.md
+++ b/src/site/markdown/tutorial/database.md
@@ -20,15 +20,14 @@
### Add Elasticsearch container details to your configuration
- cd $STREAMS
- export DOCKERHOST=$(docker-machine ip)
+ echo $(docker-machine ip)
-Put the following into elasticsearch.conf
+Put the following into elasticsearch.conf (in the same directory as reference.conf)
include "reference.conf"
elasticsearch {
hosts = [
- ${DOCKERHOST}
+ # paste the response from echo $(docker-machine ip) on this line
]
protocol = "tcp"
port = 9300
diff --git a/src/site/markdown/tutorial/docker.md b/src/site/markdown/tutorial/docker.md
index 84fc6cb..132986b 100644
--- a/src/site/markdown/tutorial/docker.md
+++ b/src/site/markdown/tutorial/docker.md
@@ -1,11 +1,11 @@
## Set up a local environment to run streams
-First of all, you do not run 'Streams' as software. Rather, you run 'streams' which use Streams components and libraries under the cover.
-
Streams components can be embedded in a variety of data processing frameworks based on the problem and performance requirements at hand.
A great way to get started collecting and indexing data is with streams-runtime-local and Docker.
+Several example streams are available from docker hub for tutorial purposes.
+
### Confirm Docker is healthy
We'll assume you've got docker up and running.
diff --git a/src/site/markdown/tutorial/environment.md b/src/site/markdown/tutorial/environment.md
index 1a50a28..902c330 100644
--- a/src/site/markdown/tutorial/environment.md
+++ b/src/site/markdown/tutorial/environment.md
@@ -1,4 +1,4 @@
-### Create a folder to hold streams configuration files
+## Create a local folder to configure streams
Pick a place on your file system that's easy to remember and reference with an absolution path.
@@ -7,7 +7,7 @@
mkdir ~/streams
export STREAMS=$(cd ~streams; pwd)
-### Create a configuration file to hold secrets
+Next, create a configuration file to hold secrets for your streams to use.
cd $STREAMS
touch reference.conf
@@ -23,6 +23,12 @@
}
}
-Visit developer.twitter.com to obtain the above fields and put them your reference.conf
+Visit developer.twitter.com and create an application to obtain the above fields.
+
+The consumerKey and consumerSecret are application-wide.
+
+The accessToken and accessTokenSecret are per-user. They can be obtained by navigating to:
+
+ https://api.twitter.com/oauth/authenticate?oauth_token=UIJ0AUxCJatpKDUyFt0OTSEP4asZgqxRwUCT0AMSwc&oauth_callback=http%3A%2F%2Foauth.streamstutorial.w2odata.com%3A8080%2Fsocialauthdemo%2FsocialAuthSuccessAction.do
diff --git a/src/site/markdown/website.md b/src/site/markdown/website.md
index b56ffc6..06f71a1 100644
--- a/src/site/markdown/website.md
+++ b/src/site/markdown/website.md
@@ -108,7 +108,7 @@
Then, generate the site that will be published
- mvn clean install -Dmaven.test.skip.exec=true site:site site:stage
+ mvn clean generate-sources package -Dmaven.test.skip.exec=true site:site site:stage
At this point you can open target/staging/index.html and do a sanity check on the site you intend to publish.
@@ -116,6 +116,8 @@
mvn scm-publish:publish-scm -Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/infra/websites/production/streams/content/site/${project.version}/${project.artifactId}
+You may need to provide -Dscmpublish.content= depending where the staging site directory winds up under target/
+
Note the revision number checked in at the bottom of the maven logs.
You should now be able to access the published site(s) via an absolute URL such as http://streams.incubator.apache.org/site/${project.version}/${project.artifactId}
diff --git a/src/site/markdown/who.md b/src/site/markdown/who.md
index ae55ea2..7635a20 100644
--- a/src/site/markdown/who.md
+++ b/src/site/markdown/who.md
@@ -2,9 +2,9 @@
| Organization (Product) | Reference |
|------------------------|-----------|
-| Atlassian (JIRA) | [jira](https://developer.atlassian.com/docs/atlassian-platform-common-components/activity-streams/consuming-an-activity-streams-feed "Consuming an Activity Streams Feed") |
-| Google (Google Plus) | [google](https://developers.google.com/+/web/api/rest/latest/activities#resource-representations "Google+ Platform for Web") |
-| IBM | [ibm](https://developer.ibm.com/open/activity-streams/ "Activity Streams") |
-| Twitter (Gnip) | [gnip](http://support.gnip.com/articles/activity-streams-intro.html "Activity Streams Intro") |
+| Atlassian (JIRA) | [Consuming an Activity Streams Feed](https://developer.atlassian.com/docs/atlassian-platform-common-components/activity-streams/consuming-an-activity-streams-feed "Consuming an Activity Streams Feed") |
+| Google (Google Plus) | [Google+ Platform for Web](https://developers.google.com/+/web/api/rest/latest/activities#resource-representations "Google+ Platform for Web") |
+| IBM | [Activity Streams](https://developer.ibm.com/open/activity-streams/ "Activity Streams") |
+| Twitter (Gnip) | [Activity Streams Intro](http://support.gnip.com/articles/activity-streams-intro.html "Activity Streams Intro") |
If your organization supports activity streams, please let us know on the project mailing list.
diff --git a/src/site/resources/architecture.dot b/src/site/resources/architecture.dot
index f1aa1d5..6aaa8a6 100644
--- a/src/site/resources/architecture.dot
+++ b/src/site/resources/architecture.dot
@@ -9,9 +9,10 @@
subgraph cluster_upstream {
label="Upstream Systems";
- upstream_databases [label="Databases"]
+ upstream_databases [label="Databases", shape="cylinder"]
+ upstream_filesystems [label="Filesystems", shape="tab"]
upstream_generators [label="Generators"]
- upstream_queues [label="Queues"]
+ upstream_queues [label="Queues", shape="trapezium"]
}
subgraph cluster_streams {
@@ -24,17 +25,20 @@
subgraph cluster_downstream {
label="Downstream Systems";
- downstream_databases [label="Databases"]
- downstream_queues [label="Queues"]
+ downstream_databases [label="Databases", shape="cylinder"]
+ downstream_filesystems [label="Filesystems", shape="tab"]
+ downstream_queues [label="Queues", shape="trapezium"]
}
upstream_generators -> providers
- upstream_queues -> persistReaders
upstream_databases -> persistReaders
+ upstream_filesystems -> persistReaders
+ upstream_queues -> persistReaders
providers,persistReaders -> processors
processors -> processors
processors -> persistWriters
- persistWriters -> downstream_databases,downstream_queues
-
+ persistWriters -> downstream_databases
+ persistWriters -> downstream_filesystems
+ persistWriters -> downstream_queues
}
diff --git a/src/site/resources/example.dot b/src/site/resources/example.dot
index 941258b..ece7b5c 100644
--- a/src/site/resources/example.dot
+++ b/src/site/resources/example.dot
@@ -43,7 +43,7 @@
subgraph cluster_queues {
label="queues";
- kinesis [label="kinesis://" shape="box"]
+ kinesis [label="kinesis://", shape="trapezium"]
}
subgraph cluster_persisters_2 {
label="persisters";
@@ -55,8 +55,8 @@
subgraph cluster_dbs {
label="dbs";
- elasticsearch [label="elasticsearch"]
- hdfs [label="hdfs"]
+ elasticsearch [label="elasticsearch", shape="cylinder"]
+ hdfs [label="hdfs", shape="tab"]
}
generators_youtube -> providers_youtube_channel
diff --git a/src/site/resources/example.dot.svg b/src/site/resources/example.dot.svg
deleted file mode 100644
index 510681a..0000000
--- a/src/site/resources/example.dot.svg
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.39.20160214.2135 (20160214.2135)
- -->
-<!-- Title: g Pages: 1 -->
-<svg width="2441pt" height="877pt"
- viewBox="0.00 0.00 2441.00 877.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 873)">
-<title>g</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-873 2437,-873 2437,4 -4,4"/>
-<g id="clust1" class="cluster">
-<title>cluster_generators</title>
-<polygon fill="none" stroke="black" points="807,-787 807,-861 1635,-861 1635,-787 807,-787"/>
-<text text-anchor="middle" x="1221" y="-845.8" font-family="Times,serif" font-size="14.00">generators</text>
-</g>
-<g id="clust2" class="cluster">
-<title>cluster_providers</title>
-<polygon fill="none" stroke="black" points="8,-656 8,-768 2425,-768 2425,-656 8,-656"/>
-<text text-anchor="middle" x="1216.5" y="-752.8" font-family="Times,serif" font-size="14.00">providers</text>
-</g>
-<g id="clust3" class="cluster">
-<title>cluster_providers_twitter</title>
-<polygon fill="none" stroke="black" points="16,-664 16,-738 948,-738 948,-664 16,-664"/>
-<text text-anchor="middle" x="482" y="-722.8" font-family="Times,serif" font-size="14.00">twitter</text>
-</g>
-<g id="clust4" class="cluster">
-<title>cluster_providers_facebook</title>
-<polygon fill="none" stroke="black" points="956,-664 956,-738 1431,-738 1431,-664 956,-664"/>
-<text text-anchor="middle" x="1193.5" y="-722.8" font-family="Times,serif" font-size="14.00">facebook</text>
-</g>
-<g id="clust5" class="cluster">
-<title>cluster_providers_youtube</title>
-<polygon fill="none" stroke="black" points="1439,-664 1439,-738 1904,-738 1904,-664 1439,-664"/>
-<text text-anchor="middle" x="1671.5" y="-722.8" font-family="Times,serif" font-size="14.00">youtube</text>
-</g>
-<g id="clust6" class="cluster">
-<title>cluster_providers_instagram</title>
-<polygon fill="none" stroke="black" points="1912,-664 1912,-738 2417,-738 2417,-664 1912,-664"/>
-<text text-anchor="middle" x="2164.5" y="-722.8" font-family="Times,serif" font-size="14.00">instagram</text>
-</g>
-<g id="clust7" class="cluster">
-<title>cluster_processors</title>
-<polygon fill="none" stroke="black" points="402,-538 402,-612 2283,-612 2283,-538 402,-538"/>
-<text text-anchor="middle" x="1342.5" y="-596.8" font-family="Times,serif" font-size="14.00">processors</text>
-</g>
-<g id="clust8" class="cluster">
-<title>cluster_persisters_1</title>
-<polygon fill="none" stroke="black" points="1279,-404 1279,-478 1645,-478 1645,-404 1279,-404"/>
-<text text-anchor="middle" x="1462" y="-462.8" font-family="Times,serif" font-size="14.00">persisters</text>
-</g>
-<g id="clust9" class="cluster">
-<title>cluster_persisters_2</title>
-<polygon fill="none" stroke="black" points="1106,-101 1106,-286 1701,-286 1701,-101 1106,-101"/>
-<text text-anchor="middle" x="1403.5" y="-270.8" font-family="Times,serif" font-size="14.00">persisters</text>
-</g>
-<g id="clust10" class="cluster">
-<title>cluster_dbs</title>
-<polygon fill="none" stroke="black" points="1266,-8 1266,-82 1542,-82 1542,-8 1266,-8"/>
-<text text-anchor="middle" x="1404" y="-66.8" font-family="Times,serif" font-size="14.00">dbs</text>
-</g>
-<!-- generators_twitter -->
-<g id="node1" class="node">
-<title>generators_twitter</title>
-<ellipse fill="none" stroke="black" cx="903" cy="-813" rx="87.9585" ry="18"/>
-<text text-anchor="middle" x="903" y="-808.8" font-family="Times,serif" font-size="14.00">https://api.twitter.com</text>
-</g>
-<!-- providers_twitter_userstream -->
-<g id="node5" class="node">
-<title>providers_twitter_userstream</title>
-<ellipse fill="none" stroke="black" cx="398" cy="-690" rx="106.491" ry="18"/>
-<text text-anchor="middle" x="398" y="-685.8" font-family="Times,serif" font-size="14.00">TwitterUserstreamProvider</text>
-</g>
-<!-- generators_twitter->providers_twitter_userstream -->
-<g id="edge1" class="edge">
-<title>generators_twitter->providers_twitter_userstream</title>
-<path fill="none" stroke="black" d="M818.49,-807.973C721.02,-801.351 567.233,-788.131 513,-768 480.311,-755.866 447.876,-732.57 425.828,-714.584"/>
-<polygon fill="black" stroke="black" points="427.831,-711.697 417.908,-707.985 423.351,-717.075 427.831,-711.697"/>
-</g>
-<!-- providers_twitter_userinfo -->
-<g id="node6" class="node">
-<title>providers_twitter_userinfo</title>
-<ellipse fill="none" stroke="black" cx="149" cy="-690" rx="124.824" ry="18"/>
-<text text-anchor="middle" x="149" y="-685.8" font-family="Times,serif" font-size="14.00">TwitterUserInformationProvider</text>
-</g>
-<!-- generators_twitter->providers_twitter_userinfo -->
-<g id="edge4" class="edge">
-<title>generators_twitter->providers_twitter_userinfo</title>
-<path fill="none" stroke="black" d="M815.52,-811.503C668.86,-808.185 379.922,-797.96 283,-768 245.107,-756.287 206.443,-732.218 180.449,-713.896"/>
-<polygon fill="black" stroke="black" points="182.303,-710.919 172.138,-707.929 178.22,-716.605 182.303,-710.919"/>
-</g>
-<!-- providers_twitter_timeline -->
-<g id="node7" class="node">
-<title>providers_twitter_timeline</title>
-<ellipse fill="none" stroke="black" cx="620" cy="-690" rx="97.6831" ry="18"/>
-<text text-anchor="middle" x="620" y="-685.8" font-family="Times,serif" font-size="14.00">TwitterTimelineProvider</text>
-</g>
-<!-- generators_twitter->providers_twitter_timeline -->
-<g id="edge2" class="edge">
-<title>generators_twitter->providers_twitter_timeline</title>
-<path fill="none" stroke="black" d="M834.06,-801.691C800.693,-794.655 760.669,-783.855 727,-768 697.44,-754.08 667.721,-731.573 647.131,-714.305"/>
-<polygon fill="black" stroke="black" points="649.314,-711.567 639.436,-707.738 644.77,-716.892 649.314,-711.567"/>
-</g>
-<!-- providers_twitter_following -->
-<g id="node8" class="node">
-<title>providers_twitter_following</title>
-<ellipse fill="none" stroke="black" cx="838" cy="-690" rx="102.174" ry="18"/>
-<text text-anchor="middle" x="838" y="-685.8" font-family="Times,serif" font-size="14.00">TwitterFollowingProvider</text>
-</g>
-<!-- generators_twitter->providers_twitter_following -->
-<g id="edge3" class="edge">
-<title>generators_twitter->providers_twitter_following</title>
-<path fill="none" stroke="black" d="M893.409,-794.851C882.608,-774.412 864.938,-740.975 852.46,-717.364"/>
-<polygon fill="black" stroke="black" points="855.397,-715.43 847.63,-708.224 849.208,-718.7 855.397,-715.43"/>
-</g>
-<!-- generators_facebook -->
-<g id="node2" class="node">
-<title>generators_facebook</title>
-<ellipse fill="none" stroke="black" cx="1106" cy="-813" rx="97.5707" ry="18"/>
-<text text-anchor="middle" x="1106" y="-808.8" font-family="Times,serif" font-size="14.00">https://api.facebook.com</text>
-</g>
-<!-- providers_facebook_page -->
-<g id="node9" class="node">
-<title>providers_facebook_page</title>
-<ellipse fill="none" stroke="black" cx="1056" cy="-690" rx="92.267" ry="18"/>
-<text text-anchor="middle" x="1056" y="-685.8" font-family="Times,serif" font-size="14.00">FacebookPageProvider</text>
-</g>
-<!-- generators_facebook->providers_facebook_page -->
-<g id="edge9" class="edge">
-<title>generators_facebook->providers_facebook_page</title>
-<path fill="none" stroke="black" d="M1098.62,-794.851C1090.35,-774.503 1076.84,-741.272 1067.25,-717.679"/>
-<polygon fill="black" stroke="black" points="1070.42,-716.169 1063.41,-708.224 1063.93,-718.805 1070.42,-716.169"/>
-</g>
-<!-- providers_facebook_pagefeed -->
-<g id="node10" class="node">
-<title>providers_facebook_pagefeed</title>
-<ellipse fill="none" stroke="black" cx="1295" cy="-690" rx="128.44" ry="18"/>
-<text text-anchor="middle" x="1295" y="-685.8" font-family="Times,serif" font-size="14.00">FacebookPageFeedDataCollector</text>
-</g>
-<!-- generators_facebook->providers_facebook_pagefeed -->
-<g id="edge10" class="edge">
-<title>generators_facebook->providers_facebook_pagefeed</title>
-<path fill="none" stroke="black" d="M1132.68,-795.638C1165.84,-774.058 1222.54,-737.155 1259.39,-713.175"/>
-<polygon fill="black" stroke="black" points="1261.37,-716.06 1267.85,-707.672 1257.55,-710.193 1261.37,-716.06"/>
-</g>
-<!-- generators_youtube -->
-<g id="node3" class="node">
-<title>generators_youtube</title>
-<ellipse fill="none" stroke="black" cx="1315" cy="-813" rx="93.7378" ry="18"/>
-<text text-anchor="middle" x="1315" y="-808.8" font-family="Times,serif" font-size="14.00">https://api.youtube.com</text>
-</g>
-<!-- providers_youtube_channel -->
-<g id="node11" class="node">
-<title>providers_youtube_channel</title>
-<ellipse fill="none" stroke="black" cx="1547" cy="-690" rx="99.7162" ry="18"/>
-<text text-anchor="middle" x="1547" y="-685.8" font-family="Times,serif" font-size="14.00">YoutubeChannelProvider</text>
-</g>
-<!-- generators_youtube->providers_youtube_channel -->
-<g id="edge13" class="edge">
-<title>generators_youtube->providers_youtube_channel</title>
-<path fill="none" stroke="black" d="M1364.37,-797.607C1386.52,-789.917 1412.64,-779.741 1435,-768 1464.26,-752.634 1494.89,-730.856 1516.7,-714.216"/>
-<polygon fill="black" stroke="black" points="1519.12,-716.769 1524.9,-707.888 1514.84,-711.228 1519.12,-716.769"/>
-</g>
-<!-- providers_youtube_video -->
-<g id="node12" class="node">
-<title>providers_youtube_video</title>
-<ellipse fill="none" stroke="black" cx="1780" cy="-690" rx="115.637" ry="18"/>
-<text text-anchor="middle" x="1780" y="-685.8" font-family="Times,serif" font-size="14.00">YoutubeUserActivityProvider</text>
-</g>
-<!-- generators_youtube->providers_youtube_video -->
-<g id="edge14" class="edge">
-<title>generators_youtube->providers_youtube_video</title>
-<path fill="none" stroke="black" d="M1367.31,-797.992C1383.44,-793.851 1401.35,-789.746 1418,-787 1522.7,-769.731 1555.29,-801.438 1656,-768 1691.41,-756.243 1726.96,-732.346 1750.86,-714.084"/>
-<polygon fill="black" stroke="black" points="1753.07,-716.797 1758.8,-707.888 1748.76,-711.276 1753.07,-716.797"/>
-</g>
-<!-- generators_instagram -->
-<g id="node4" class="node">
-<title>generators_instagram</title>
-<ellipse fill="none" stroke="black" cx="1527" cy="-813" rx="100.002" ry="18"/>
-<text text-anchor="middle" x="1527" y="-808.8" font-family="Times,serif" font-size="14.00">https://api.instagram.com</text>
-</g>
-<!-- providers_instagram_userinfo -->
-<g id="node13" class="node">
-<title>providers_instagram_userinfo</title>
-<ellipse fill="none" stroke="black" cx="2030" cy="-690" rx="109.615" ry="18"/>
-<text text-anchor="middle" x="2030" y="-685.8" font-family="Times,serif" font-size="14.00">InstagramUserInfoCollector</text>
-</g>
-<!-- generators_instagram->providers_instagram_userinfo -->
-<g id="edge17" class="edge">
-<title>generators_instagram->providers_instagram_userinfo</title>
-<path fill="none" stroke="black" d="M1621.07,-806.731C1716.4,-799.516 1856.88,-786.267 1908,-768 1942.37,-755.719 1976.99,-732.284 2000.52,-714.294"/>
-<polygon fill="black" stroke="black" points="2002.94,-716.851 2008.67,-707.943 1998.63,-711.33 2002.94,-716.851"/>
-</g>
-<!-- providers_instagram_media -->
-<g id="node14" class="node">
-<title>providers_instagram_media</title>
-<ellipse fill="none" stroke="black" cx="2283" cy="-690" rx="125.542" ry="18"/>
-<text text-anchor="middle" x="2283" y="-685.8" font-family="Times,serif" font-size="14.00">InstagramRecentMediaCollector</text>
-</g>
-<!-- generators_instagram->providers_instagram_media -->
-<g id="edge18" class="edge">
-<title>generators_instagram->providers_instagram_media</title>
-<path fill="none" stroke="black" d="M1626.8,-811.244C1777.18,-807.674 2054.35,-797.246 2149,-768 2186.89,-756.291 2225.56,-732.221 2251.55,-713.899"/>
-<polygon fill="black" stroke="black" points="2253.78,-716.607 2259.86,-707.931 2249.7,-710.921 2253.78,-716.607"/>
-</g>
-<!-- processors_twitter_activity -->
-<g id="node15" class="node">
-<title>processors_twitter_activity</title>
-<ellipse fill="none" stroke="black" cx="801" cy="-564" rx="108.672" ry="18"/>
-<text text-anchor="middle" x="801" y="-559.8" font-family="Times,serif" font-size="14.00">ActivityConverterProcessor</text>
-</g>
-<!-- providers_twitter_userstream->processors_twitter_activity -->
-<g id="edge6" class="edge">
-<title>providers_twitter_userstream->processors_twitter_activity</title>
-<path fill="none" stroke="black" d="M439.397,-673.395C481.506,-657.199 548.988,-633.14 609.446,-620 641.579,-613.016 651.117,-620.051 683,-612 708.217,-605.633 735.166,-594.986 756.935,-585.336"/>
-<polygon fill="black" stroke="black" points="758.564,-588.441 766.236,-581.134 755.682,-582.061 758.564,-588.441"/>
-<text text-anchor="middle" x="645.277" y="-629.8" font-family="Times,serif" font-size="14.00">o.a.s.t.Tweet</text>
-</g>
-<!-- processors_twitter_activityobject -->
-<g id="node16" class="node">
-<title>processors_twitter_activityobject</title>
-<ellipse fill="none" stroke="black" cx="542" cy="-564" rx="132.317" ry="18"/>
-<text text-anchor="middle" x="542" y="-559.8" font-family="Times,serif" font-size="14.00">ActivityObjectConverterProcessor</text>
-</g>
-<!-- providers_twitter_userinfo->processors_twitter_activityobject -->
-<g id="edge5" class="edge">
-<title>providers_twitter_userinfo->processors_twitter_activityobject</title>
-<path fill="none" stroke="black" d="M200.378,-673.528C272.507,-650.402 403.579,-608.379 480.706,-583.652"/>
-<polygon fill="black" stroke="black" points="481.843,-586.963 490.297,-580.577 479.706,-580.297 481.843,-586.963"/>
-<text text-anchor="middle" x="389.493" y="-629.8" font-family="Times,serif" font-size="14.00">o.a.s.t.User</text>
-</g>
-<!-- providers_twitter_timeline->processors_twitter_activity -->
-<g id="edge7" class="edge">
-<title>providers_twitter_timeline->processors_twitter_activity</title>
-<path fill="none" stroke="black" d="M645.167,-672.48C676.957,-650.351 731.775,-612.19 767.194,-587.533"/>
-<polygon fill="black" stroke="black" points="769.548,-590.159 775.755,-581.574 765.548,-584.414 769.548,-590.159"/>
-<text text-anchor="middle" x="751.277" y="-629.8" font-family="Times,serif" font-size="14.00">o.a.s.t.Tweet</text>
-</g>
-<!-- providers_twitter_following->processors_twitter_activity -->
-<g id="edge8" class="edge">
-<title>providers_twitter_following->processors_twitter_activity</title>
-<path fill="none" stroke="black" d="M832.699,-671.947C826.544,-650.989 816.323,-616.182 809.156,-591.773"/>
-<polygon fill="black" stroke="black" points="812.467,-590.628 806.291,-582.019 805.751,-592.6 812.467,-590.628"/>
-<text text-anchor="middle" x="863.114" y="-629.8" font-family="Times,serif" font-size="14.00">o.a.s.t.Follow</text>
-</g>
-<!-- processors_facebook_activityobject -->
-<g id="node18" class="node">
-<title>processors_facebook_activityobject</title>
-<ellipse fill="none" stroke="black" cx="1050" cy="-564" rx="122.678" ry="18"/>
-<text text-anchor="middle" x="1050" y="-559.8" font-family="Times,serif" font-size="14.00">FacebookPostActivitySerializer</text>
-</g>
-<!-- providers_facebook_page->processors_facebook_activityobject -->
-<g id="edge11" class="edge">
-<title>providers_facebook_page->processors_facebook_activityobject</title>
-<path fill="none" stroke="black" d="M1055.14,-671.947C1054.15,-651.082 1052.5,-616.493 1051.34,-592.101"/>
-<polygon fill="black" stroke="black" points="1054.83,-591.841 1050.86,-582.019 1047.84,-592.174 1054.83,-591.841"/>
-<text text-anchor="middle" x="1086.27" y="-629.8" font-family="Times,serif" font-size="14.00">o.a.s.f.Page</text>
-</g>
-<!-- processors_facebook_activity -->
-<g id="node17" class="node">
-<title>processors_facebook_activity</title>
-<ellipse fill="none" stroke="black" cx="1315" cy="-564" rx="124.582" ry="18"/>
-<text text-anchor="middle" x="1315" y="-559.8" font-family="Times,serif" font-size="14.00">FacebookPageActivitySerializer</text>
-</g>
-<!-- providers_facebook_pagefeed->processors_facebook_activity -->
-<g id="edge12" class="edge">
-<title>providers_facebook_pagefeed->processors_facebook_activity</title>
-<path fill="none" stroke="black" d="M1297.87,-671.947C1301.18,-651.082 1306.67,-616.493 1310.54,-592.101"/>
-<polygon fill="black" stroke="black" points="1314.03,-592.444 1312.14,-582.019 1307.12,-591.347 1314.03,-592.444"/>
-<text text-anchor="middle" x="1351.27" y="-636.8" font-family="Times,serif" font-size="14.00">o.a.s.f.Post</text>
-<text text-anchor="middle" x="1351.27" y="-622.8" font-family="Times,serif" font-size="14.00">o.a.s.f.Comment</text>
-</g>
-<!-- processors_youtube_activityobject -->
-<g id="node20" class="node">
-<title>processors_youtube_activityobject</title>
-<ellipse fill="none" stroke="black" cx="1550" cy="-564" rx="92.691" ry="18"/>
-<text text-anchor="middle" x="1550" y="-559.8" font-family="Times,serif" font-size="14.00">YoutubeTypeConverter</text>
-</g>
-<!-- providers_youtube_channel->processors_youtube_activityobject -->
-<g id="edge15" class="edge">
-<title>providers_youtube_channel->processors_youtube_activityobject</title>
-<path fill="none" stroke="black" d="M1547.43,-671.947C1547.93,-651.082 1548.75,-616.493 1549.33,-592.101"/>
-<polygon fill="black" stroke="black" points="1552.83,-592.1 1549.57,-582.019 1545.83,-591.933 1552.83,-592.1"/>
-<text text-anchor="middle" x="1590.7" y="-629.8" font-family="Times,serif" font-size="14.00">o.a.s.y.Channel</text>
-</g>
-<!-- processors_youtube_activity -->
-<g id="node19" class="node">
-<title>processors_youtube_activity</title>
-<ellipse fill="none" stroke="black" cx="1753" cy="-564" rx="92.691" ry="18"/>
-<text text-anchor="middle" x="1753" y="-559.8" font-family="Times,serif" font-size="14.00">YoutubeTypeConverter</text>
-</g>
-<!-- providers_youtube_video->processors_youtube_activity -->
-<g id="edge16" class="edge">
-<title>providers_youtube_video->processors_youtube_activity</title>
-<path fill="none" stroke="black" d="M1776.13,-671.947C1771.66,-651.082 1764.25,-616.493 1759.02,-592.101"/>
-<polygon fill="black" stroke="black" points="1762.38,-591.064 1756.86,-582.019 1755.53,-592.531 1762.38,-591.064"/>
-<text text-anchor="middle" x="1806.07" y="-629.8" font-family="Times,serif" font-size="14.00">o.a.s.y.Video</text>
-</g>
-<!-- processors_instagram_activityobject -->
-<g id="node22" class="node">
-<title>processors_instagram_activityobject</title>
-<ellipse fill="none" stroke="black" cx="1962" cy="-564" rx="98.2636" ry="18"/>
-<text text-anchor="middle" x="1962" y="-559.8" font-family="Times,serif" font-size="14.00">InstagramTypeConverter</text>
-</g>
-<!-- providers_instagram_userinfo->processors_instagram_activityobject -->
-<g id="edge19" class="edge">
-<title>providers_instagram_userinfo->processors_instagram_activityobject</title>
-<path fill="none" stroke="black" d="M2020.26,-671.947C2008.85,-650.802 1989.83,-615.56 1976.64,-591.122"/>
-<polygon fill="black" stroke="black" points="1979.55,-589.157 1971.72,-582.019 1973.39,-592.482 1979.55,-589.157"/>
-<text text-anchor="middle" x="2062.37" y="-629.8" font-family="Times,serif" font-size="14.00">o.a.s.i.UserInfoData</text>
-</g>
-<!-- processors_instagram_activity -->
-<g id="node21" class="node">
-<title>processors_instagram_activity</title>
-<ellipse fill="none" stroke="black" cx="2177" cy="-564" rx="98.2636" ry="18"/>
-<text text-anchor="middle" x="2177" y="-559.8" font-family="Times,serif" font-size="14.00">InstagramTypeConverter</text>
-</g>
-<!-- providers_instagram_media->processors_instagram_activity -->
-<g id="edge20" class="edge">
-<title>providers_instagram_media->processors_instagram_activity</title>
-<path fill="none" stroke="black" d="M2267.81,-671.947C2249.71,-650.427 2219.32,-614.308 2198.73,-589.834"/>
-<polygon fill="black" stroke="black" points="2201.27,-587.418 2192.16,-582.019 2195.92,-591.925 2201.27,-587.418"/>
-<text text-anchor="middle" x="2307.98" y="-629.8" font-family="Times,serif" font-size="14.00">o.a.s.i.MediaFeedData</text>
-</g>
-<!-- persisters_kinesis_writer_activity -->
-<g id="node23" class="node">
-<title>persisters_kinesis_writer_activity</title>
-<ellipse fill="none" stroke="black" cx="1554" cy="-430" rx="82.8977" ry="18"/>
-<text text-anchor="middle" x="1554" y="-425.8" font-family="Times,serif" font-size="14.00">KinesisPersistWriter</text>
-</g>
-<!-- processors_twitter_activity->persisters_kinesis_writer_activity -->
-<g id="edge22" class="edge">
-<title>processors_twitter_activity->persisters_kinesis_writer_activity</title>
-<path fill="none" stroke="black" d="M859.547,-548.761C878.112,-544.531 898.802,-540.434 918,-538 983.733,-529.666 1151.97,-545.058 1216,-528 1254.53,-517.735 1256.82,-496.542 1295.27,-486 1366.82,-466.385 1390.39,-497.388 1462,-478 1482.1,-472.558 1502.81,-462.243 1519.47,-452.567"/>
-<polygon fill="black" stroke="black" points="1521.5,-455.43 1528.29,-447.292 1517.91,-449.424 1521.5,-455.43"/>
-<text text-anchor="middle" x="1338.36" y="-516.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Post</text>
-<text text-anchor="middle" x="1338.36" y="-502.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Share</text>
-<text text-anchor="middle" x="1338.36" y="-488.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Follow</text>
-</g>
-<!-- persisters_kinesis_writer_activityobject -->
-<g id="node24" class="node">
-<title>persisters_kinesis_writer_activityobject</title>
-<ellipse fill="none" stroke="black" cx="1370" cy="-430" rx="82.8977" ry="18"/>
-<text text-anchor="middle" x="1370" y="-425.8" font-family="Times,serif" font-size="14.00">KinesisPersistWriter</text>
-</g>
-<!-- processors_twitter_activityobject->persisters_kinesis_writer_activityobject -->
-<g id="edge21" class="edge">
-<title>processors_twitter_activityobject->persisters_kinesis_writer_activityobject</title>
-<path fill="none" stroke="black" d="M619.514,-549.367C640.13,-545.568 662.394,-541.549 683,-538 902.818,-500.139 1163.16,-460.677 1291.05,-441.643"/>
-<polygon fill="black" stroke="black" points="1291.77,-445.075 1301.15,-440.142 1290.74,-438.151 1291.77,-445.075"/>
-<text text-anchor="middle" x="1022.13" y="-502.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Page</text>
-</g>
-<!-- processors_facebook_activity->persisters_kinesis_writer_activity -->
-<g id="edge24" class="edge">
-<title>processors_facebook_activity->persisters_kinesis_writer_activity</title>
-<path fill="none" stroke="black" d="M1388.42,-549.455C1434.94,-540.137 1486.76,-529.512 1489,-528 1502.56,-518.833 1524.62,-482.716 1539.23,-456.998"/>
-<polygon fill="black" stroke="black" points="1542.4,-458.496 1544.24,-448.062 1536.29,-455.071 1542.4,-458.496"/>
-<text text-anchor="middle" x="1572.14" y="-509.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Post</text>
-<text text-anchor="middle" x="1572.14" y="-495.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Comment</text>
-</g>
-<!-- processors_facebook_activityobject->persisters_kinesis_writer_activityobject -->
-<g id="edge23" class="edge">
-<title>processors_facebook_activityobject->persisters_kinesis_writer_activityobject</title>
-<path fill="none" stroke="black" d="M1066.14,-546.078C1083.21,-528.222 1111.77,-501.321 1141.73,-486 1187.25,-462.73 1242.88,-448.824 1287.83,-440.691"/>
-<polygon fill="black" stroke="black" points="1288.59,-444.111 1297.83,-438.943 1287.38,-437.216 1288.59,-444.111"/>
-<text text-anchor="middle" x="1178.13" y="-502.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Page</text>
-</g>
-<!-- processors_youtube_activity->persisters_kinesis_writer_activity -->
-<g id="edge26" class="edge">
-<title>processors_youtube_activity->persisters_kinesis_writer_activity</title>
-<path fill="none" stroke="black" d="M1751.05,-545.759C1748.23,-528.174 1741.4,-501.947 1725,-486 1701.15,-462.814 1667.56,-449.227 1636.45,-441.266"/>
-<polygon fill="black" stroke="black" points="1637,-437.798 1626.46,-438.874 1635.37,-444.605 1637,-437.798"/>
-<text text-anchor="middle" x="1797.14" y="-509.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Video</text>
-<text text-anchor="middle" x="1797.14" y="-495.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Comment</text>
-</g>
-<!-- processors_youtube_activityobject->persisters_kinesis_writer_activityobject -->
-<g id="edge25" class="edge">
-<title>processors_youtube_activityobject->persisters_kinesis_writer_activityobject</title>
-<path fill="none" stroke="black" d="M1493.63,-549.569C1457.24,-540.162 1416.37,-529.382 1414.73,-528 1393.52,-510.081 1381.86,-479.98 1375.82,-457.856"/>
-<polygon fill="black" stroke="black" points="1379.18,-456.873 1373.35,-448.025 1372.39,-458.576 1379.18,-456.873"/>
-<text text-anchor="middle" x="1451.13" y="-502.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Page</text>
-</g>
-<!-- processors_instagram_activity->persisters_kinesis_writer_activity -->
-<g id="edge28" class="edge">
-<title>processors_instagram_activity->persisters_kinesis_writer_activity</title>
-<path fill="none" stroke="black" d="M2117.3,-549.617C2101.59,-545.834 2084.66,-541.761 2069,-538 1972.57,-514.838 1948.99,-506.72 1852,-486 1776.45,-469.859 1689.58,-453.82 1629.21,-443.071"/>
-<polygon fill="black" stroke="black" points="1629.46,-439.561 1619,-441.26 1628.24,-446.454 1629.46,-439.561"/>
-<text text-anchor="middle" x="2078.14" y="-516.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Photo</text>
-<text text-anchor="middle" x="2078.14" y="-502.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Video</text>
-<text text-anchor="middle" x="2078.14" y="-488.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Comment</text>
-</g>
-<!-- processors_instagram_activityobject->persisters_kinesis_writer_activityobject -->
-<g id="edge27" class="edge">
-<title>processors_instagram_activityobject->persisters_kinesis_writer_activityobject</title>
-<path fill="none" stroke="black" d="M1908.51,-548.886C1891.53,-544.662 1872.6,-540.537 1855,-538 1832.07,-534.694 1666.23,-540.514 1646.73,-528 1629.05,-516.647 1642.68,-497.362 1625,-486 1609.75,-476.197 1479.5,-482.749 1462,-478 1441.9,-472.547 1421.2,-462.231 1404.53,-452.557"/>
-<polygon fill="black" stroke="black" points="1406.09,-449.414 1395.72,-447.283 1402.5,-455.421 1406.09,-449.414"/>
-<text text-anchor="middle" x="1683.13" y="-502.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Page</text>
-</g>
-<!-- kinesis -->
-<g id="node33" class="node">
-<title>kinesis</title>
-<ellipse fill="none" stroke="black" cx="1465" cy="-344" rx="34.8458" ry="18"/>
-<text text-anchor="middle" x="1465" y="-339.8" font-family="Times,serif" font-size="14.00">kinesis</text>
-</g>
-<!-- persisters_kinesis_writer_activity->kinesis -->
-<g id="edge29" class="edge">
-<title>persisters_kinesis_writer_activity->kinesis</title>
-<path fill="none" stroke="black" d="M1543.77,-412.111C1537.45,-401.981 1528.7,-389.481 1519,-380 1512.57,-373.716 1504.91,-367.853 1497.4,-362.758"/>
-<polygon fill="black" stroke="black" points="1499.04,-359.649 1488.74,-357.151 1495.23,-365.524 1499.04,-359.649"/>
-<text text-anchor="middle" x="1577.47" y="-382.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Activity</text>
-</g>
-<!-- persisters_kinesis_writer_activityobject->kinesis -->
-<g id="edge31" class="edge">
-<title>persisters_kinesis_writer_activityobject->kinesis</title>
-<path fill="none" stroke="black" d="M1371.66,-411.544C1373.44,-401.225 1377.13,-388.725 1384.75,-380 1394.95,-368.32 1409.69,-360.241 1423.76,-354.745"/>
-<polygon fill="black" stroke="black" points="1425.08,-357.989 1433.33,-351.34 1422.73,-351.395 1425.08,-357.989"/>
-<text text-anchor="middle" x="1449.13" y="-382.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.ActivityObject</text>
-</g>
-<!-- persisters_elasticsearch -->
-<g id="node25" class="node">
-<title>persisters_elasticsearch</title>
-<ellipse fill="none" stroke="black" cx="1590" cy="-127" rx="103.134" ry="18"/>
-<text text-anchor="middle" x="1590" y="-122.8" font-family="Times,serif" font-size="14.00">ElasticsearchPersistWriter</text>
-</g>
-<!-- elasticsearch -->
-<g id="node30" class="node">
-<title>elasticsearch</title>
-<ellipse fill="none" stroke="black" cx="1479" cy="-34" rx="55.0578" ry="18"/>
-<text text-anchor="middle" x="1479" y="-29.8" font-family="Times,serif" font-size="14.00">elasticsearch</text>
-</g>
-<!-- persisters_elasticsearch->elasticsearch -->
-<g id="edge38" class="edge">
-<title>persisters_elasticsearch->elasticsearch</title>
-<path fill="none" stroke="black" d="M1568.86,-109.289C1551.36,-94.6244 1526.34,-73.6627 1507.14,-57.5795"/>
-<polygon fill="black" stroke="black" points="1509.22,-54.7573 1499.31,-51.0179 1504.73,-60.123 1509.22,-54.7573"/>
-</g>
-<!-- persisters_graph -->
-<g id="node26" class="node">
-<title>persisters_graph</title>
-<ellipse fill="none" stroke="black" cx="1193" cy="-127" rx="78.5369" ry="18"/>
-<text text-anchor="middle" x="1193" y="-122.8" font-family="Times,serif" font-size="14.00">GraphPersistWriter</text>
-</g>
-<!-- neo4j -->
-<g id="node32" class="node">
-<title>neo4j</title>
-<ellipse fill="none" stroke="black" cx="1304" cy="-34" rx="29.5104" ry="18"/>
-<text text-anchor="middle" x="1304" y="-29.8" font-family="Times,serif" font-size="14.00">neo4j</text>
-</g>
-<!-- persisters_graph->neo4j -->
-<g id="edge40" class="edge">
-<title>persisters_graph->neo4j</title>
-<path fill="none" stroke="black" d="M1213.88,-109.507C1232.23,-94.1301 1259,-71.7062 1278.59,-55.2903"/>
-<polygon fill="black" stroke="black" points="1281.08,-57.7658 1286.5,-48.6608 1276.59,-52.4002 1281.08,-57.7658"/>
-</g>
-<!-- persisters_hdfs -->
-<g id="node27" class="node">
-<title>persisters_hdfs</title>
-<ellipse fill="none" stroke="black" cx="1379" cy="-127" rx="89.7062" ry="18"/>
-<text text-anchor="middle" x="1379" y="-122.8" font-family="Times,serif" font-size="14.00">WebHdfsPersistWriter</text>
-</g>
-<!-- hdfs -->
-<g id="node31" class="node">
-<title>hdfs</title>
-<ellipse fill="none" stroke="black" cx="1379" cy="-34" rx="27" ry="18"/>
-<text text-anchor="middle" x="1379" y="-29.8" font-family="Times,serif" font-size="14.00">hdfs</text>
-</g>
-<!-- persisters_hdfs->hdfs -->
-<g id="edge39" class="edge">
-<title>persisters_hdfs->hdfs</title>
-<path fill="none" stroke="black" d="M1379,-108.626C1379,-95.4212 1379,-77.369 1379,-62.3274"/>
-<polygon fill="black" stroke="black" points="1382.5,-62.0192 1379,-52.0192 1375.5,-62.0192 1382.5,-62.0192"/>
-</g>
-<!-- persisters_kinesis_reader_activity -->
-<g id="node28" class="node">
-<title>persisters_kinesis_reader_activity</title>
-<ellipse fill="none" stroke="black" cx="1379" cy="-238" rx="85.0273" ry="18"/>
-<text text-anchor="middle" x="1379" y="-233.8" font-family="Times,serif" font-size="14.00">KinesisPersistReader</text>
-</g>
-<!-- persisters_kinesis_reader_activity->persisters_elasticsearch -->
-<g id="edge33" class="edge">
-<title>persisters_kinesis_reader_activity->persisters_elasticsearch</title>
-<path fill="none" stroke="black" d="M1411.05,-221.141C1447.73,-201.842 1507.94,-170.168 1548.26,-148.956"/>
-<polygon fill="black" stroke="black" points="1550.08,-151.953 1557.3,-144.2 1546.82,-145.758 1550.08,-151.953"/>
-</g>
-<!-- persisters_kinesis_reader_activity->persisters_graph -->
-<g id="edge35" class="edge">
-<title>persisters_kinesis_reader_activity->persisters_graph</title>
-<path fill="none" stroke="black" d="M1350.35,-220.9C1318.03,-201.614 1265.38,-170.195 1229.99,-149.073"/>
-<polygon fill="black" stroke="black" points="1231.76,-146.057 1221.38,-143.938 1228.18,-152.068 1231.76,-146.057"/>
-</g>
-<!-- persisters_kinesis_reader_activity->persisters_hdfs -->
-<g id="edge34" class="edge">
-<title>persisters_kinesis_reader_activity->persisters_hdfs</title>
-<path fill="none" stroke="black" d="M1379,-219.671C1379,-202.237 1379,-175.748 1379,-155.549"/>
-<polygon fill="black" stroke="black" points="1382.5,-155.357 1379,-145.357 1375.5,-155.357 1382.5,-155.357"/>
-</g>
-<!-- persisters_kinesis_reader_activityobject -->
-<g id="node29" class="node">
-<title>persisters_kinesis_reader_activityobject</title>
-<ellipse fill="none" stroke="black" cx="1568" cy="-238" rx="85.0273" ry="18"/>
-<text text-anchor="middle" x="1568" y="-233.8" font-family="Times,serif" font-size="14.00">KinesisPersistReader</text>
-</g>
-<!-- persisters_kinesis_reader_activityobject->persisters_elasticsearch -->
-<g id="edge36" class="edge">
-<title>persisters_kinesis_reader_activityobject->persisters_elasticsearch</title>
-<path fill="none" stroke="black" d="M1571.63,-219.671C1575.1,-202.157 1580.39,-175.504 1584.4,-155.27"/>
-<polygon fill="black" stroke="black" points="1587.85,-155.846 1586.36,-145.357 1580.98,-154.485 1587.85,-155.846"/>
-</g>
-<!-- persisters_kinesis_reader_activityobject->persisters_hdfs -->
-<g id="edge37" class="edge">
-<title>persisters_kinesis_reader_activityobject->persisters_hdfs</title>
-<path fill="none" stroke="black" d="M1538.88,-220.9C1506.14,-201.67 1452.86,-170.378 1416.9,-149.257"/>
-<polygon fill="black" stroke="black" points="1418.55,-146.166 1408.15,-144.12 1415,-152.202 1418.55,-146.166"/>
-</g>
-<!-- kinesis->persisters_kinesis_reader_activity -->
-<g id="edge30" class="edge">
-<title>kinesis->persisters_kinesis_reader_activity</title>
-<path fill="none" stroke="black" d="M1442.34,-330.005C1433.73,-323.956 1424.28,-316.349 1417.07,-308 1406.15,-295.363 1397.07,-279.081 1390.51,-265.4"/>
-<polygon fill="black" stroke="black" points="1393.55,-263.62 1386.2,-255.988 1387.18,-266.537 1393.55,-263.62"/>
-<text text-anchor="middle" x="1463.47" y="-296.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.Activity</text>
-</g>
-<!-- kinesis->persisters_kinesis_reader_activityobject -->
-<g id="edge32" class="edge">
-<title>kinesis->persisters_kinesis_reader_activityobject</title>
-<path fill="none" stroke="black" d="M1485.45,-329.062C1493.42,-322.884 1502.44,-315.434 1510,-308 1523.89,-294.349 1537.86,-277.595 1548.61,-263.901"/>
-<polygon fill="black" stroke="black" points="1551.51,-265.875 1554.86,-255.824 1545.97,-261.592 1551.51,-265.875"/>
-<text text-anchor="middle" x="1587.13" y="-296.8" font-family="Times,serif" font-size="14.00">o.a.s.p.j.ActivityObject</text>
-</g>
-</g>
-</svg>
diff --git a/src/site/site.xml b/src/site/site.xml
index f958930..eb5f0c9 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,20 +17,13 @@
~ under the License.
-->
<project>
- <publishDate position="right"/>
- <version position="right"/>
+ <publishDate position="bottom"/>
+ <version position="bottom"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</skin>
- <custom>
- <fluidoSkin>
- <topBarEnabled>true</topBarEnabled>
- <navBarStyle>navbar-inverse</navBarStyle>
- <sideBarEnabled>false</sideBarEnabled>
- </fluidoSkin>
- </custom>
<bannerLeft>
<name>Apache Streams</name>
<src>http://streams.incubator.apache.org/images/streams_logo.jpg</src>
@@ -48,8 +41,7 @@
<item name="Incubator" href="http://incubator.apache.org/"/>
<item name="Streams" href="http://streams.incubator.apache.org/"/>
</breadcrumbs>
- <menu ref="parent" inherit="top"/>
- <menu name="Overview">
+ <menu name="Overview" inherit="top">
<item name="Overview" href="index.html" />
<item name="Architecture" href="architecture.html" />
<item name="Concepts" href="concepts.html" />
@@ -70,7 +62,7 @@
<item name="Release Process" href="release.html" />
<item name="Website Management" href="website.html" />
</menu>
- <menu name="Projects">
+ <menu name="Projects" inherit="top">
<item name="streams-master" />
<item name="streams-project" href="http://streams.incubator.apache.org/site/latest/streams-project" />
<item name="streams-examples" href="http://streams.incubator.apache.org/site/latest/streams-examples/" />
@@ -81,26 +73,39 @@
<item name="Set up a local docker environment" href="tutorial/docker.html" />
<item name="Run a local database to store activity documents" href="tutorial/database.html" />
<item name="Run twitter-history-elasticsearch" href="http://streams.incubator.apache.org/site/latest/streams-examples/streams-examples-local/twitter-history-elasticsearch/index.html" />
- <item name="Browse and search the twitter data you collected" href="tutorial/browse.html" />
+ <item name="Run twitter-history-elasticsearch" href="http://streams.incubator.apache.org/site/latest/streams-examples/streams-examples-local/twitter-history-elasticsearch/index.html" />
</menu>
- <menu name="Getting Started">
- <item name="View the official Apache Streams jsonschema files" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-pojo/index.html" />
- <item name="View the schemas that describe twitter data" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/streams-provider-twitter/index.html" />
- <item name="Read about twitter / streams conversion" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/index.html" />
- <item name="Learn about utility streams components" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-components/index.html" />
- <item name="Learn about streams interoperability modules" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/index.html" />
+ <menu name="Learn More">
<item name="Browse streams providers, processors, and persisters" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/index.html" />
+ <item name="View the official Apache Streams jsonschema files" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-pojo/index.html" />
+ <item name="View java POJOs generated from the official Apache Streams jsonschema files" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/streams-pojo/apidocs/index.html" />
+ <item name="Check out some additional examples" href="http://streams.incubator.apache.org/site/latest/streams-examples/index.html" />
</menu>
<menu name="Other Resources">
- <item name="ActivityStreams Homepage" href="http://activitystrea.ms" />
- <item name="ActivityStreams Specifications" href="http://activitystrea.ms/specs/" />
- <item name="Streams Blog" href="http://blogs.apache.org/streams/" />
- <item name="Streams Proposal Wiki Page" href="http://wiki.apache.org/incubator/StreamsProposal" />
- </menu>
- <menu name="Foundation">
- <item name="Foundation Info" href="http://www.apache.org/" />
+ <item name="ActivityStreams Homepage" href="http://activitystrea.ms" />
+ <item name="ActivityStreams Specifications" href="http://activitystrea.ms/specs/" />
+ <item name="Streams Blog" href="http://blogs.apache.org/streams/" />
+ <item name="Streams Proposal Wiki Page" href="http://wiki.apache.org/incubator/StreamsProposal" />
+ <item name="Apache Foundation Info" href="http://www.apache.org/" />
<item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html" />
<item name="Thanks" href="http://www.apache.org/foundation/thanks.html" />
</menu>
</body>
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <navBarStyle>navbar-inverse</navBarStyle>
+ <sideBarEnabled>false</sideBarEnabled>
+ <gitHub>
+ <projectId>apache/incubator-streams-master</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>black</ribbonColor>
+ </gitHub>
+ <twitter>
+ <user>ApacheStreams</user>
+ <showUser>true</showUser>
+ <showFollowers>true</showFollowers>
+ </twitter>
+ </fluidoSkin>
+ </custom>
</project>
diff --git a/src/site/site_en.xml b/src/site/site_en.xml
index 5e6f85a..b534a59 100644
--- a/src/site/site_en.xml
+++ b/src/site/site_en.xml
@@ -17,20 +17,13 @@
~ under the License.
-->
<project>
- <publishDate position="right"/>
- <version position="right"/>
+ <publishDate position="bottom"/>
+ <version position="bottom"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</skin>
- <custom>
- <fluidoSkin>
- <topBarEnabled>true</topBarEnabled>
- <navBarStyle>navbar-inverse</navBarStyle>
- <sideBarEnabled>false</sideBarEnabled>
- </fluidoSkin>
- </custom>
<bannerLeft>
<name>Apache Streams</name>
<src>http://streams.incubator.apache.org/images/streams_logo.jpg</src>
@@ -48,8 +41,7 @@
<item name="Incubator" href="http://incubator.apache.org/"/>
<item name="Streams" href="http://streams.incubator.apache.org/"/>
</breadcrumbs>
- <menu ref="parent" inherit="top"/>
- <menu name="Overview">
+ <menu name="Overview" inherit="top">
<item name="Overview" href="index.html" />
<item name="Architecture" href="architecture.html" />
<item name="Concepts" href="concepts.html" />
@@ -71,7 +63,7 @@
<item name="Release Process" href="release.html" />
<item name="Website Management" href="website.html" />
</menu>
- <menu name="Projects">
+ <menu name="Projects" inherit="top">
<item name="streams-master" />
<item name="streams-project" href="http://streams.incubator.apache.org/site/latest/streams-project" />
<item name="streams-examples" href="http://streams.incubator.apache.org/site/latest/streams-examples/" />
@@ -82,26 +74,38 @@
<item name="Set up a local docker environment" href="tutorial/docker.html" />
<item name="Run a local database to store activity documents" href="tutorial/database.html" />
<item name="Run twitter-history-elasticsearch" href="http://streams.incubator.apache.org/site/latest/streams-examples/streams-examples-local/twitter-history-elasticsearch/index.html" />
- <item name="Browse and search the twitter data you collected" href="tutorial/browse.html" />
</menu>
- <menu name="Getting Started">
- <item name="View the official Apache Streams jsonschema files" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-pojo/index.html" />
- <item name="View the schemas that describe twitter data" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/streams-provider-twitter/index.html" />
- <item name="Read about twitter / streams conversion" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/index.html" />
- <item name="Learn about utility streams components" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-components/index.html" />
- <item name="Learn about streams interoperability modules" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/index.html" />
+ <menu name="Learn More">
<item name="Browse streams providers, processors, and persisters" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/index.html" />
+ <item name="View the official Apache Streams jsonschema files" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-pojo/index.html" />
+ <item name="View java POJOs generated from the official Apache Streams jsonschema files" href="http://streams.incubator.apache.org/site/latest/streams-project/streams-contrib/streams-pojo/apidocs/index.html" />
+ <item name="Check out some additional examples" href="http://streams.incubator.apache.org/site/latest/streams-examples/index.html" />
</menu>
<menu name="Other Resources">
<item name="ActivityStreams Homepage" href="http://activitystrea.ms" />
<item name="ActivityStreams Specifications" href="http://activitystrea.ms/specs/" />
<item name="Streams Blog" href="http://blogs.apache.org/streams/" />
<item name="Streams Proposal Wiki Page" href="http://wiki.apache.org/incubator/StreamsProposal" />
- </menu>
- <menu name="Foundation">
- <item name="Foundation Info" href="http://www.apache.org/" />
+ <item name="Apache Foundation Info" href="http://www.apache.org/" />
<item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html" />
<item name="Thanks" href="http://www.apache.org/foundation/thanks.html" />
</menu>
</body>
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <navBarStyle>navbar-inverse</navBarStyle>
+ <sideBarEnabled>false</sideBarEnabled>
+ <gitHub>
+ <projectId>apache/incubator-streams-master</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>black</ribbonColor>
+ </gitHub>
+ <twitter>
+ <user>ApacheStreams</user>
+ <showUser>true</showUser>
+ <showFollowers>true</showFollowers>
+ </twitter>
+ </fluidoSkin>
+ </custom>
</project>
