Author: mcgilman
Date: Tue May 5 18:44:41 2015
New Revision: 950195
Log:
preparing release of new site
Modified:
websites/staging/nifi/trunk/content/v2/developer-guide.html
websites/staging/nifi/trunk/content/v2/download.html
websites/staging/nifi/trunk/content/v2/faq.html
websites/staging/nifi/trunk/content/v2/images/flow.png
websites/staging/nifi/trunk/content/v2/index.html
websites/staging/nifi/trunk/content/v2/mailing_lists.html
websites/staging/nifi/trunk/content/v2/overview.html
websites/staging/nifi/trunk/content/v2/people.html
websites/staging/nifi/trunk/content/v2/quickstart.html
websites/staging/nifi/trunk/content/v2/release-guide.html
websites/staging/nifi/trunk/content/v2/screencasts.html
websites/staging/nifi/trunk/content/v2/user-guide.html
Modified: websites/staging/nifi/trunk/content/v2/developer-guide.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/developer-guide.html (original)
+++ websites/staging/nifi/trunk/content/v2/developer-guide.html Tue May 5
18:44:41 2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
@@ -93,7 +95,7 @@
<div class="external-guide">
- <iframe
src="https://nifi.incubator.apache.org/docs/nifi-docs/developer-guide.html";></iframe>
+ <iframe src="docs/developer-guide.html"></iframe>
</div>
<div class="row">
<div class="large-12 columns footer">
Modified: websites/staging/nifi/trunk/content/v2/download.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/download.html (original)
+++ websites/staging/nifi/trunk/content/v2/download.html Tue May 5 18:44:41
2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
@@ -113,6 +115,24 @@
<div class="large-12 columns">
<h2>Releases</h2>
<ul>
+ <li>0.0.2-incubating
+ <ul>
+ <li><a
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329373";>Release
Notes</a></li>
+ <li>
+ Sources:
+ <ul>
+ <li><a
href="https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-source-release.zip";>nifi-0.0.2-incubating-source-release.zip</a>
( <a
href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-source-release.zip.asc";>asc</a>,
<a
href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-source-release.zip.md5";>md5</a>,
<a
href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-source-release.zip.sha1";>sha1</a>
)</li>
+ </ul>
+ </li>
+ <li>
+ Binaries
+ <ul>
+ <li><a
href="https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.tar.gz";>nifi-0.0.2-incubating-bin.tar.gz</a>
( <a
href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.tar.gz.asc";>asc</a>,
<a
href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.tar.gz.md5";>md5</a>,
<a
href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.tar.gz.sha1";>sha1</a>
)</li>
+ <li><a
href="https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.zip";>nifi-0.0.2-incubating-bin.zip</a>
( <a
href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.zip.asc";>asc</a>,
<a
href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.zip.md5";>md5</a>,
<a
href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.zip.sha1";>sha1</a>
)</li>
+ </ul>
+ </li>
+ </ul>
+ </li>
<li>0.0.1-incubating
<ul>
<li><a
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329078";>Release
Notes</a></li>
Modified: websites/staging/nifi/trunk/content/v2/faq.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/faq.html (original)
+++ websites/staging/nifi/trunk/content/v2/faq.html Tue May 5 18:44:41 2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
Modified: websites/staging/nifi/trunk/content/v2/images/flow.png
==============================================================================
Binary files - no diff available.
Modified: websites/staging/nifi/trunk/content/v2/index.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/index.html (original)
+++ websites/staging/nifi/trunk/content/v2/index.html Tue May 5 18:44:41 2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
Modified: websites/staging/nifi/trunk/content/v2/mailing_lists.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/mailing_lists.html (original)
+++ websites/staging/nifi/trunk/content/v2/mailing_lists.html Tue May 5
18:44:41 2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
@@ -120,6 +122,13 @@
<th>Archive</th>
</tr>
<tr>
+ <td>Users Mailing List</td>
+ <td><a class="externalLink"
href="mailto:[email protected]";>Subscribe</a></td>
+ <td><a class="externalLink"
href="mailto:[email protected]";>Unsubscribe</a></td>
+ <td><a class="externalLink"
href="mailto:[email protected]";>Post</a></td>
+ <td><a class="externalLink"
href="http://mail-archives.apache.org/mod_mbox/incubator-nifi-users/";>mail-archives.apache.org</a></td>
+ </tr>
+ <tr>
<td>Developers Mailing List</td>
<td><a class="externalLink"
href="mailto:[email protected]";>Subscribe</a></td>
<td><a class="externalLink"
href="mailto:[email protected]";>Unsubscribe</a></td>
Modified: websites/staging/nifi/trunk/content/v2/overview.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/overview.html (original)
+++ websites/staging/nifi/trunk/content/v2/overview.html Tue May 5 18:44:41
2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
@@ -93,7 +95,7 @@
<div class="external-guide">
- <iframe
src="https://nifi.incubator.apache.org/docs/nifi-docs/overview.html";></iframe>
+ <iframe src="docs/overview.html"></iframe>
</div>
<div class="row">
<div class="large-12 columns footer">
Modified: websites/staging/nifi/trunk/content/v2/people.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/people.html (original)
+++ websites/staging/nifi/trunk/content/v2/people.html Tue May 5 18:44:41 2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
@@ -127,6 +129,11 @@
<th>Affiliation</th>
</tr>
<tr>
+ <td>aldrin</td>
+ <td>Aldrin Piri</td>
+ <td></td>
+ </tr>
+ <tr>
<td>apurtell</td>
<td>Andrew Purtell</td>
<td>Mentor</td>
@@ -204,27 +211,6 @@
</table>
</div>
</div>
-<div class="medium-space"></div>
-<div class="row">
- <div class="large-12 columns">
- <h2 class="nifi-txt">
- <span>
- Committers
- </span>
- </h2>
- </div>
-</div>
-<div class="row">
- <div class="large-12 columns">
- <table>
- <tr>
- <th>Id</th>
- <th>Name</th>
- </tr>
- </table>
- </div>
-</div>
-
<div class="row">
<div class="large-12 columns footer">
<div class="disclaimer">
Modified: websites/staging/nifi/trunk/content/v2/quickstart.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/quickstart.html (original)
+++ websites/staging/nifi/trunk/content/v2/quickstart.html Tue May 5 18:44:41
2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
@@ -95,13 +97,8 @@
<div class="large-12 columns">
<div class="large-space"></div>
<h1 id="apache-nifi-development-quickstart">Apache NiFi Development
Quickstart</h1>
-<p>This documentation is in progress, but should get many started at building
Apache NiFi.</p>
<h2 id="source-code">Source Code</h2>
-<p>Apache NiFi source code is version controlled using <a
href="http://git-scm.com/";>Git</a> version control (<a
href="https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=summary";>browse</a>|<a
href="http://git-wip-us.apache.org/repos/asf/incubator-nifi.git";>checkout</a>).
</p>
-<p>The code is also mirrored to <a
href="https://github.com/apache/incubator-nifi";>Github</a></p>
-<p>The code as it was initially contributed and entered the incubator is on
the 'master' branch.</p>
-<p>To view the lastest codebase as we work toward an initial release checkout
the 'develop' branch.</p>
-<p>All guidance that follows assumes you are working on the 'develop'
branch.</p>
+<p>Apache NiFi source code is version controlled using <a
href="http://git-scm.com/";>Git</a> version control (<a
href="https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=summary";>browse</a>|<a
href="http://git-wip-us.apache.org/repos/asf/incubator-nifi.git";>checkout</a>).<br>The
code is also mirrored to <a
href="https://github.com/apache/incubator-nifi";>Github</a></p>
<h2 id="issue-tracking">Issue Tracking</h2>
<p>Track issues on the "NIFI" Project on the Apache Jira (<a
href="https://issues.apache.org/jira/browse/NIFI";>browse</a>).</p>
<h2 id="building">Building</h2>
@@ -116,7 +113,13 @@ Then checkout the 'develop' bran
<ol>
<li>You need a recent Java 7 (or newer) JDK.</li>
<li>You need Apache <a href="http://maven.apache.org/";>Maven 3.X</a>.
We've successfully used 3.2.3 and as far back as 3.0.5</li>
-<li>Build the maven plugins. In the root dir of the source tree cd to
<code>nifi-nar-maven-plugin</code>.
+<li>Ensure your MAVEN_OPTS provides sufficient memory. Some build steps are
fairly memory intensive<ul>
+<li>These settings have worked well <code>MAVEN_OPTS="-Xms1024m -Xmx3076m
-XX:MaxPermSize=256m"</code></li>
+</ul>
+</li>
+<li>Build the nifi parent. In the root dir of the source tree cd to
<code>nifi-parent</code>.
+Run <code>mvn clean install</code></li>
+<li>Build the nifi nar maven plugin. In the root dir of the source tree cd to
<code>nifi-nar-maven-plugin</code>.
Run <code>mvn clean install</code></li>
<li>Build the entire code base. In the root dir of the source tree cd to
<code>nifi</code> and run <code>mvn -T C2.0 clean install</code>
You can tweak the maven build settings as you like but the previous command
will execute with 2 threads per core.</li>
Modified: websites/staging/nifi/trunk/content/v2/release-guide.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/release-guide.html (original)
+++ websites/staging/nifi/trunk/content/v2/release-guide.html Tue May 5
18:44:41 2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
@@ -144,7 +146,7 @@ when evaluating a release for a vote.</p
</li>
<li>Evaluate the sources and dependencies. Does the overall LICENSE and
NOTICE appear correct? Do all licenses fit within the ASF approved
licenses?<ul>
<li>Here is an example path to a sources artifact: <ul>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip</code></li>
+<li><code>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</code></li>
</ul>
</li>
</ul>
@@ -155,21 +157,19 @@ when evaluating a release for a vote.</p
</li>
<li>Are the signatures and hashes correct for the source release?<ul>
<li>Validate the hashes of the sources artifact do in fact match:<ul>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.md5</code></li>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.sha1</code></li>
+<li><code>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</code></li>
+<li><code>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</code></li>
</ul>
</li>
-<li>Validate the signatures of the sources artifact and of each of the hashes.
Here are example paths:<ul>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.asc</code></li>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.asc.md5</code></li>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.asc.sha1</code></li>
+<li>Validate the signature of the source artifact. Here is an example
path:<ul>
+<li><code>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</code></li>
<li>Need a quick reminder on how to <a
href="http://www.apache.org/dev/release-signing.html#verifying-signature";>verify
a signature</a>?</li>
</ul>
</li>
</ul>
</li>
<li>Do all sources have necessary headers?<ul>
-<li>Unzip the sources file into a directory and execute <code>mvn install
-Pcheck-licenses</code></li>
+<li>Unzip the sources file into a directory and execute <code>mvn install
-Pcontrib-check</code></li>
</ul>
</li>
<li>Are there no unexpected binary files in the release?<ul>
@@ -199,8 +199,8 @@ Create a JIRA ticket for the release tas
have in mind the release version you are planning for. For example we'll
consider '0.0.1-incubating'.</p>
<p>Create the next version in JIRA if necessary so develop work can continue
towards that release.</p>
<p>Create new branch off develop named after the JIRA ticket or just use the
develop branch itself. Here we'll use a branch off of develop with
-<code>git checkout -b NIFI-270</code></p>
-<p>Change directory into that of the project you wish to release. For example
either <code>cd nifi</code> or <code>cd nifi-nar-maven-plugin</code></p>
+<code>git checkout -b NIFI-270-RC1</code></p>
+<p>Change directory into that of the project you wish to release. For example
<code>cd nifi</code></p>
<p>Verify that Maven has sufficient heap space to perform the build tasks.
Some plugins and parts of the build
consumes a surprisingly large amount of space. These settings have been shown
to
work <code>MAVEN_OPTS="-Xms1024m -Xmx3076m
-XX:MaxPermSize=256m"</code></p>
@@ -225,21 +225,21 @@ work <code>MAVEN_OPTS="-Xms1024m -X
...</code></pre>
<p>Ensure the the full application build and tests all work by executing
<code>mvn -T 2.5C clean install</code> for a parallel build. Once that
completes you can
-startup and test the application by <code>cd assembly/target</code> then run
<code>bin/nifi.sh start</code> in the nifi build.
+startup and test the application by <code>cd nifi-assembly/target</code> then
run <code>bin/nifi.sh start</code> in the nifi build.
The application should be up and running in a few seconds at
<code>http://localhost:8080/nifi</code></p>
-<p>Evaluate and ensure the appropriate license headers are present on all
source files. Ensure LICENSE and NOTICE files are complete and
accurate.<br>Developers should always be keeping these up to date as they go
along adding source and modifying dependencies to keep this burden
manageable.<br>This command <code>mvn install -Pcheck-licenses</code> should be
run as well to help validate. If that doesn't complete cleanly it must be
addressed.</p>
-<p>Now its time to have maven prepare the release so execute <code>mvn
release:prepare -Psigned_release -DscmCommentPrefix="NIFI-270 "
-Darguments="-DskipTests"</code>.
+<p>Evaluate and ensure the appropriate license headers are present on all
source files. Ensure LICENSE and NOTICE files are complete and
accurate.<br>Developers should always be keeping these up to date as they go
along adding source and modifying dependencies to keep this burden
manageable.<br>This command <code>mvn install -Pcontrib-check</code> should be
run as well to help validate. If that doesn't complete cleanly it must be
addressed.</p>
+<p>Now its time to have maven prepare the release so execute <code>mvn
release:prepare -Psigned_release -DscmCommentPrefix="NIFI-270-RC1 "
-Darguments="-DskipTests"</code>.
Maven will ask:</p>
-<p><code>What is the release version for "Apache NiFi NAR Plugin"?
(org.apache.nifi:nifi-nar-maven-plugin) 0.0.1-incubating: :</code></p>
+<p><code>What is the release version for "Apache NiFi"?
(org.apache.nifi:nifi) 0.0.1-incubating: :</code></p>
<p>Just hit enter to accept the default.</p>
<p>Maven will then ask:</p>
-<p><code>What is SCM release tag or label for "Apache NiFi NAR
Plugin"? (org.apache.nifi:nifi-nar-maven-plugin)
nifi-nar-maven-plugin-0.0.1-incubating: :</code></p>
-<p>Enter <code>nifi-nar-maven-plugin-0.0.1-incubating-RC1</code> or whatever
the appropriate release candidate (RC) number is.
+<p><code>What is SCM release tag or label for "Apache NiFi"?
(org.apache.nifi:nifi) nifi-0.0.1-incubating: :</code></p>
+<p>Enter <code>nifi-0.0.1-incubating-RC1</code> or whatever the appropriate
release candidate (RC) number is.
Maven will then ask:</p>
-<p><code>What is the new development version for "Apache NiFi NAR
Plugin"? (org.apache.nifi:nifi-nifi-nar-maven-plugin)
0.0.2-incubating-SNAPSHOT: :</code></p>
+<p><code>What is the new development version for "Apache NiFi"?
(org.apache.nifi:nifi) 0.0.2-incubating-SNAPSHOT: :</code></p>
<p>Just hit enter to accept the default.</p>
<p>Now that preparation went perfectly it is time to perform the release and
deploy artifacts to staging. To do that execute</p>
-<p><code>mvn release:perform -Psigned_release
-DscmCommentPrefix="NIFI-270 "
-Darguments="-DskipTests"</code></p>
+<p><code>mvn release:perform -Psigned_release
-DscmCommentPrefix="NIFI-270-RC1 "
-Darguments="-DskipTests"</code></p>
<p>That will complete successfully and this means the artifacts have been
released to the Apache Nexus staging repository. You will see something
like</p>
<p><code>[INFO] * Closing staging repository with ID
"orgapachenifi-1011".</code></p>
<p>So if you browse to
<code>https://repository.apache.org/#stagingRepositories</code> login with your
Apache committer credentials and you should see
<code>orgapachenifi-1011</code>. If you click on that you can inspect the
various staged artifacts.</p>
@@ -253,25 +253,31 @@ Maven will then ask:</p>
<li>Validate that the README is present and provides sufficient information to
build and if necessary execute.</li>
</ul>
<p>If all looks good then push the branch to origin <code>git push origin
NIFI-270</code></p>
+<p>If it is intended that convenience binaries will be provided for this
release then the community has requested that
+a copy it be made available for reviewing of the release candidate. The
convenience binary, its hashes, and signature
+ should be placed here:</p>
+<ul>
+<li><a
href="https://dist.apache.org/repos/dist/dev/incubator/nifi";>https://dist.apache.org/repos/dist/dev/incubator/nifi</a></li>
+</ul>
<p>If anything isn't correct about the staged artifacts you can drop the
staged repo from repository.apache.org and delete the
local tag in git. If you also delete the local branch and clear your local
maven repository under org/apache/nifi then it is
as if the release never happened. Before doing that though try to figure out
what went wrong. So as described here you see
that you can pretty easily test the release process until you get it right.
The <code>mvn versions:set</code> and <code>mvn versions:commit</code>
commands can come in handy to help do this so you can set versions to
something clearly release test related.</p>
<p>Now it's time to initiate a vote within the PPMC. Send the vote
request to <code>[email protected]</code>
-with a subject of <code>[VOTE] Release Apache NiFi
nifi-nar-maven-plugin-0.0.1-incubating</code>. The following template can be
used:</p>
+with a subject of <code>[VOTE] Release Apache NiFi 0.0.1-incubating</code>.
The following template can be used:</p>
<pre><code>Hello
I am pleased to be calling this vote for the source release of Apache NiFi
-nifi-nar-maven-plugin-0.0.1-incubating.
+nifi-0.0.1-incubating.
The source zip, including signatures, digests, etc. can be found at:
https://repository.apache.org/content/repositories/orgapachenifi-1011
-The Git tag is nifi-nar-maven-plugin-0.0.1-incubating-RC1
+The Git tag is nifi-0.0.1-incubating-RC1
The Git commit ID is 72abf18c2e045e9ef404050e2bffc9cef67d2558
https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=72abf18c2e045e9ef404050e2bffc9cef67d2558
-Checksums of nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip:
+Checksums of nifi-0.0.1-incubating-source-release.zip:
MD5: 5a580756a17b0573efa3070c70585698
SHA1: a79ff8fd0d2f81523b675e4c69a7656160ff1214
@@ -287,16 +293,16 @@ https://issues.apache.org/jira/secure/Re
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 nifi-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...</code></pre>
<p><br/>
-A release vote is majority rule. So wait 72 hours and see if there are at
least 3 binding +1 votes and no more negative votes than positive.
+A release vote is majority rule. So wait 72 hours and see if there are at
least 3 binding (in the PPMC sense of binding) +1 votes and no more negative
votes than positive.
If so forward the vote to the IPMC. Send the vote request to
<code>[email protected]</code> with a subject of
-<code>[VOTE] Release Apache NiFi
nifi-nar-maven-plugin-0.0.1-incubating</code>. The following template can be
used:</p>
+<code>[VOTE] Release Apache NiFi 0.0.1-incubating</code>. The following
template can be used:</p>
<pre><code>Hello
-The Apache NiFi PPMC has voted to release Apache NiFi
nar-maven-plugin-0.0.1-incubating.
+The Apache NiFi PPMC has voted to release Apache NiFi 0.0.1-incubating.
The vote was based on the release candidate and thread described below.
We now request the IPMC to vote on this release.
@@ -309,11 +315,11 @@ Here is the PPMC vote thread: [URL TO PP
The source zip, including signatures, digests, etc. can be found at:
https://repository.apache.org/content/repositories/orgapachenifi-1011
-The Git tag is nar-maven-plugin-0.0.1-incubating-RC1
+The Git tag is nifi-0.0.1-incubating-RC1
The Git commit ID is 72abf18c2e045e9ef404050e2bffc9cef67d2558
https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=72abf18c2e045e9ef404050e2bffc9cef67d2558
-Checksums of nar-maven-plugin-0.0.1-incubating-source-release.zip:
+Checksums of nifi-0.0.1-incubating-source-release.zip:
MD5: 5a580756a17b0573efa3070c70585698
SHA1: a79ff8fd0d2f81523b675e4c69a7656160ff1214
@@ -329,12 +335,12 @@ https://issues.apache.org/jira/secure/Re
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...</code></pre>
<p><br/>
Wait 72 hours. If the vote passes then send a vote result email. Send the
email to <code>[email protected],
[email protected]</code>
-with a subject of <code>[RESULT][VOTE] Release Apache NiFi
nar-maven-plugin-0.0.1-incubating</code>. Use a template such as:</p>
+with a subject of <code>[RESULT][VOTE] Release Apache NiFi
0.0.1-incubating</code>. Use a template such as:</p>
<pre><code>Hello
The release passes with
@@ -346,9 +352,67 @@ Thanks to all who helped make this relea
Here is the IPMC vote thread: [INSERT URL OF IPMC Vote Thread]</code></pre>
<p><br/>
-Now all the voting is done and the release is good to go. In
repository.apache.org go to the staging repository
-and select <code>release</code>. Then publish the source, hashes, and
signatures to
<code>https://dist.apache.org/repos/dist/release/incubator/nifi/</code>
-Then merge the release git tag to develop and to master.</p>
+Now all the voting is done and the release is good to go.</p>
+<p>Here are the steps of the release once the release is approved:</p>
+<ol>
+<li><p>Upload source-release artifacts to dist. If the release version is
0.0.1-incubating then upload them (zip, asc, md5, sha1) to
+<code>https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating</code></p>
+</li>
+<li><p>To produce binary convenience release build the application from the
raw source in staging. For each binary convenience artifact: </p>
+<ul>
+<li>Generate ascii armored detached signature by running <code>gpg -a -b
nifi-0.0.1-incubating-bin.tar.gz</code></li>
+<li>Generate md5 hash summary by running <code>md5sum
nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,32)}' >
nifi-0.0.1-incubating-bin.tar.gz.md5</code></li>
+<li>Generate sha1 hash summary by running <code>sha1sum
nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,40)}' >
nifi-0.0.1-incubating-bin.tar.gz.sha1</code></li>
+<li>Upload the bin, asc, sha1, md5 for each binary convenience build to the
same location as the source release</li>
+</ul>
+</li>
+<li><p>In repository.apache.org go to the staging repository and select
<code>release</code> and follow instructions on the site.</p>
+</li>
+<li><p>Merge the release branch into master</p>
+</li>
+<li><p>Merge the release branch into develop</p>
+</li>
+<li><p>Update the NiFi website to point to the new download(s)</p>
+</li>
+<li><p>Update the NiFi incubator status page to indicate NEWS of the
release</p>
+</li>
+<li><p>In Jira mark the release version as 'Released' and
'Archived' through 'version' management in the
'administration' console.</p>
+</li>
+<li><p>Wait 24 hours then send release announcement.</p>
+<ul>
+<li>See <a
href="http://www.apache.org/dev/release.html#release-announcements";>here</a>
for an understanding of why you need to wait 24 hours</li>
+<li>Then create an announcement like the one shown below addressed to
'[email protected], [email protected],
[email protected]' with a reply-to of
'[email protected]'. </li>
+<li>The email has to be sent from an apache.org email address and should be by
the release manager of the build.</li>
+</ul>
+</li>
+</ol>
+<pre><code>SUBJECT: [ANNOUNCE] Apache NiFi 0.0.2-incubating release
+BODY:
+Hello
+
+The Apache NiFi team would like to announce the release of Apache NiFi
0.0.2-incubating.
+
+Apache NiFi is an easy to use, powerful, and reliable system to process and
distribute data. Apache NiFi was made for dataflow. It supports highly
configurable directed graphs of data routing, transformation, and system
mediation logic.
+
+More details on Apache NiFi can be found here:
+http://nifi.incubator.apache.org/
+
+The release artifacts can be downloaded from here:
+http://nifi.incubator.apache.org/downloads/
+
+Maven artifacts have been made available here:
+https://repository.apache.org/content/repositories/releases/org/apache/nifi/
+
+Release notes available here:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329373
+
+Thank you
+The Apache NiFi team
+
+----
+DISCLAIMER
+
+Apache NiFi is an effort undergoing incubation at The Apache Software
Foundation (ASF), sponsored by Apache Incubator. Incubation is required of all
newly accepted projects until a further review indicates that the
infrastructure, communications, and decision making process have stabilized in
a manner consistent with other successful ASF projects. While incubation status
is not necessarily a reflection of the completeness or stability of the code,
it does indicate that the project has yet to be fully endorsed by the
ASF.</code></pre>
</div>
</div>
Modified: websites/staging/nifi/trunk/content/v2/screencasts.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/screencasts.html (original)
+++ websites/staging/nifi/trunk/content/v2/screencasts.html Tue May 5 18:44:41
2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
@@ -105,7 +107,25 @@
<div id="toolbar-overview" class="reveal-modal medium" data-reveal>
<h2>NiFi Toolbar Overview</h2>
<div class="flex-video widescreen" style="display: block;">
- <iframe width="560" height="315"
src="https://www.youtube.com/embed/LGXRAVUzL4U"; frameborder="0"
allowfullscreen></iframe>
+ <iframe width="560" height="315"
src="https://www.youtube.com/embed/LGXRAVUzL4U?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG";
frameborder="0" allowfullscreen></iframe>
+ </div>
+ <a class="close-reveal-modal">×</a>
+ </div>
+ <br/>
+ <a href="#" data-reveal-id="build-a-flow-1">Build a Simple Flow - Part
1</a>
+ <div id="build-a-flow-1" class="reveal-modal medium" data-reveal>
+ <h2>Build a Simple Flow - Part 1</h2>
+ <div class="flex-video widescreen" style="display: block;">
+ <iframe width="560" height="315"
src="https://www.youtube.com/embed/jctMMHTdTQI?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG";
frameborder="0" allowfullscreen></iframe>
+ </div>
+ <a class="close-reveal-modal">×</a>
+ </div>
+ <br/>
+ <a href="#" data-reveal-id="build-a-flow-2">Build a Simple Flow - Part
2</a>
+ <div id="build-a-flow-2" class="reveal-modal medium" data-reveal>
+ <h2>Build a Simple Flow - Part 2</h2>
+ <div class="flex-video widescreen" style="display: block;">
+ <iframe width="560" height="315"
src="https://www.youtube.com/embed/X6bPFgaBDIo?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG";
frameborder="0" allowfullscreen></iframe>
</div>
<a class="close-reveal-modal">×</a>
</div>
@@ -114,7 +134,7 @@
<div id="creating-process-groups" class="reveal-modal medium"
data-reveal>
<h2>Creating Process Groups</h2>
<div class="flex-video widescreen" style="display: block;">
- <iframe width="560" height="315"
src="https://www.youtube.com/embed/hAveiDgDj-8"; frameborder="0"
allowfullscreen></iframe>
+ <iframe width="560" height="315"
src="https://www.youtube.com/embed/hAveiDgDj-8?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG";
frameborder="0" allowfullscreen></iframe>
</div>
<a class="close-reveal-modal">×</a>
</div>
@@ -123,7 +143,25 @@
<div id="creating-templates" class="reveal-modal medium" data-reveal>
<h2>Creating Templates</h2>
<div class="flex-video widescreen" style="display: block;">
- <iframe width="560" height="315"
src="https://www.youtube.com/embed/PpmL-IMoCnU"; frameborder="0"
allowfullscreen></iframe>
+ <iframe width="560" height="315"
src="https://www.youtube.com/embed/PpmL-IMoCnU?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG";
frameborder="0" allowfullscreen></iframe>
+ </div>
+ <a class="close-reveal-modal">×</a>
+ </div>
+ <br/>
+ <a href="#" data-reveal-id="summary-overview">Summary Overview</a>
+ <div id="summary-overview" class="reveal-modal medium" data-reveal>
+ <h2>Summary Overview</h2>
+ <div class="flex-video widescreen" style="display: block;">
+ <iframe width="560" height="315"
src="https://www.youtube.com/embed/XfY9AEOYLHI?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG";
frameborder="0" allowfullscreen></iframe>
+ </div>
+ <a class="close-reveal-modal">×</a>
+ </div>
+ <br/>
+ <a href="#" data-reveal-id="provenance-overview">Provenance
Overview</a>
+ <div id="provenance-overview" class="reveal-modal medium" data-reveal>
+ <h2>Summary Page Overview</h2>
+ <div class="flex-video widescreen" style="display: block;">
+ <iframe width="560" height="315"
src="https://www.youtube.com/embed/WUKXed_bLws?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG";
frameborder="0" allowfullscreen></iframe>
</div>
<a class="close-reveal-modal">×</a>
</div>
@@ -132,10 +170,11 @@
<div id="managing-templates" class="reveal-modal medium" data-reveal>
<h2>Managing Templates</h2>
<div class="flex-video widescreen" style="display: block;">
- <iframe width="560" height="315"
src="https://www.youtube.com/embed/HU5_3PlNmtQ"; frameborder="0"
allowfullscreen></iframe>
+ <iframe width="560" height="315"
src="https://www.youtube.com/embed/HU5_3PlNmtQ?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG";
frameborder="0" allowfullscreen></iframe>
</div>
<a class="close-reveal-modal">×</a>
</div>
+ <br/>
</div>
</div>
<div class="row">
Modified: websites/staging/nifi/trunk/content/v2/user-guide.html
==============================================================================
--- websites/staging/nifi/trunk/content/v2/user-guide.html (original)
+++ websites/staging/nifi/trunk/content/v2/user-guide.html Tue May 5 18:44:41
2015
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
<div class="sticky contain-to-grid">
@@ -41,7 +41,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/";><i
class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a
href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa fa-external-link
external-link"></i>License</a></li>
</ul>
</li>
@@ -53,6 +52,7 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer
Guide</a></li>
+ <li><a href="administrator-guide.html">Admin
Guide</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -73,6 +73,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing
Guide</a></li>
+ <li><a href="developer-guide.html">Developer
Guide</a></li>
<li><a
href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git";><i class="fa
fa-external-link external-link"></i>Source</a></li>
<li><a
href="https://issues.apache.org/jira/browse/NIFI";><i class="fa fa-external-link
external-link"></i>Issues</a></li>
</ul>
@@ -93,7 +95,7 @@
<div class="external-guide">
- <iframe
src="https://nifi.incubator.apache.org/docs/nifi-docs/user-guide.html";></iframe>
+ <iframe src="docs/user-guide.html"></iframe>
</div>
<div class="row">
<div class="large-12 columns footer">
