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 20:56:26 UTC
[1/2] incubator-nifi git commit: NIFI-182: - No longer logging the
REST API documentation URL.
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-182 d3f082e25 -> 022ba888b
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/NIFI-182
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));
- }
}
}
[2/2] 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/NIFI-182
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) {