Repository: incubator-nifi Updated Branches: refs/heads/NIFI-353 48b1572f1 -> cd0a1bd42
NIFI-353: - Renaming data-viewer to content-viewer. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cd0a1bd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cd0a1bd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cd0a1bd4 Branch: refs/heads/NIFI-353 Commit: cd0a1bd42ac4b953cb1d8c979d7041373555882a Parents: 48b1572 Author: Matt Gilman <[email protected]> Authored: Mon Feb 16 17:08:32 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Mon Feb 16 17:08:32 2015 -0500 ---------------------------------------------------------------------- .../nifi/web/ContentViewerController.java | 63 ++++++++++++++++++++ .../web/data/viewer/DataViewerController.java | 63 -------------------- .../src/main/webapp/WEB-INF/web.xml | 12 ++-- .../viewer/StandardDataViewerController.java | 50 ---------------- .../web/StandardContentViewerController.java | 50 ++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 11 ++-- 6 files changed, 127 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cd0a1bd4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java new file mode 100644 index 0000000..bace318 --- /dev/null +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java @@ -0,0 +1,63 @@ +/* + * 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. + */ +package org.apache.nifi.web; + +import java.io.IOException; +import java.util.Map; +import javax.servlet.RequestDispatcher; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + */ +@WebServlet(name = "ContentViewerController", urlPatterns = {"/viewer"}) +public class ContentViewerController extends HttpServlet { + + /** + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + final ServletContext servletContext = request.getServletContext(); + final String contentViewerUri = servletContext.getInitParameter("application/xml"); + + // header + final RequestDispatcher header = request.getRequestDispatcher("/WEB-INF/jsp/header.jsp"); + header.include(request, response); + + // content + final ServletContext viewerContext = servletContext.getContext(contentViewerUri); + final RequestDispatcher content = viewerContext.getRequestDispatcher("/view-content"); + content.include(request, response); + + // footer + final RequestDispatcher footer = request.getRequestDispatcher("/WEB-INF/jsp/footer.jsp"); + footer.include(request, response); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cd0a1bd4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/data/viewer/DataViewerController.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/data/viewer/DataViewerController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/data/viewer/DataViewerController.java deleted file mode 100644 index 504ada2..0000000 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/data/viewer/DataViewerController.java +++ /dev/null @@ -1,63 +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. - */ -package org.apache.nifi.web.data.viewer; - -import java.io.IOException; -import java.util.Map; -import javax.servlet.RequestDispatcher; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * - */ -@WebServlet(name = "DataViewerController", urlPatterns = {"/*"}) -public class DataViewerController extends HttpServlet { - - /** - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - final ServletContext servletContext = request.getServletContext(); - final String dataViewerUri = servletContext.getInitParameter("application/xml"); - - // header -// final RequestDispatcher header = request.getRequestDispatcher("/WEB-INF/jsp/header.jsp"); -// header.include(request, response); - - // content - final ServletContext viewerContext = servletContext.getContext(dataViewerUri); - final RequestDispatcher content = viewerContext.getRequestDispatcher("/content"); - content.include(request, response); - - // footer -// final RequestDispatcher footer = request.getRequestDispatcher("/WEB-INF/jsp/footer.jsp"); -// footer.include(request, response); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cd0a1bd4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/web.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/web.xml index 7cab224..0765a78 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/web.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/web.xml @@ -15,13 +15,15 @@ --> <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-content-viewer</display-name> - <servlet> - <servlet-name>DataViewerController</servlet-name> - <servlet-class>org.apache.nifi.web.data.viewer.DataViewerController</servlet-class> + <servlet-name>ContentViewerController</servlet-name> + <servlet-class>org.apache.nifi.web.ContentViewerController</servlet-class> </servlet> <servlet-mapping> - <servlet-name>DataViewerController</servlet-name> - <url-pattern>/*</url-pattern> + <servlet-name>ContentViewerController</servlet-name> + <url-pattern>/viewer</url-pattern> </servlet-mapping> + <welcome-file-list> + <welcome-file>viewer</welcome-file> + </welcome-file-list> </web-app> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cd0a1bd4/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/standard/data/viewer/StandardDataViewerController.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/standard/data/viewer/StandardDataViewerController.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/standard/data/viewer/StandardDataViewerController.java deleted file mode 100644 index a5a2374..0000000 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/standard/data/viewer/StandardDataViewerController.java +++ /dev/null @@ -1,50 +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. - */ -package org.apache.nifi.standard.data.viewer; - -import java.io.IOException; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * - */ -@WebServlet(name = "StandardDataViewer", urlPatterns = {"/content"}) -public class StandardDataViewerController extends HttpServlet { - - /** - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { -// final ExtensionMapping extensionMappings = (ExtensionMapping) servletContext.getAttribute("nifi-extension-mapping"); - - // forward appropriately - request.getRequestDispatcher("/WEB-INF/jsp/content.jsp").forward(request, response); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cd0a1bd4/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java new file mode 100644 index 0000000..8648539 --- /dev/null +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java @@ -0,0 +1,50 @@ +/* + * 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. + */ +package org.apache.nifi.web; + +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + */ +@WebServlet(name = "StandardContentViewer", urlPatterns = {"/view-content"}) +public class StandardContentViewerController extends HttpServlet { + + /** + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { +// final ExtensionMapping extensionMappings = (ExtensionMapping) servletContext.getAttribute("nifi-extension-mapping"); + + // forward appropriately + request.getRequestDispatcher("/WEB-INF/jsp/content.jsp").include(request, response); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cd0a1bd4/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/WEB-INF/web.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/WEB-INF/web.xml index 0a565df..8f59916 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/WEB-INF/web.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/WEB-INF/web.xml @@ -16,11 +16,14 @@ <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-standard-content-viewer</display-name> <servlet> - <servlet-name>StandardDataViewer</servlet-name> - <servlet-class>org.apache.nifi.standard.data.viewer.StandardDataViewerController</servlet-class> + <servlet-name>StandardContentViewer</servlet-name> + <servlet-class>org.apache.nifi.web.StandardContentViewerController</servlet-class> </servlet> <servlet-mapping> - <servlet-name>StandardDataViewer</servlet-name> - <url-pattern>/content</url-pattern> + <servlet-name>StandardContentViewer</servlet-name> + <url-pattern>/view-content</url-pattern> </servlet-mapping> + <welcome-file-list> + <welcome-file>view-content</welcome-file> + </welcome-file-list> </web-app>
