You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/22 21:23:49 UTC
[01/10] incubator-nifi git commit: NIFI-182: - Updating to
accommodate for new format in generated documentation.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 0d8da145b -> 62965770d
NIFI-182:
- Updating to accommodate for new format in generated documentation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3d0766b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3d0766b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3d0766b9
Branch: refs/heads/develop
Commit: 3d0766b9f5f131f456933f695c3db2c888fbca60
Parents: b87b753
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Dec 18 14:10:02 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Dec 18 14:10:02 2014 -0500
----------------------------------------------------------------------
.../framework/web/nifi-web-api/pom.xml | 2 +-
.../nifi-web-api/src/main/enunciate/default.css | 266 -------------------
.../src/main/enunciate/enunciate.xml | 4 +-
.../src/main/enunciate/images/bg.png | Bin 0 -> 99 bytes
.../src/main/enunciate/images/bgcode.gif | Bin 56 -> 0 bytes
.../src/main/enunciate/images/bgcontainer.png | Bin 386 -> 0 bytes
.../src/main/enunciate/images/bgul.gif | Bin 304 -> 0 bytes
.../src/main/enunciate/images/header.png | Bin 51928 -> 0 bytes
.../src/main/enunciate/images/home.png | Bin 0 -> 144 bytes
.../src/main/enunciate/images/li.png | Bin 191 -> 0 bytes
.../src/main/enunciate/images/quote.gif | Bin 228 -> 0 bytes
.../src/main/enunciate/images/search.gif | Bin 680 -> 0 bytes
.../src/main/enunciate/override.css | 150 +++++++++++
.../framework/web/nifi-web-ui/pom.xml | 2 +-
14 files changed, 155 insertions(+), 269 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
index e7cb0e7..d3fb248 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-api</artifactId>
<packaging>war</packaging>
- <name>NiFi Web Rest Api</name>
+ <name>NiFi Rest Api</name>
<profiles>
<profile>
<id>docs</id>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/default.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/default.css b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/default.css
deleted file mode 100755
index ccfd321..0000000
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/default.css
+++ /dev/null
@@ -1,266 +0,0 @@
-/*#############################################################
-Name: Transparentia
-Date: 2006-08-20
-Description: Simple, lightweight and slightly blue.
-Author: Viktor Persson
-URL: http://templates.arcsin.se
-
-Feel free to use and modify but please provide credits.
-#############################################################*/
-
-/* standard elements */
-* {
- margin: 0;
- padding: 0;
-}
-
-a {
- color: #496878;
-}
-
-a:hover {
- color: #6a90a4;
-}
-
-body {
- background-color: #DFE8EC;
- color: #444;
- font: normal 62.5% "Lucida Sans Unicode",sans-serif;
- margin: 0;
-}
-
-input {
- color: #555;
- font: normal 1.1em "Lucida Sans Unicode",sans-serif;
-}
-
-p, cite, code, ul {
- font-size: 12px;
- padding-bottom: 1.2em;
-}
-
-h1 {
- font-size: 1.4em;
- margin-bottom: 4px;
-}
-
-h2 {
- font-size: 1.2em;
-}
-
-code {
- background: url(img/bgcode.gif);
- border: 1px solid #F0F0F0;
- border-left: 6px solid #39F;
- color: #555;
- display: block;
- font: normal 1.1em "Lucida Sans Unicode",serif;
- margin-bottom: 12px;
- padding: 8px 10px;
- white-space: pre;
-}
-
-cite {
- background: url(img/quote.gif) no-repeat;
- color: #666;
- display: block;
- font: normal 1.3em "Lucida Sans Unicode",serif;
- padding-left: 28px;
-}
-
-h1, h2, h3 {
- color: #294c58;
- padding-top: 6px;
-}
-
-/* misc */
-.clearer {
- clear: both;
-}
-
-.deprecated {
- color: red;
-}
-
-.errortext {
- color: red;
- padding: 6px 12px;
- font-variant:small-caps;
-}
-
-/* structure */
-.container {
- background: url(img/bgcontainer.png) repeat-y;
- margin: 0 auto;
- padding-bottom: 6px;
- width: 767px;
-}
-
-.header {
- background: url(img/header.png) no-repeat;
-}
-
-/* title */
-.title h1 {
- font: normal 3em Verdana,sans-serif;
- height: 150px;
- line-height: 150px;
- margin-bottom: 8px;
- text-align: center;
- position: relative;
- left: -5000px;
-}
-
-/* main */
-.main {
- clear: both;
- padding: 8px 18px;
-}
-
-/* main left */
-.sidenav h1, .sidenav ul {
- padding-left: 12px;
-}
-
-.sidenav {
- background: #EEE;
- border: 1px solid #E5E5E5;
- float: left;
- width: 200px;
-}
-
-.sidenav h1 {
- color: #666;
- font-size: 1.2em;
- /*height: 20px;*/
- margin-top: 1.2em;
-}
-
-.sidenav ul {
- border-top: 1px solid #FAFAFA;
- background: url(img/bgul.gif) repeat-x;
- margin: 0;
- padding: 0;
-}
-
-.sidenav li {
- border: 1px solid #FAFAFA;
- border-top: none;
- list-style: none;
- margin: 0;
-}
-
-.sidenav li a {
- color: #777;
- display: block;
- font-size: 0.9em;
- padding: 3px 6px 3px 14px;
- text-decoration: none;
-}
-
-.sidenav li a:hover {
- color: #111;
-}
-
-/* content */
-.content {
- float: right;
- width: 520px;
-}
-
-.content .item {
- padding: 6px 12px;
- background: #FFF;
- margin-bottom: 8px;
-}
-
-.content .descr {
- color: #333;
-}
-
-.content li {
- list-style: url(img/li.png);
- margin-left: 18px;
-}
-
-.content table {
- background: url(img/bgcode.gif);
- border: 1px solid #F0F0F0;
- border-left: 6px solid #6a90a4;
- color: #555;
- display: block;
- font: normal 1.1em "Lucida Sans Unicode",serif;
- margin-bottom: 12px;
- padding: 8px 10px;
-}
-
-.content table tr td {
- vertical-align:top;
- text-align:left;
- padding: 3px 3px 3px 3px;
-}
-
-.content table tr th {
- vertical-align:top;
- text-align:left;
- padding: 3px 3px 3px 3px;
-}
-
-.content h1 {
- /* text-decoration:underline;*/
-}
-
-.content h1 a {
- color: #333;
-}
-
-/* footer */
-.footer {
- background: #FFF;
- color: #999;
- font-size: 1.1em;
- margin: 0 auto;
- text-align: center;
- padding: 6px;
- width: 720px;
-}
-
-.footer a {
- color: #666;
- text-decoration: none;
-}
-
-.footer a:hover {
- color: #999;
- text-decoration: underline;
-}
-
-/* widecontent (content with no sidenav) */
-.widecontent {
- background: #FFF;
- border: 1px solid #EEE;
- color: #666;
- font-size: 1.1em;
- margin: 0 auto;
- padding: 6px;
- width: 720px;
-}
-
-.widecontent a {
- color: #36C;
- text-decoration: none;
-}
-
-.widecontent a:hover {
- color: #06F;
- text-decoration: underline;
-}
-
-.widecontent h1 {
- padding: 6px 12px;
- text-decoration:underline;
-}
-
-.widecontent form {
- padding: 6px 12px;
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml
index 781e6b1..daaa553 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/enunciate.xml
@@ -29,6 +29,8 @@
<xfire-client disabled="true"/>
<rest disabled="true"/>
<jersey useSubcontext="false" usePathBasedConneg="false"/>
- <docs splashPackage="org.apache.nifi.web.api" includeDefaultDownloads="false" css="default.css"/>
+ <docs splashPackage="org.apache.nifi.web.api" includeDefaultDownloads="false">
+ <additional-css file="override.css"/>
+ </docs>
</modules>
</enunciate>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png
new file mode 100644
index 0000000..fda98e5
Binary files /dev/null and b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcode.gif
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcode.gif b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcode.gif
deleted file mode 100755
index 6f99682..0000000
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcode.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcontainer.png
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcontainer.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcontainer.png
deleted file mode 100755
index 5b34fda..0000000
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgcontainer.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgul.gif
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgul.gif b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgul.gif
deleted file mode 100755
index ff689c8..0000000
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bgul.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/header.png
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/header.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/header.png
deleted file mode 100755
index 3383d33..0000000
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/header.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png
new file mode 100644
index 0000000..be12052
Binary files /dev/null and b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/li.png
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/li.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/li.png
deleted file mode 100755
index 3acc106..0000000
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/li.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/quote.gif
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/quote.gif b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/quote.gif
deleted file mode 100755
index fa145bb..0000000
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/quote.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/search.gif
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/search.gif b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/search.gif
deleted file mode 100755
index ed55341..0000000
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/search.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
new file mode 100644
index 0000000..5e839c5
--- /dev/null
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
@@ -0,0 +1,150 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+#site-name {
+ padding-left: 0;
+}
+
+#site-name a {
+ /*font-variant: normal !important;*/
+ letter-spacing: 1px;
+}
+
+#primary {
+ padding-right: 0;
+}
+
+#primary li:hover {
+ border-bottom: 6px solid #7098ad;
+}
+
+.xbreadcrumbs {
+ background-color: #7098ad !important;
+ color: #fff !important;
+}
+
+.xbreadcrumbs li {
+ /*padding: 10px 15px 10px 10px !important;*/
+}
+
+.xbreadcrumbs li a, .xbreadcrumbs li.current a {
+ font-size: 13px !important;
+ color: #fff !important;
+}
+
+.xbreadcrumbs li a.home {
+ background: url(img/home.png) no-repeat left center;
+}
+
+.xbreadcrumbs li ul {
+ top: 26px !important;
+ background-color: #e3ebee !important;
+}
+
+.xbreadcrumbs li ul li a, .xbreadcrumbs li.current ul li a {
+ color: #444 !important;
+}
+
+.home {
+ background-color: #dfe8ec;
+ color: #444;
+}
+
+a {
+ color: #496878;
+}
+
+a:hover {
+ color: #6a90a4;
+}
+
+.container {
+ width: 940px !important;
+ border-left: 2px solid #efefef;
+ border-right: 2px solid #efefef;
+ padding: 0 10px;
+ background-color: #fff;
+}
+
+#main h2, #main h3 {
+ border-width: 0;
+}
+
+#main p.note {
+ background: url(img/bg.png);
+ border: 1px solid #eee;
+ border-left: 4px solid #eee;
+ color: #666;
+ display: block;
+ margin-bottom: 12px;
+ padding: 5px 8px;
+}
+
+/* tables */
+
+table {
+ background: url(img/bg.png);
+ border: 1px solid #eee;
+ border-left: 4px solid #eee;
+ color: #666;
+ display: block;
+ margin-bottom: 12px;
+ padding: 5px 8px;
+}
+
+table tbody tr td {
+ font-size: 14px;
+ vertical-align:top;
+ text-align:left;
+ padding: 4px;
+ border-width: 0;
+}
+
+table tbody tr th {
+ font-size: 16px;
+ vertical-align:top;
+ text-align:left;
+ padding: 4px;
+ border-width: 0;
+}
+
+/* code */
+
+code {
+ font-size: 14px;
+ background: url(img/bg.png);
+ border: 1px solid #eee;
+ border-left: 4px solid #eee;
+ color: #666;
+ margin-bottom: 10px;
+ padding: 5px 8px;
+ white-space: pre;
+}
+
+/* footer */
+
+#footer {
+ border-top: 3px solid #eee;
+}
+
+/* width */
+
+.span-18 {
+ width: 916px !important;
+}
+
+.span-20 {
+ width: 935px !important;
+}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3d0766b9/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml
index c4471a1..69e306d 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
<packaging>war</packaging>
- <name>NiFi Web UI</name>
+ <name>NiFi UI</name>
<properties>
<staging.dir>${project.build.directory}/tmp</staging.dir>
<canvas.filter>canvas.properties</canvas.filter>
[04/10] incubator-nifi git commit: Merge branch 'develop' into
NIFI-182
Posted by mc...@apache.org.
Merge branch 'develop' into NIFI-182
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/24372962
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/24372962
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/24372962
Branch: refs/heads/develop
Commit: 24372962aa823498cf740e44f784ddd90477f428
Parents: 5e6de84 0d8da14
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 22 06:58:39 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 22 06:58:39 2014 -0500
----------------------------------------------------------------------
LICENSE | 384 +++++++++
NOTICE | 7 +
README.md | 32 +-
assembly/pom.xml | 199 ++---
assembly/src/main/assembly/dependencies.xml | 34 +-
commons/core-flowfile-attributes/pom.xml | 29 -
.../flowfile/attributes/CoreAttributes.java | 72 --
.../attributes/FlowFileAttributeKey.java | 21 -
commons/data-provenance-utils/pom.xml | 2 +-
commons/naive-search-ring-buffer/pom.xml | 30 -
.../apache/nifi/util/NaiveSearchRingBuffer.java | 135 ----
.../nifi/util/TestNaiveSearchRingBuffer.java | 72 --
commons/nifi-file-utils/pom.xml | 35 -
.../java/org/apache/nifi/file/FileUtils.java | 612 ---------------
commons/nifi-stream-utils/.gitignore | 1 -
commons/nifi-stream-utils/pom.xml | 30 -
.../org/apache/nifi/io/BufferedInputStream.java | 37 -
.../apache/nifi/io/BufferedOutputStream.java | 140 ----
.../apache/nifi/io/ByteArrayInputStream.java | 250 ------
.../apache/nifi/io/ByteArrayOutputStream.java | 250 ------
.../apache/nifi/io/ByteCountingInputStream.java | 104 ---
.../nifi/io/ByteCountingOutputStream.java | 63 --
.../org/apache/nifi/io/DataOutputStream.java | 417 ----------
.../org/apache/nifi/io/GZIPOutputStream.java | 41 -
.../nifi/io/LeakyBucketStreamThrottler.java | 324 --------
.../apache/nifi/io/NonCloseableInputStream.java | 56 --
.../nifi/io/NonCloseableOutputStream.java | 51 --
.../org/apache/nifi/io/NullOutputStream.java | 46 --
.../org/apache/nifi/io/StreamThrottler.java | 33 -
.../java/org/apache/nifi/io/StreamUtils.java | 257 ------
.../org/apache/nifi/io/ZipOutputStream.java | 38 -
.../exception/BytePatternNotFoundException.java | 28 -
.../io/util/NonThreadSafeCircularBuffer.java | 69 --
.../nifi/io/TestLeakyBucketThrottler.java | 144 ----
.../src/test/resources/logback-test.xml | 48 --
commons/nifi-utils/pom.xml | 4 +
.../flowfile/attributes/CoreAttributes.java | 72 ++
.../attributes/FlowFileAttributeKey.java | 21 +
.../apache/nifi/io/CompoundUpdateMonitor.java | 115 ---
.../org/apache/nifi/io/LastModifiedMonitor.java | 30 -
.../java/org/apache/nifi/io/MD5SumMonitor.java | 49 --
.../apache/nifi/io/SynchronousFileWatcher.java | 123 ---
.../java/org/apache/nifi/io/UpdateMonitor.java | 25 -
.../nifi/remote/StandardVersionNegotiator.java | 81 ++
.../apache/nifi/remote/VersionNegotiator.java | 65 ++
.../TransmissionDisabledException.java | 25 +
.../nifi/remote/io/CompressionInputStream.java | 184 +++++
.../nifi/remote/io/CompressionOutputStream.java | 147 ++++
.../remote/io/InterruptableInputStream.java | 117 +++
.../remote/io/InterruptableOutputStream.java | 81 ++
.../remote/io/socket/BufferStateManager.java | 111 +++
.../io/socket/SocketChannelInputStream.java | 157 ++++
.../io/socket/SocketChannelOutputStream.java | 113 +++
.../remote/io/socket/ssl/SSLSocketChannel.java | 602 ++++++++++++++
.../socket/ssl/SSLSocketChannelInputStream.java | 62 ++
.../ssl/SSLSocketChannelOutputStream.java | 53 ++
.../nifi/stream/io/BufferedInputStream.java | 37 +
.../nifi/stream/io/BufferedOutputStream.java | 140 ++++
.../nifi/stream/io/ByteArrayInputStream.java | 250 ++++++
.../nifi/stream/io/ByteArrayOutputStream.java | 250 ++++++
.../nifi/stream/io/ByteCountingInputStream.java | 104 +++
.../stream/io/ByteCountingOutputStream.java | 63 ++
.../apache/nifi/stream/io/DataOutputStream.java | 417 ++++++++++
.../apache/nifi/stream/io/GZIPOutputStream.java | 41 +
.../stream/io/LeakyBucketStreamThrottler.java | 324 ++++++++
.../nifi/stream/io/NonCloseableInputStream.java | 56 ++
.../stream/io/NonCloseableOutputStream.java | 51 ++
.../apache/nifi/stream/io/NullOutputStream.java | 46 ++
.../apache/nifi/stream/io/StreamThrottler.java | 33 +
.../org/apache/nifi/stream/io/StreamUtils.java | 257 ++++++
.../apache/nifi/stream/io/ZipOutputStream.java | 38 +
.../exception/BytePatternNotFoundException.java | 28 +
.../io/util/NonThreadSafeCircularBuffer.java | 69 ++
.../apache/nifi/util/NaiveSearchRingBuffer.java | 135 ++++
.../org/apache/nifi/util/file/FileUtils.java | 623 +++++++++++++++
.../file/monitor/CompoundUpdateMonitor.java | 115 +++
.../util/file/monitor/LastModifiedMonitor.java | 30 +
.../nifi/util/file/monitor/MD5SumMonitor.java | 51 ++
.../file/monitor/SynchronousFileWatcher.java | 123 +++
.../nifi/util/file/monitor/UpdateMonitor.java | 25 +
.../org/apache/nifi/util/search/Search.java | 57 ++
.../org/apache/nifi/util/search/SearchTerm.java | 141 ++++
.../util/search/ahocorasick/AhoCorasick.java | 155 ++++
.../nifi/util/search/ahocorasick/Node.java | 72 ++
.../util/search/ahocorasick/SearchState.java | 63 ++
.../io/TestCompressionInputOutputStreams.java | 153 ++++
.../stream/io/TestLeakyBucketThrottler.java | 147 ++++
.../nifi/util/TestNaiveSearchRingBuffer.java | 72 ++
.../file/monitor/TestCompoundUpdateMonitor.java | 71 ++
.../monitor/TestSynchronousFileWatcher.java | 61 ++
.../timebuffer/TestCompoundUpdateMonitor.java | 75 --
.../timebuffer/TestSynchronousFileWatcher.java | 64 --
.../src/test/resources/logback-test.xml | 32 +
commons/pom.xml | 6 -
commons/remote-communications-utils/pom.xml | 29 -
.../nifi/remote/StandardVersionNegotiator.java | 81 --
.../apache/nifi/remote/VersionNegotiator.java | 65 --
.../TransmissionDisabledException.java | 25 -
.../nifi/remote/io/CompressionInputStream.java | 184 -----
.../nifi/remote/io/CompressionOutputStream.java | 147 ----
.../remote/io/InterruptableInputStream.java | 117 ---
.../remote/io/InterruptableOutputStream.java | 81 --
.../remote/io/socket/BufferStateManager.java | 111 ---
.../io/socket/SocketChannelInputStream.java | 157 ----
.../io/socket/SocketChannelOutputStream.java | 113 ---
.../remote/io/socket/ssl/SSLSocketChannel.java | 602 --------------
.../socket/ssl/SSLSocketChannelInputStream.java | 62 --
.../ssl/SSLSocketChannelOutputStream.java | 53 --
.../io/TestCompressionInputOutputStreams.java | 153 ----
commons/search-utils/pom.xml | 30 -
.../org/apache/nifi/util/search/Search.java | 57 --
.../org/apache/nifi/util/search/SearchTerm.java | 141 ----
.../util/search/ahocorasick/AhoCorasick.java | 155 ----
.../nifi/util/search/ahocorasick/Node.java | 72 --
.../util/search/ahocorasick/SearchState.java | 63 --
commons/wali/pom.xml | 2 +-
.../org/wali/MinimalLockingWriteAheadLog.java | 4 +-
.../framework-bundle/framework/cluster/pom.xml | 2 +-
.../impl/FileBasedClusterNodeFirewall.java | 2 +-
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 10 +-
.../impl/FileBasedClusterNodeFirewallTest.java | 3 +-
.../framework-bundle/framework/core-api/pom.xml | 6 +-
.../framework-bundle/framework/core/pom.xml | 8 -
.../nifi/controller/FileSystemSwapManager.java | 2 +-
.../apache/nifi/controller/FlowController.java | 2 +-
.../nifi/controller/FlowUnmarshaller.java | 2 +-
.../apache/nifi/controller/SnippetManager.java | 8 +-
.../nifi/controller/StandardFlowService.java | 2 +-
.../controller/StandardFlowSynchronizer.java | 2 +-
.../nifi/controller/StandardProcessorNode.java | 2 +-
.../apache/nifi/controller/TemplateManager.java | 8 +-
.../repository/FileSystemRepository.java | 4 +-
.../repository/StandardProcessSession.java | 6 +-
.../repository/VolatileContentRepository.java | 4 +-
.../service/ControllerServiceLoader.java | 2 +-
.../StandardXMLFlowConfigurationDAO.java | 2 +-
.../nifi/remote/StandardRemoteProcessGroup.java | 2 +-
.../TestWriteAheadFlowFileRepository.java | 2 +-
.../repository/io/TestLimitedOutputStream.java | 3 +-
.../file-authorization-provider/pom.xml | 2 +-
.../FileAuthorizationProvider.java | 2 +-
.../FileAuthorizationProviderTest.java | 2 +-
.../resources/src/main/resources/DISCLAIMER | 15 -
.../resources/src/main/resources/LICENSE | 202 -----
.../resources/src/main/resources/NOTICE | 7 -
.../src/main/resources/conf/bootstrap.conf | 22 +-
.../resources/src/main/resources/docs/README.md | 65 --
.../framework/site-to-site/pom.xml | 12 -
.../remote/codec/StandardFlowFileCodec.java | 2 +-
.../remote/io/socket/SocketChannelInput.java | 4 +-
.../remote/io/socket/SocketChannelOutput.java | 4 +-
.../io/socket/ssl/SSLSocketChannelInput.java | 4 +-
.../io/socket/ssl/SSLSocketChannelOutput.java | 4 +-
.../apache/nifi/web/api/ProvenanceResource.java | 2 +-
.../nifi/web/util/ClientResponseUtils.java | 2 +-
.../src/main/webapp/js/application.js | 5 +
.../hadoop-bundle/hdfs-processors/pom.xml | 6 +-
...lowFileStreamUnpackerSequenceFileWriter.java | 2 +-
.../apache/nifi/processors/hadoop/PutHDFS.java | 4 +-
.../hadoop/SequenceFileWriterImpl.java | 2 +-
.../hadoop/TarUnpackerSequenceFileWriter.java | 2 +-
.../hadoop/ZipUnpackerSequenceFileWriter.java | 2 +-
.../hadoop/util/OutputStreamWritable.java | 4 +-
.../monitor-threshold-bundle/processor/pom.xml | 8 -
.../processors/monitor/MonitorThreshold.java | 2 +-
nar-bundles/monitor-threshold-bundle/ui/pom.xml | 2 +-
.../persistent-provenance-repository/pom.xml | 8 -
.../nifi/provenance/StandardRecordReader.java | 4 +-
.../nifi/provenance/StandardRecordWriter.java | 6 +-
.../provenance/rollover/CompressionAction.java | 4 +-
.../provenance/serialization/RecordReaders.java | 2 +-
.../standard-bundle/jms-processors/pom.xml | 6 +-
.../apache/nifi/processors/jms/JmsConsumer.java | 2 +-
.../org/apache/nifi/processors/jms/PutJMS.java | 2 +-
.../nifi/processors/jms/util/JmsFactory.java | 30 +-
.../nifi/processors/jms/util/JmsProperties.java | 3 +-
.../index.html | 1 -
.../index.html | 1 -
.../index.html | 1 -
.../standard-bundle/standard-processors/pom.xml | 14 +-
.../processors/standard/CompressContent.java | 6 +-
.../processors/standard/EncryptContent.java | 2 +-
.../standard/EvaluateRegularExpression.java | 2 +-
.../nifi/processors/standard/EvaluateXPath.java | 4 +-
.../processors/standard/EvaluateXQuery.java | 4 +-
.../standard/ExecuteStreamCommand.java | 6 +-
.../nifi/processors/standard/HashContent.java | 4 +-
.../nifi/processors/standard/ListenHTTP.java | 4 +-
.../nifi/processors/standard/MergeContent.java | 8 +-
.../nifi/processors/standard/ModifyBytes.java | 2 +-
.../nifi/processors/standard/PostHTTP.java | 12 +-
.../processors/standard/PutFileTransfer.java | 2 +-
.../nifi/processors/standard/ReplaceText.java | 2 +-
.../standard/ReplaceTextWithMapping.java | 2 +-
.../processors/standard/RouteOnContent.java | 2 +-
.../nifi/processors/standard/ScanAttribute.java | 4 +-
.../nifi/processors/standard/ScanContent.java | 6 +-
.../nifi/processors/standard/SplitContent.java | 2 +-
.../nifi/processors/standard/SplitText.java | 8 +-
.../nifi/processors/standard/SplitXml.java | 2 +-
.../nifi/processors/standard/TransformXml.java | 2 +-
.../nifi/processors/standard/UnpackContent.java | 6 +-
.../standard/servlets/ListenHTTPServlet.java | 4 +-
.../standard/util/UDPStreamConsumer.java | 2 +-
.../processors/standard/TestMergeContent.java | 3 +-
.../processors/standard/TestScanContent.java | 4 +-
.../distributed-cache-client-service/pom.xml | 6 +-
.../DistributedMapCacheClientService.java | 4 +-
.../DistributedSetCacheClientService.java | 4 +-
.../cache/client/SSLCommsSession.java | 4 +-
.../cache/client/StandardCommsSession.java | 4 +-
.../distributed-cache-protocol/pom.xml | 2 +-
.../distributed-cache-server/pom.xml | 6 +-
.../cache/server/AbstractCacheServer.java | 4 +-
.../cache/server/SetCacheServer.java | 2 +-
.../cache/server/map/MapCacheServer.java | 2 +-
.../update-attribute-bundle/processor/pom.xml | 2 +-
nifi-docs/pom.xml | 124 +++
.../images/add-processor-with-tag-cloud.png | Bin 0 -> 22925 bytes
.../src/main/asciidoc/images/add-processor.png | Bin 0 -> 31524 bytes
.../src/main/asciidoc/images/addConnect.png | Bin 0 -> 1996 bytes
.../src/main/asciidoc/images/comments-tab.png | Bin 0 -> 6431 bytes
.../src/main/asciidoc/images/components.png | Bin 0 -> 8992 bytes
.../asciidoc/images/connection-settings.png | Bin 0 -> 15214 bytes
.../main/asciidoc/images/create-connection.png | Bin 0 -> 9430 bytes
.../asciidoc/images/edit-property-dropdown.png | Bin 0 -> 14291 bytes
.../asciidoc/images/edit-property-textarea.png | Bin 0 -> 17146 bytes
.../src/main/asciidoc/images/iconAlert.png | Bin 0 -> 1396 bytes
.../src/main/asciidoc/images/iconConnection.png | Bin 0 -> 1517 bytes
.../src/main/asciidoc/images/iconDelete.png | Bin 0 -> 670 bytes
.../src/main/asciidoc/images/iconDisable.png | Bin 0 -> 764 bytes
nifi-docs/src/main/asciidoc/images/iconEdit.png | Bin 0 -> 493 bytes
.../src/main/asciidoc/images/iconEnable.png | Bin 0 -> 667 bytes
.../src/main/asciidoc/images/iconFunnel.png | Bin 0 -> 1223 bytes
nifi-docs/src/main/asciidoc/images/iconInfo.png | Bin 0 -> 550 bytes
.../src/main/asciidoc/images/iconInputPort.png | Bin 0 -> 1842 bytes
.../src/main/asciidoc/images/iconLabel.png | Bin 0 -> 838 bytes
.../src/main/asciidoc/images/iconNotSecure.png | Bin 0 -> 137 bytes
.../src/main/asciidoc/images/iconOutputPort.png | Bin 0 -> 1658 bytes
.../main/asciidoc/images/iconProcessGroup.png | Bin 0 -> 1422 bytes
.../src/main/asciidoc/images/iconProcessor.png | Bin 0 -> 1446 bytes
.../asciidoc/images/iconRemoteProcessGroup.png | Bin 0 -> 674 bytes
nifi-docs/src/main/asciidoc/images/iconRun.png | Bin 0 -> 538 bytes
.../src/main/asciidoc/images/iconSecure.png | Bin 0 -> 133 bytes
nifi-docs/src/main/asciidoc/images/iconStop.png | Bin 0 -> 402 bytes
.../src/main/asciidoc/images/iconTemplate.png | Bin 0 -> 970 bytes
.../asciidoc/images/iconTransmissionActive.png | Bin 0 -> 1330 bytes
.../images/iconTransmissionInactive.png | Bin 0 -> 1248 bytes
.../images/instantiate-template-description.png | Bin 0 -> 6508 bytes
.../asciidoc/images/instantiate-template.png | Bin 0 -> 3216 bytes
.../main/asciidoc/images/invalid-processor.png | Bin 0 -> 8187 bytes
nifi-docs/src/main/asciidoc/images/new-flow.png | Bin 0 -> 53989 bytes
.../main/asciidoc/images/nifi-navigation.png | Bin 0 -> 85458 bytes
.../asciidoc/images/nifi-toolbar-components.png | Bin 0 -> 72263 bytes
.../main/asciidoc/images/processor-anatomy.png | Bin 0 -> 37035 bytes
.../images/processor-connection-bubble.png | Bin 0 -> 9936 bytes
.../src/main/asciidoc/images/properties-tab.png | Bin 0 -> 11847 bytes
.../images/remote-group-ports-dialog.png | Bin 0 -> 21662 bytes
.../images/remote-port-connection-status.png | Bin 0 -> 57332 bytes
.../src/main/asciidoc/images/scheduling-tab.png | Bin 0 -> 12288 bytes
.../src/main/asciidoc/images/settings-tab.png | Bin 0 -> 16225 bytes
.../src/main/asciidoc/images/status-bar.png | Bin 0 -> 57171 bytes
.../main/asciidoc/images/valid-processor.png | Bin 0 -> 8090 bytes
.../src/main/asciidoc/nifi-user-guide.adoc | 782 +++++++++++++++++++
nifi-docs/src/main/assembly/dependencies.xml | 28 +
nifi-mock/pom.xml | 4 -
pom.xml | 56 +-
267 files changed, 7893 insertions(+), 7111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/24372962/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
----------------------------------------------------------------------
diff --cc nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
index 5e5ee1c,e9b0499..748fc62
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
@@@ -255,12 -255,12 +255,17 @@@ $(document).ready(function ()
selectComponent(componentName);
}
});
+
+ // listen for on the rest api and user guide
+ $('a.rest-api a.user-guide').on('click', function() {
+ selectComponent($(this).text());
+ });
+ // listen for on the rest api and user guide
+ $('a.rest-api a.user-guide').on('click', function() {
+ selectComponent($(this).text());
+ });
+
// get the initial selection
var initialComponentLink = $('a.component-link:first');
var initialSelection = $('#initial-selection').text();
[10/10] incubator-nifi git commit: NIFI-182: - Adjusting color of
text in tables.
Posted by mc...@apache.org.
NIFI-182:
- Adjusting color of text in tables.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/62965770
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/62965770
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/62965770
Branch: refs/heads/develop
Commit: 62965770d091ee86f5a28ed23467b7dbe797faa4
Parents: 022ba88
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 22 15:22:38 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 22 15:22:38 2014 -0500
----------------------------------------------------------------------
.../framework/web/nifi-web-api/src/main/enunciate/override.css | 6 +++---
.../web/nifi-web-docs/src/main/webapp/css/component-usage.css | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62965770/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
index 32f1f44..1cd8e7f 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
@@ -97,7 +97,7 @@ a:hover {
background-color: #fefefe;
border: 1px solid #ccc;
border-left: 6px solid #ccc;
- color: #666;
+ color: #555;
display: block;
margin-bottom: 12px;
padding: 5px 8px;
@@ -121,7 +121,7 @@ table {
background-color: #fefefe;
border: 1px solid #ccc;
border-left: 6px solid #ccc;
- color: #666;
+ color: #555;
display: block;
margin-bottom: 12px;
padding: 5px 8px;
@@ -150,7 +150,7 @@ code {
background-color: #fefefe;
border: 1px solid #ccc;
border-left: 6px solid #ccc;
- color: #666;
+ color: #555;
margin-bottom: 10px;
padding: 5px 8px;
white-space: pre;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62965770/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
index f12758e..8164034 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
@@ -45,7 +45,7 @@ table {
background-color: #fefefe;
border: 1px solid #ccc;
border-left: 6px solid #ccc;
- color: #666;
+ color: #555;
display: block;
margin-bottom: 12px;
padding: 5px 8px;
@@ -121,7 +121,7 @@ pre {
background-color: #fefefe;
border: 1px solid #ccc;
border-left: 6px solid #ccc;
- color: #666;
+ color: #555;
margin-bottom: 10px;
padding: 5px 8px;
}
\ No newline at end of file
[09/10] incubator-nifi git commit: NIFI-182: - Updating headers. -
Fixing filtering logic.
Posted by mc...@apache.org.
NIFI-182:
- Updating headers.
- Fixing filtering logic.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/022ba888
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/022ba888
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/022ba888
Branch: refs/heads/develop
Commit: 022ba888bb77f950d8ee0a5408166abf816a2d1f
Parents: f180d5d
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 22 14:56:11 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 22 14:56:11 2014 -0500
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/jsp/documentation.jsp | 6 +++---
.../web/nifi-web-docs/src/main/webapp/js/application.js | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/022ba888/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index c148ab5..016dad9 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -39,12 +39,12 @@
</div>
<div id="component-listing" class="component-listing">
<div class="section">
- <div class="header">Guides</div>
- <div id="guide-links" class="component-links">
+ <div class="header">General</div>
+ <div id="general-links" class="component-links">
<ul>
<li class="component-item"><a class="component-link user-guide" href="user-guide/nifi-user-guide.html" target="component-usage">User Guide</a></li>
</ul>
- <span class="no-matching no-components hidden">No matching user guides</span>
+ <span class="no-matching no-components hidden">No matching guides</span>
</div>
</div>
<div class="section">
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/022ba888/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
index b2940be..d98a251 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
@@ -95,14 +95,14 @@ $(document).ready(function () {
};
var applyFilter = function () {
- var matchingGuides = applyComponentFilter($('#guide-links'));
+ var matchingGeneral = applyComponentFilter($('#general-links'));
var matchingProcessors = applyComponentFilter($('#processor-links'));
var matchingControllerServices = applyComponentFilter($('#controller-service-links'));
var matchingReportingTasks = applyComponentFilter($('#reporting-task-links'));
- var matchingDev = applyComponentFilter($('#developer-links'));
+ var matchingDeveloper = applyComponentFilter($('#developer-links'));
// update the rule count
- $('#displayed-components').text(matchingGuides + matchingProcessors + matchingControllerServices + matchingReportingTasks + matchingDev);
+ $('#displayed-components').text(matchingGeneral + matchingProcessors + matchingControllerServices + matchingReportingTasks + matchingDeveloper);
};
var selectComponent = function (componentName) {
[05/10] incubator-nifi git commit: NIFI-182: - Updating styles to
better match the rest of the documentation.
Posted by mc...@apache.org.
NIFI-182:
- Updating styles to better match the rest of the documentation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b375f015
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b375f015
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b375f015
Branch: refs/heads/develop
Commit: b375f01519da33c24c2ad93d229e70918191838f
Parents: 2437296
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 22 11:05:48 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 22 11:05:48 2014 -0500
----------------------------------------------------------------------
.../src/main/enunciate/images/bg.png | Bin 99 -> 0 bytes
.../src/main/enunciate/override.css | 45 ++++++++++++++-----
2 files changed, 34 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b375f015/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png
deleted file mode 100644
index fda98e5..0000000
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/images/bg.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b375f015/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
index a96d0a3..d2a95d7 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
@@ -13,6 +13,13 @@
limitations under the License.
*/
+@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";
+
+html, html a {
+ -webkit-font-smoothing: antialiased;
+ text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+}
+
#site-name {
padding-left: 0;
}
@@ -56,7 +63,16 @@
.home {
color: #444;
- font-family: Verdana, Arial, Helvetica, sans-serif !important;
+ font-family: "Open Sans","DejaVu Sans",sans-serif !important;
+}
+
+p {
+ font-family: 'Noto Serif', 'DejaVu Serif', serif;
+ font-size: 16px;
+}
+
+p strong {
+ font-weight: bold;
}
a {
@@ -68,6 +84,7 @@ a:hover {
}
.container {
+ width: 940px !important;
padding: 0 10px;
background-color: #fff;
}
@@ -77,9 +94,9 @@ a:hover {
}
#main p.note {
- background: url(img/bg.png);
- border: 1px solid #eee;
- border-left: 4px solid #eee;
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
color: #666;
display: block;
margin-bottom: 12px;
@@ -89,9 +106,9 @@ a:hover {
/* tables */
table {
- background: url(img/bg.png);
- border: 1px solid #eee;
- border-left: 4px solid #eee;
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
color: #666;
display: block;
margin-bottom: 12px;
@@ -118,9 +135,9 @@ table tbody tr th {
code {
font-size: 14px;
- background: url(img/bg.png);
- border: 1px solid #eee;
- border-left: 4px solid #eee;
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
color: #666;
margin-bottom: 10px;
padding: 5px 8px;
@@ -133,6 +150,12 @@ code {
border-top: 3px solid #eee;
}
+/* width */
+
.span-18 {
- width: 776px !important;
+ width: 916px !important;
+}
+
+.span-20 {
+ width: 935px !important;
}
\ No newline at end of file
[07/10] incubator-nifi git commit: NIFI-182: - Making the
documentation in the help section for cohesive.
Posted by mc...@apache.org.
NIFI-182:
- Making the documentation in the help section for cohesive.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d3f082e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d3f082e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d3f082e2
Branch: refs/heads/develop
Commit: d3f082e25c560c2384f0c948330507b744a3f846
Parents: fa80827
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 22 14:23:02 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 22 14:23:02 2014 -0500
----------------------------------------------------------------------
.../nifi-web-api/src/main/enunciate/override.css | 19 ++++++++++++++++++-
.../main/webapp/WEB-INF/jsp/documentation.jsp | 8 +++++---
.../WEB-INF/jsp/no-documentation-found.jsp | 10 +++++-----
.../src/main/webapp/css/component-usage.css | 1 +
.../src/main/webapp/js/application.js | 4 +++-
5 files changed, 32 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
index d2a95d7..32f1f44 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
@@ -101,6 +101,18 @@ a:hover {
display: block;
margin-bottom: 12px;
padding: 5px 8px;
+ font-family: "Open Sans","DejaVu Sans",sans-serif;
+ font-size: 16px;
+}
+
+ul.navigation li, ul.xbreadcrumbs li {
+ font-family: "Open Sans","DejaVu Sans",sans-serif;
+ font-size: 16px;
+}
+
+ul li {
+ font-family: 'Noto Serif', 'DejaVu Serif', serif;
+ font-size: 16px;
}
/* tables */
@@ -144,6 +156,11 @@ code {
white-space: pre;
}
+h1, h2 {
+ font-weight: normal;
+ color: #ba3925;
+}
+
/* footer */
#footer {
@@ -153,7 +170,7 @@ code {
/* width */
.span-18 {
- width: 916px !important;
+ width: 921px !important;
}
.span-20 {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index e31be6f..c148ab5 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -39,11 +39,12 @@
</div>
<div id="component-listing" class="component-listing">
<div class="section">
- <div class="header">Documents</div>
- <div class="component-links">
+ <div class="header">Guides</div>
+ <div id="guide-links" class="component-links">
<ul>
<li class="component-item"><a class="component-link user-guide" href="user-guide/nifi-user-guide.html" target="component-usage">User Guide</a></li>
</ul>
+ <span class="no-matching no-components hidden">No matching user guides</span>
</div>
</div>
<div class="section">
@@ -102,10 +103,11 @@
</div>
<div class="section">
<div class="header">Developer</div>
- <div class="component-links">
+ <div id="developer-links" class="component-links">
<ul>
<li class="component-item"><a class="component-link rest-api" href="rest-api/index.html" target="component-usage">Rest Api</a></li>
</ul>
+ <span class="no-matching no-components hidden">No matching developer guides</span>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
index ba1cca8..567d0be 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
@@ -18,14 +18,14 @@
<!DOCTYPE html>
<html>
<head>
- <title>Component documentation not found</title>
+ <title>NiFi</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7"/>
<link rel="shortcut icon" href="../nifi/images/nifi16.ico"/>
- <link href="css/main.css" rel="stylesheet" type="text/css" />
- <link href="css/component-usage.css" rel="stylesheet" type="text/css" />
+ <link href="../../css/component-usage.css" rel="stylesheet" type="text/css" />
</head>
- <body style="padding: 4px;">
- <div>No usage documentation found.</div>
+ <body>
+ <h2>Yikes!</h2>
+ <p>Unable to locate the documentation for the selected item.</p>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
index 1728733..f12758e 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
@@ -65,6 +65,7 @@ tr th {
text-align:left;
padding: 4px;
border-width: 0;
+ white-space: nowrap;
}
/* links */
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d3f082e2/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
index ab92aa2..b2940be 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
@@ -95,12 +95,14 @@ $(document).ready(function () {
};
var applyFilter = function () {
+ var matchingGuides = applyComponentFilter($('#guide-links'));
var matchingProcessors = applyComponentFilter($('#processor-links'));
var matchingControllerServices = applyComponentFilter($('#controller-service-links'));
var matchingReportingTasks = applyComponentFilter($('#reporting-task-links'));
+ var matchingDev = applyComponentFilter($('#developer-links'));
// update the rule count
- $('#displayed-components').text(matchingProcessors + matchingControllerServices + matchingReportingTasks);
+ $('#displayed-components').text(matchingGuides + matchingProcessors + matchingControllerServices + matchingReportingTasks + matchingDev);
};
var selectComponent = function (componentName) {
[02/10] incubator-nifi git commit: Merge branch 'develop' into
NIFI-182
Posted by mc...@apache.org.
Merge branch 'develop' into NIFI-182
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4146a23c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4146a23c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4146a23c
Branch: refs/heads/develop
Commit: 4146a23cee7fb5d35318a96b1d8cc30a43e8a921
Parents: 3d0766b 732cb70
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Dec 19 07:50:05 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Dec 19 07:50:05 2014 -0500
----------------------------------------------------------------------
nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml | 2 +-
.../nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4146a23c/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
----------------------------------------------------------------------
[03/10] incubator-nifi git commit: NIFI-182: - Embedding REST docs in
the Help section.
Posted by mc...@apache.org.
NIFI-182:
- Embedding REST docs in the Help section.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/5e6de841
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5e6de841
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5e6de841
Branch: refs/heads/develop
Commit: 5e6de841d06773ff617f70cbae6a655bcab061f1
Parents: 4146a23
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Dec 19 10:47:23 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Dec 19 10:47:23 2014 -0500
----------------------------------------------------------------------
.../org/apache/nifi/web/server/JettyServer.java | 14 +++++++++++--
.../framework/web/nifi-web-api/pom.xml | 4 ++--
.../src/main/enunciate/override.css | 22 +++++---------------
.../src/main/webapp/WEB-INF/web.xml | 14 +++++++++----
.../main/webapp/WEB-INF/jsp/documentation.jsp | 11 ++++++++++
.../src/main/webapp/js/application.js | 9 ++++++--
.../nifi-web-error/src/main/webapp/index.jsp | 1 +
7 files changed, 48 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5e6de841/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java b/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
index 3900cfc..62d83a4 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
+++ b/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
@@ -384,14 +384,24 @@ public class JettyServer implements NiFiServer {
// load the docs directory
final File docsDir = Paths.get("docs").toRealPath().toFile();
final Resource docsResource = Resource.newResource(docsDir);
- // load the component documentation working directory
+ // load the component documentation working directory
final String componentDocsDirPath = props.getProperty(NiFiProperties.COMPONENT_DOCS_DIRECTORY, "work/docs/components");
final File workingDocsDirectory = Paths.get(componentDocsDirPath).toRealPath().getParent().toFile();
final Resource workingDocsResource = Resource.newResource(workingDocsDirectory);
+ // load the rest documentation
+ final File webApiDocsDir = new File(webApiContext.getTempDirectory(), "webapp/docs");
+ if (!webApiDocsDir.exists()) {
+ final boolean made = webApiDocsDir.mkdirs();
+ if (!made) {
+ throw new RuntimeException(webApiDocsDir.getAbsolutePath() + " could not be created");
+ }
+ }
+ final Resource webApiDocsResource = Resource.newResource(webApiDocsDir);
+
// create resources for both docs locations
- final ResourceCollection resources = new ResourceCollection(docsResource, workingDocsResource);
+ final ResourceCollection resources = new ResourceCollection(docsResource, workingDocsResource, webApiDocsResource);
resourceHandler.setBaseResource(resources);
// create the context handler
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5e6de841/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
index f0cb80b..8a9b2d1 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml
@@ -34,7 +34,7 @@
<resources>
<resource>
<directory>src/main/enunciate/images</directory>
- <targetPath>${project.build.directory}/${project.artifactId}-${project.version}/docs/img</targetPath>
+ <targetPath>${project.build.directory}/${project.artifactId}-${project.version}/docs/rest-api/img</targetPath>
</resource>
</resources>
<plugins>
@@ -51,7 +51,7 @@
<goal>docs</goal>
</goals>
<configuration>
- <docsDir>${project.build.directory}/${project.artifactId}-${project.version}/docs</docsDir>
+ <docsDir>${project.build.directory}/${project.artifactId}-${project.version}/docs/rest-api</docsDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5e6de841/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
index 5e839c5..a96d0a3 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/enunciate/override.css
@@ -18,7 +18,7 @@
}
#site-name a {
- /*font-variant: normal !important;*/
+ font-variant: normal !important;
letter-spacing: 1px;
}
@@ -35,10 +35,6 @@
color: #fff !important;
}
-.xbreadcrumbs li {
- /*padding: 10px 15px 10px 10px !important;*/
-}
-
.xbreadcrumbs li a, .xbreadcrumbs li.current a {
font-size: 13px !important;
color: #fff !important;
@@ -46,6 +42,7 @@
.xbreadcrumbs li a.home {
background: url(img/home.png) no-repeat left center;
+ line-height: 16px;
}
.xbreadcrumbs li ul {
@@ -58,8 +55,8 @@
}
.home {
- background-color: #dfe8ec;
color: #444;
+ font-family: Verdana, Arial, Helvetica, sans-serif !important;
}
a {
@@ -71,9 +68,6 @@ a:hover {
}
.container {
- width: 940px !important;
- border-left: 2px solid #efefef;
- border-right: 2px solid #efefef;
padding: 0 10px;
background-color: #fff;
}
@@ -139,12 +133,6 @@ code {
border-top: 3px solid #eee;
}
-/* width */
-
.span-18 {
- width: 916px !important;
-}
-
-.span-20 {
- width: 935px !important;
-}
+ width: 776px !important;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5e6de841/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/webapp/WEB-INF/web.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/webapp/WEB-INF/web.xml
index 8986a45..2ee9670 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/webapp/WEB-INF/web.xml
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/webapp/WEB-INF/web.xml
@@ -15,6 +15,7 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<display-name>nifi-api</display-name>
+
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
@@ -26,12 +27,15 @@
classpath:nifi-cluster-protocol-context.xml
</param-value>
</context-param>
+
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
+
<listener>
<listener-class>org.apache.nifi.web.contextlistener.ApplicationStartupContextListener</listener-class>
</listener>
+
<servlet>
<servlet-name>jerseySpring</servlet-name>
<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
@@ -44,10 +48,7 @@
<servlet-name>jerseySpring</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/docs/*</url-pattern>
- </servlet-mapping>
+
<filter>
<filter-name>timer</filter-name>
<filter-class>org.apache.nifi.web.filter.TimerFilter</filter-class>
@@ -56,6 +57,7 @@
<filter-name>timer</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+
<filter>
<filter-name>threadLocal</filter-name>
<filter-class>org.apache.nifi.web.filter.ThreadLocalFilter</filter-class>
@@ -64,6 +66,7 @@
<filter-name>threadLocal</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+
<filter>
<filter-name>springSecurityFilterChain</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
@@ -72,6 +75,7 @@
<filter-name>springSecurityFilterChain</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+
<filter>
<filter-name>requestLogger</filter-name>
<filter-class>org.apache.nifi.web.filter.RequestLogger</filter-class>
@@ -80,6 +84,7 @@
<filter-name>requestLogger</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+
<filter>
<filter-name>gzipCompressionFilter</filter-name>
<filter-class>org.eclipse.jetty.servlets.GzipFilter</filter-class>
@@ -88,6 +93,7 @@
<filter-name>gzipCompressionFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+
<filter>
<filter-name>nodeRequestFilter</filter-name>
<filter-class>org.apache.nifi.web.filter.NodeRequestFilter</filter-class>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5e6de841/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index 299cf4e..b350e6b 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -20,6 +20,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link rel="shortcut icon" href="../nifi/images/nifi16.ico"/>
<title>NiFi Documentation</title>
<script type="text/javascript" src="../nifi/js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/application.js"></script>
@@ -41,6 +42,7 @@
<div class="header">Documents</div>
<div class="component-links">
<ul>
+ <li class="component-item"><a class="component-link user-guide" href="user-guide/nifi-user-guide.html" target="component-usage">User Guide</a></li>
</ul>
</div>
</div>
@@ -98,6 +100,15 @@
</c:choose>
</div>
</div>
+ <div class="section">
+ <div class="header">Developer</div>
+ <div class="component-links">
+ <ul>
+ <li class="component-item"><a class="component-link rest-api" href="rest-api/index.html" target="component-usage">Rest Api</a></li>
+ <li class="component-item"><a class="component-link" href="javascript:void(0);" target="component-usage">Developer Guide</a></li>
+ </ul>
+ </div>
+ </div>
</div>
<div id="component-filter-controls">
<div id="component-filter-container">
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5e6de841/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
index 1a60de6..5e5ee1c 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
@@ -199,9 +199,9 @@ $(document).ready(function () {
}
}).blur(function () {
if ($(this).val() === '') {
- $(this).addClass('component-filter-list').val('Filter components');
+ $(this).addClass('component-filter-list').val('Filter');
}
- }).addClass('component-filter-list').val('Filter components');
+ }).addClass('component-filter-list').val('Filter');
// get the component usage container to install the window listener
var componentUsageContainer = $('#component-usage-container');
@@ -255,6 +255,11 @@ $(document).ready(function () {
selectComponent(componentName);
}
});
+
+ // listen for on the rest api and user guide
+ $('a.rest-api a.user-guide').on('click', function() {
+ selectComponent($(this).text());
+ });
// get the initial selection
var initialComponentLink = $('a.component-link:first');
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5e6de841/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/index.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/index.jsp
index f7dc687..3a342fb 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/index.jsp
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-error/src/main/webapp/index.jsp
@@ -20,6 +20,7 @@
<% String contextPath = "/".equals(request.getContextPath()) ? "" : request.getContextPath(); %>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link rel="shortcut icon" href="../nifi/images/nifi16.ico"/>
<title>NiFi</title>
<link href="<%= contextPath %>/nifi/css/message-pane.css" rel="stylesheet" type="text/css" />
<link href="<%= contextPath %>/nifi/css/message-page.css" rel="stylesheet" type="text/css" />
[08/10] incubator-nifi git commit: NIFI-182: - No longer logging the
REST API documentation URL.
Posted by mc...@apache.org.
NIFI-182:
- No longer logging the REST API documentation URL.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f180d5d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f180d5d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f180d5d2
Branch: refs/heads/develop
Commit: f180d5d2f1713d5aa7037eceea6cb917e41f3d08
Parents: d3f082e
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 22 14:38:56 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 22 14:38:56 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/nifi/web/server/JettyServer.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f180d5d2/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java b/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
index 62d83a4..5d37090 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
+++ b/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
@@ -652,12 +652,6 @@ public class JettyServer implements NiFiServer {
for (final String url : urls) {
logger.info(String.format("%s/nifi", url));
}
-
- // log the rest api location
- logger.info("The REST API documentation is available at the following URLs:");
- for (final String url : urls) {
- logger.info(String.format("%s/nifi-api/docs", url));
- }
}
}
[06/10] incubator-nifi git commit: NIFI-182: - Making the
documentation in the help section for cohesive.
Posted by mc...@apache.org.
NIFI-182:
- Making the documentation in the help section for cohesive.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fa80827d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fa80827d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fa80827d
Branch: refs/heads/develop
Commit: fa80827de9e59026c8cefe640528ee68d3b7ccbc
Parents: b375f01
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 22 11:09:51 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 22 11:09:51 2014 -0500
----------------------------------------------------------------------
.../main/webapp/WEB-INF/jsp/documentation.jsp | 3 +-
.../src/main/webapp/css/component-usage.css | 91 ++++++++++++++++----
.../nifi-web-docs/src/main/webapp/css/main.css | 29 +++++--
.../src/main/webapp/js/application.js | 7 +-
4 files changed, 95 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa80827d/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index b350e6b..e31be6f 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -27,7 +27,7 @@
<link href="css/main.css" rel="stylesheet" type="text/css" />
<link href="css/component-usage.css" rel="stylesheet" type="text/css" />
</head>
- <body>
+ <body id="documentation-body">
<div id="banner-header" class="main-banner-header"></div>
<div id="banner-footer" class="main-banner-footer"></div>
<span id="initial-selection" style="display: none;">${param.select}</span>
@@ -105,7 +105,6 @@
<div class="component-links">
<ul>
<li class="component-item"><a class="component-link rest-api" href="rest-api/index.html" target="component-usage">Rest Api</a></li>
- <li class="component-item"><a class="component-link" href="javascript:void(0);" target="component-usage">Developer Guide</a></li>
</ul>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa80827d/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
index b0f2e46..1728733 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
@@ -14,15 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";
+
+html, html a {
+ -webkit-font-smoothing: antialiased;
+ text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+}
+
body {
+ width: 62.5em;
+ margin: 0 auto;
display: block;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ font-family: "Open Sans","DejaVu Sans",sans-serif;
}
.title {
font-weight: bold;
- color: #294c58;
+ color: #7a2518;
font-size: 18px;
}
@@ -33,39 +42,85 @@ body {
/* tables */
table {
- border-collapse: collapse;
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
+ color: #666;
+ display: block;
+ margin-bottom: 12px;
+ padding: 5px 8px;
}
-table th {
- background-image: url(../images/bgTableHeader.png);
- background-repeat: repeat-x;
- border-bottom: 1px solid #365C6A;
- border-right: 1px solid #172B31;
- height: 26px;
- padding: 0 2px;
- color: #fff;
- white-space: nowrap;
+tr td {
+ font-size: 14px;
+ vertical-align:top;
+ text-align:left;
+ padding: 4px;
+ border-width: 0;
}
-table td {
- padding: 2px;
+tr th {
+ font-size: 16px;
+ vertical-align:top;
+ text-align:left;
+ padding: 4px;
+ border-width: 0;
}
/* links */
a, a:link, a:visited {
cursor: pointer;
- color: #1e373f;
+ color: #2156a5;
text-decoration: none;
border: none;
}
a:hover, a:active {
- color: #264c58;
- text-decoration: underline;
+ color: #2156a5;
+ text-decoration: none;
border: none;
}
.clear {
clear: both;
+}
+
+/* p */
+
+p {
+ font-family: 'Noto Serif', 'DejaVu Serif', serif;
+ font-size: 16px;
+}
+
+p strong {
+ font-weight: bold;
+}
+
+/* ul li */
+
+ul li {
+ font-family: 'Noto Serif', 'DejaVu Serif', serif;
+ font-size: 16px;
+}
+
+ul li strong {
+ font-weight: bold;
+}
+
+h2 {
+ font-weight: normal;
+ color: #ba3925;
+}
+
+/* pre */
+
+pre {
+ font-size: 14px;
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
+ color: #666;
+ margin-bottom: 10px;
+ padding: 5px 8px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa80827d/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
index b4daa6b..918eb7a 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
@@ -19,7 +19,8 @@
padding: 0;
}
-body {
+#documentation-body {
+ width: 100%;
position: absolute;
top: 0;
right: 0;
@@ -111,7 +112,7 @@ div.component-listing {
left: 0;
bottom: 40px;
overflow: auto;
- font-size: 12px;
+ font-size: 16px;
padding: 4px;
}
@@ -124,22 +125,32 @@ div.component-listing div.header {
color: #264c58;
}
-div.component-listing div.component-links {
- margin-left: 10px;
- color: #1e373f;
-}
-
div.component-links ul {
list-style: none;
}
li.component-item {
padding: 2px;
+ padding-left: 4px;
+ border-left: 8px solid transparent;
+ font-family: "Open Sans","DejaVu Sans",sans-serif;
+ font-size: 15px;
+}
+
+li.component-item a {
+ color: #1e373f;
+}
+
+li.component-item:hover {
+ border-left: 8px solid #d1dee5;
+}
+
+li.component-item:hover a {
+ color: #264c58;
}
li.component-item.selected {
- background-color: #d1dee5;
- text-decoration: underline;
+ border-left: 8px solid #7098ad;
}
div.component-links span.no-components {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fa80827d/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
index 748fc62..ab92aa2 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
@@ -257,15 +257,10 @@ $(document).ready(function () {
});
// listen for on the rest api and user guide
- $('a.rest-api a.user-guide').on('click', function() {
+ $('a.rest-api, a.user-guide').on('click', function() {
selectComponent($(this).text());
});
- // listen for on the rest api and user guide
- $('a.rest-api a.user-guide').on('click', function() {
- selectComponent($(this).text());
- });
-
// get the initial selection
var initialComponentLink = $('a.component-link:first');
var initialSelection = $('#initial-selection').text();