You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/04/10 15:44:17 UTC
[42/62] [abbrv] incubator-nifi git commit: NIFI-493: - Fixing the
number of documented components. - Fixing unordered list creation.
NIFI-493:
- Fixing the number of documented components.
- Fixing unordered list creation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d769b50e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d769b50e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d769b50e
Branch: refs/heads/NIFI-25
Commit: d769b50e39a7802dad55544f56759b976f162f70
Parents: 7369730
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Apr 8 08:39:05 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Apr 8 08:39:05 2015 -0400
----------------------------------------------------------------------
.../nifi/web/docs/DocumentationController.java | 5 ++++-
.../src/main/webapp/WEB-INF/jsp/documentation.jsp | 18 +++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d769b50e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
index a5428cd..7d8ec6c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
@@ -39,6 +39,9 @@ import org.apache.commons.lang3.StringUtils;
@WebServlet(name = "DocumenationController", urlPatterns = {"/*"})
public class DocumentationController extends HttpServlet {
+ private static final int GENERAL_LINK_COUNT = 4;
+ private static final int DEVELOPER_LINK_COUNT = 2;
+
// context for accessing the extension mapping
private ServletContext servletContext;
@@ -82,7 +85,7 @@ public class DocumentationController extends HttpServlet {
request.setAttribute("processors", processors);
request.setAttribute("controllerServices", controllerServices);
request.setAttribute("reportingTasks", reportingTasks);
- request.setAttribute("totalComponents", processors.size() + controllerServices.size() + reportingTasks.size());
+ request.setAttribute("totalComponents", GENERAL_LINK_COUNT + processors.size() + controllerServices.size() + reportingTasks.size() + DEVELOPER_LINK_COUNT);
// forward appropriately
request.getRequestDispatcher("/WEB-INF/jsp/documentation.jsp").forward(request, response);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d769b50e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index d2397de..aea08d0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -55,11 +55,11 @@
<div id="processor-links" class="component-links">
<c:choose>
<c:when test="${not empty processors}">
+ <ul>
<c:forEach var="entry" items="${processors}">
- <ul>
- <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
- </ul>
+ <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
</c:forEach>
+ </ul>
<span class="no-matching no-components hidden">No matching processors</span>
</c:when>
<c:otherwise>
@@ -73,11 +73,11 @@
<div id="controller-service-links" class="component-links">
<c:choose>
<c:when test="${not empty controllerServices}">
+ <ul>
<c:forEach var="entry" items="${controllerServices}">
- <ul>
- <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
- </ul>
+ <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
</c:forEach>
+ </ul>
<span class="no-matching no-components hidden">No matching controller services</span>
</c:when>
<c:otherwise>
@@ -91,11 +91,11 @@
<div id="reporting-task-links" class="component-links">
<c:choose>
<c:when test="${not empty reportingTasks}">
+ <ul>
<c:forEach var="entry" items="${reportingTasks}">
- <ul>
- <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
- </ul>
+ <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
</c:forEach>
+ </ul>
<span class="no-matching no-components hidden">No matching reporting tasks</span>
</c:when>
<c:otherwise>