Repository: incubator-nifi Updated Branches: refs/heads/NIFI-353 b50953d9d -> 48b1572f1
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/48b1572f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/resources/META-INF/NOTICE b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/resources/META-INF/NOTICE deleted file mode 100644 index d91a952..0000000 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,19 +0,0 @@ -nifi-web-docs -Copyright 2014-2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -=========================================== -Apache Software License v2 -=========================================== - -The following binary components are provided under the Apache Software License v2 - - (ASLv2) Apache Commons Lang - The following NOTICE information applies: - Apache Commons Lang - Copyright 2001-2014 The Apache Software Foundation - - This product includes software from the Spring Framework, - under the Apache License 2.0 (see: StringUtils.containsWhitespace()) http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/48b1572f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/META-INF/nifi-data-viewer ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/META-INF/nifi-data-viewer b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/META-INF/nifi-data-viewer deleted file mode 100644 index 29fed60..0000000 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/META-INF/nifi-data-viewer +++ /dev/null @@ -1,2 +0,0 @@ -application/xml -application/json \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/48b1572f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/WEB-INF/jsp/content.jsp ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/WEB-INF/jsp/content.jsp b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/WEB-INF/jsp/content.jsp deleted file mode 100644 index adabebd..0000000 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/WEB-INF/jsp/content.jsp +++ /dev/null @@ -1,18 +0,0 @@ -<%-- - 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. ---%> -<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<p>This is the content rendered...</p> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/48b1572f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/WEB-INF/web.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 7eb4ee2..0000000 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<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-docs</display-name> - <error-page> - <error-code>404</error-code> - <location>/WEB-INF/jsp/no-documentation-found.jsp</location> - </error-page> - <servlet> - <servlet-name>documentation-controller</servlet-name> - <servlet-class>org.apache.nifi.standard.data.viewer.StandardDataViewerController</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>documentation-controller</servlet-name> - <url-pattern>/documentation</url-pattern> - </servlet-mapping> - <welcome-file-list> - <welcome-file>documentation</welcome-file> - </welcome-file-list> -</web-app> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/48b1572f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/css/main.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/css/main.css b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/css/main.css deleted file mode 100644 index 918eb7a..0000000 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/css/main.css +++ /dev/null @@ -1,214 +0,0 @@ -/* - * 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. - */ -* { - margin: 0; - padding: 0; -} - -#documentation-body { - width: 100%; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; -} - -/* banners */ - -div.main-banner-header { - display: none; - z-index: 100; - font-weight: bold; - font-size: 1em; - text-align: center; - line-height: 15px; - color: #7e7e7e; - margin: 0px auto; - width: 900px; - height: 17px; - background-color: #fff; - z-index: 100; - background-image: url(../images/bgHeader.png); -} - -div.main-banner-footer { - display: none; - position: absolute; - left: 0px; - right: 0px; - bottom: 0px; - height: 15px; - color: #fff; - text-align: center; - font-weight: bold; - font-size: 1em; - line-height: 15px; - overflow: visible; - background-color: #9eb9c7; - background-image: url(../images/bgBannerFoot.png); - background-repeat: repeat-x; - background-position: left top; -} - -/* documentation */ - -div.documentation-header { - position: absolute; - top: 0; - left: 0; - right: 0; - height: 45px; - border-bottom: 1px solid #d1dee5; - color: #365c6a; - font-size: 13px; -} - -#nf-title { - float: left; - height: 50px; - padding: 5px; - font-size: 20px; - margin-top: 10px; -} - -#nf-version { - float: left; - font-size: 14px; - margin-left: 10px; - margin-top: 21px; - font-style: italic; - color: #aaa; -} - -#selected-component { - float: right; - height: 50px; - padding: 5px; - margin-top: 10px; - font-size: 20px; -} - -/* component listing */ - -div.component-listing { - width: 300px; - position: absolute; - top: 46px; - left: 0; - bottom: 40px; - overflow: auto; - font-size: 16px; - padding: 4px; -} - -div.component-listing div.section { - margin-bottom: 15px; -} - -div.component-listing div.header { - font-weight: bold; - color: #264c58; -} - -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 { - border-left: 8px solid #7098ad; -} - -div.component-links span.no-components { - font-style: italic; - color: #777; -} - -/* component filter control */ - -#component-filter-controls { - width: 308px; - height: 40px; - position: absolute; - bottom: 0; - left: 0; -} - -#component-filter-container { - height: 24px; - margin-left: 2px; - margin-top: 1px; -} - -#component-filter { - padding: 1px; - font-size: 12px; - height: 18px; - line-height: 20px; - width: 299px; - float: left; -} - -input.component-filter-list { - color: #888; - font-style: italic; -} - -#component-filter-stats { - font-size: 9px; - font-weight: bold; - color: #9f6000; - clear: left; - line-height: normal; - margin-left: 7px; - margin-top: 2px; -} - -/* component usage */ - -#component-usage-container { - position: absolute; - top: 46px; - right: 0px; - bottom: 0px; - left: 312px; - overflow: hidden; -} - -#component-usage { - overflow: auto; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/48b1572f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/js/application.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/js/application.js b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/js/application.js deleted file mode 100644 index 3efdbcc..0000000 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-data-viewer/src/main/webapp/js/application.js +++ /dev/null @@ -1,282 +0,0 @@ -/* - * 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. - */ -$(document).ready(function () { - - var isUndefined = function (obj) { - return typeof obj === 'undefined'; - }; - - var isNull = function (obj) { - return obj === null; - }; - - var isDefinedAndNotNull = function (obj) { - return !isUndefined(obj) && !isNull(obj); - }; - - /** - * Get the filter text. - * - * @returns {unresolved} - */ - var getFilterText = function () { - var filter = ''; - var ruleFilter = $('#component-filter'); - if (!ruleFilter.hasClass('component-filter-list')) { - filter = ruleFilter.val(); - } - return filter; - }; - - var applyComponentFilter = function (componentContainer) { - var matchingComponents = 0; - var componentLinks = $(componentContainer).find('a.component-link'); - - if (componentLinks.length === 0) { - return matchingComponents; - } - - // get the filter text - var filter = getFilterText(); - if (filter !== '') { - var filterExp = new RegExp(filter, 'i'); - - // update the displayed rule count - $.each(componentLinks, function (_, componentLink) { - var a = $(componentLink); - var li = a.closest('li.component-item'); - - // get the rule text for matching - var componentName = a.text(); - - // see if any of the text from this rule matches - var componentMatches = componentName.search(filterExp) >= 0; - - // handle whether the rule matches - if (componentMatches === true) { - li.show(); - matchingComponents++; - } else { - // hide the rule - li.hide(); - } - }); - } else { - // ensure every rule is visible - componentLinks.closest('li.component-item').show(); - - // set the number of displayed rules - matchingComponents = componentLinks.length; - } - - // show whether there are status if appropriate - var noMatching = componentContainer.find('span.no-matching'); - if (matchingComponents === 0) { - noMatching.show(); - } else { - noMatching.hide(); - } - - return matchingComponents; - }; - - var applyFilter = function () { - var matchingGeneral = applyComponentFilter($('#general-links')); - var matchingProcessors = applyComponentFilter($('#processor-links')); - var matchingControllerServices = applyComponentFilter($('#controller-service-links')); - var matchingReportingTasks = applyComponentFilter($('#reporting-task-links')); - var matchingDeveloper = applyComponentFilter($('#developer-links')); - - // update the rule count - $('#displayed-components').text(matchingGeneral + matchingProcessors + matchingControllerServices + matchingReportingTasks + matchingDeveloper); - }; - - var selectComponent = function (componentName) { - var componentLinks = $('a.component-link'); - - // consider each link - $.each(componentLinks, function () { - var componentLink = $(this); - if (componentName === componentLink.text()) { - // remove all selected styles - $('li.component-item').removeClass('selected'); - - // select this links item - componentLink.closest('li.component-item').addClass('selected'); - - // set the header - $('#selected-component').text(componentLink.text()); - - // stop iteration - return false; - } - }); - }; - - // get the banners if we're not in the shell - var banners = $.Deferred(function (deferred) { - if (top === window) { - $.ajax({ - type: 'GET', - url: '../nifi-api/controller/banners', - dataType: 'json' - }).then(function (response) { - // ensure the banners response is specified - if (isDefinedAndNotNull(response.banners)) { - if (isDefinedAndNotNull(response.banners.headerText) && response.banners.headerText !== '') { - // update the header text - var bannerHeader = $('#banner-header').html(response.banners.headerText).show(); - - // show the banner - var updateTop = function (elementId) { - var element = $('#' + elementId); - element.css('top', (parseInt(bannerHeader.css('height')) + parseInt(element.css('top'))) + 'px'); - }; - - // update the position of elements affected by top banners - updateTop('documentation-header'); - updateTop('component-listing'); - updateTop('component-usage-container'); - } - - if (isDefinedAndNotNull(response.banners.footerText) && response.banners.footerText !== '') { - // update the footer text and show it - var bannerFooter = $('#banner-footer').html(response.banners.footerText).show(); - - var updateBottom = function (elementId) { - var element = $('#' + elementId); - element.css('bottom', parseInt(bannerFooter.css('height')) + parseInt(element.css('bottom')) + 'px'); - }; - - // update the position of elements affected by bottom banners - updateBottom('component-filter-controls'); - updateBottom('component-listing'); - updateBottom('component-usage-container'); - } - } - - deferred.resolve(); - }, function () { - deferred.reject(); - }); - } else { - deferred.resolve(); - } - }).promise(); - - // get the about details - var about = $.ajax({ - type: 'GET', - url: '../nifi-api/controller/about', - dataType: 'json' - }).done(function (response) { - var aboutDetails = response.about; - - // set the document title and the about title - $('#nf-version').text(aboutDetails.version); - }); - - // once the banners have loaded, function with remainder of the page - $.when(banners, about).always(function () { - // define the function for filtering the list - $('#component-filter').keyup(function () { - applyFilter(); - }).focus(function () { - if ($(this).hasClass('component-filter-list')) { - $(this).removeClass('component-filter-list').val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass('component-filter-list').val('Filter'); - } - }).addClass('component-filter-list').val('Filter'); - - // get the component usage container to install the window listener - var componentUsageContainer = $('#component-usage-container'); - - // size the iframe accordingly - var componentUsage = $('#component-usage').css({ - width: componentUsageContainer.width(), - height: componentUsageContainer.height() - }); - - // add a window resize listener - $(window).resize(function () { - componentUsage.css({ - width: componentUsageContainer.width(), - height: componentUsageContainer.height() - }); - }); - - // listen for loading of the iframe to update the title - $('#component-usage').on('load', function () { - var componentName = ''; - var href = $(this).contents().get(0).location.href; - - // see if the href ends in index.htm[l] - var indexOfIndexHtml = href.indexOf('index.htm'); - if (indexOfIndexHtml >= 0) { - href = href.substring(0, indexOfIndexHtml); - } - - // remove the trailing separator - if (href.length > 0) { - var indexOfSeparator = href.lastIndexOf('/'); - if (indexOfSeparator === href.length - 1) { - href = href.substring(0, indexOfSeparator); - } - } - - // extract the simple name - if (href.length > 0) { - var indexOfLastDot = href.lastIndexOf('.'); - if (indexOfLastDot >= 0) { - var indexAfterStrToFind = indexOfLastDot + 1; - if (indexAfterStrToFind < href.length) { - componentName = href.substr(indexAfterStrToFind); - } - } - } - - // if we could figure out the name - if (componentName !== '') { - selectComponent(componentName); - } - }); - - // listen for on the rest api and user guide and developer guide and admin guide and overview - $('a.rest-api, a.user-guide, a.developer-guide, a.admin-guide, a.overview, a.expression-language-guide').on('click', function() { - selectComponent($(this).text()); - }); - - // get the initial selection - var initialComponentLink = $('a.component-link:first'); - var initialSelection = $('#initial-selection').text(); - if (initialSelection !== '') { - $('a.component-link').each(function () { - var componentLink = $(this); - if (componentLink.text() === initialSelection) { - initialComponentLink = componentLink; - return false; - } - }); - } - - // click the first link - initialComponentLink[0].click(); - }); -}); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/48b1572f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml index 23e481b..2c5e199 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml @@ -43,7 +43,7 @@ </dependency> <dependency> <groupId>org.apache.nifi</groupId> - <artifactId>nifi-standard-data-viewer</artifactId> + <artifactId>nifi-standard-content-viewer</artifactId> <type>war</type> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/48b1572f/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml index fafd81e..69546a4 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -28,7 +28,7 @@ <module>nifi-standard-processors</module> <module>nifi-standard-prioritizers</module> <module>nifi-standard-reporting-tasks</module> - <module>nifi-standard-data-viewer</module> + <module>nifi-standard-content-viewer</module> <module>nifi-standard-nar</module> </modules> <dependencyManagement> @@ -50,7 +50,7 @@ </dependency> <dependency> <groupId>org.apache.nifi</groupId> - <artifactId>nifi-standard-data-viewer</artifactId> + <artifactId>nifi-standard-content-viewer</artifactId> <type>war</type> <version>0.0.2-incubating-SNAPSHOT</version> </dependency>
