Greg Sheremeta has uploaded a new change for review. Change subject: engine: created FaviconServlet for branding ......................................................................
engine: created FaviconServlet for branding Created POC FaviconServlet for sending branded favicons. Change-Id: I929cf7d98fdf67de72b5aadded154d383febd666 Bug-Url: https://bugzilla.redhat.com/997547 Signed-off-by: Greg Sheremeta <[email protected]> --- A backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FaviconServlet.java M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml D backend/manager/modules/root/src/main/webapp/favicon.ico 3 files changed, 35 insertions(+), 49 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/18200/1 diff --git a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FaviconServlet.java b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FaviconServlet.java new file mode 100644 index 0000000..b41c984 --- /dev/null +++ b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/FaviconServlet.java @@ -0,0 +1,25 @@ +package org.ovirt.engine.core; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class FaviconServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + public FaviconServlet() { + super(); + } + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // do some logic here to calculate the path + String forwardPath = "/ovirt-engine-theme/00-ovirt.brand/ovirt_favicon.ico"; //$NON-NLS-1$ + System.out.println("forwarding to " + forwardPath); //$NON-NLS-1$ + request.getRequestDispatcher(forwardPath).forward(request, response); + } + +} diff --git a/backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml b/backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml index b797367..9ae966b 100644 --- a/backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml +++ b/backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - -<web-app - 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"; - version="3.0"> - - <!-- File servlet instance to serve the CA certificate: --> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; version="3.0"> <servlet> <servlet-name>PKIResourceServlet.ca</servlet-name> <servlet-class>org.ovirt.engine.core.pki.PKIResourceServlet</servlet-class> @@ -23,8 +16,6 @@ <servlet-name>PKIResourceServlet.ca</servlet-name> <url-pattern>/ca.crt</url-pattern> </servlet-mapping> - - <!-- Servlet to serve the engine SSH public key: --> <servlet> <servlet-name>PKIResourceServlet.engine.ssh</servlet-name> <servlet-class>org.ovirt.engine.core.pki.PKIResourceServlet</servlet-class> @@ -46,8 +37,6 @@ <url-pattern>/engine.ssh.key.txt</url-pattern> <url-pattern>/rhevm.ssh.key.txt</url-pattern> </servlet-mapping> - - <!-- Servlet to serve config files for console client --> <servlet> <servlet-name>GetAttachmentServlet</servlet-name> <servlet-class>org.ovirt.engine.core.GetAttachmentServlet</servlet-class> @@ -56,8 +45,6 @@ <servlet-name>GetAttachmentServlet</servlet-name> <url-pattern>/ovirt-engine-attachment/*</url-pattern> </servlet-mapping> - - <!-- Documentation: --> <servlet> <servlet-name>docs</servlet-name> <servlet-class>org.ovirt.engine.core.DocsServlet</servlet-class> @@ -70,8 +57,6 @@ <servlet-name>docs</servlet-name> <url-pattern>/docs/*</url-pattern> </servlet-mapping> - - <!-- noVNC: --> <servlet> <servlet-name>novnc</servlet-name> <servlet-class>org.ovirt.engine.core.DocsServlet</servlet-class> @@ -84,8 +69,6 @@ <servlet-name>novnc</servlet-name> <url-pattern>/ovirt-engine-novnc/*</url-pattern> </servlet-mapping> - - <!-- SPICE-HTML5: --> <servlet> <servlet-name>spicehtml5</servlet-name> <servlet-class>org.ovirt.engine.core.DocsServlet</servlet-class> @@ -98,8 +81,6 @@ <servlet-name>spicehtml5</servlet-name> <url-pattern>/ovirt-engine-spicehtml5/*</url-pattern> </servlet-mapping> - - <!-- SpiceX.cab --> <servlet> <servlet-name>SpiceX.cab</servlet-name> <servlet-class>org.ovirt.engine.core.FileServlet</servlet-class> @@ -116,8 +97,6 @@ <servlet-name>SpiceX.cab</servlet-name> <url-pattern>/spice/SpiceX.cab</url-pattern> </servlet-mapping> - - <!-- SpiceVersion.txt --> <servlet> <servlet-name>SpiceVersion.txt</servlet-name> <servlet-class>org.ovirt.engine.core.FileServlet</servlet-class> @@ -134,8 +113,6 @@ <servlet-name>SpiceVersion.txt</servlet-name> <url-pattern>/spice/SpiceVersion.txt</url-pattern> </servlet-mapping> - - <!-- SpiceX_x64.cab --> <servlet> <servlet-name>SpiceX_x64.cab</servlet-name> <servlet-class>org.ovirt.engine.core.FileServlet</servlet-class> @@ -152,8 +129,6 @@ <servlet-name>SpiceX_x64.cab</servlet-name> <url-pattern>/spice/SpiceX_x64.cab</url-pattern> </servlet-mapping> - - <!-- SpiceVersion_x64.txt --> <servlet> <servlet-name>SpiceVersion_x64.txt</servlet-name> <servlet-class>org.ovirt.engine.core.FileServlet</servlet-class> @@ -170,8 +145,6 @@ <servlet-name>SpiceVersion_x64.txt</servlet-name> <url-pattern>/spice/SpiceVersion_x64.txt</url-pattern> </servlet-mapping> - - <!-- USB filter: --> <servlet> <servlet-name>usbfilter.txt</servlet-name> <servlet-class>org.ovirt.engine.core.FileServlet</servlet-class> @@ -188,8 +161,6 @@ <servlet-name>usbfilter.txt</servlet-name> <url-pattern>/spice/usbfilter.txt</url-pattern> </servlet-mapping> - - <!-- Servlet for automatic registration of hypervisors: --> <servlet> <servlet-name>RegisterServlet</servlet-name> <servlet-class>org.ovirt.engine.core.register.RegisterServlet</servlet-class> @@ -200,10 +171,6 @@ <url-pattern>/OvirtEngineWeb/VdsAutoRegistration.aspx</url-pattern> <url-pattern>/RHEVManagerWeb/VdsAutoRegistration.aspx</url-pattern> </servlet-mapping> - - <!-- Servlet used by external applications (the notification service - and external clustering infrastructure) to check the health of - the engine: --> <servlet> <servlet-name>HealthStatus</servlet-name> <servlet-class>org.ovirt.engine.core.status.HealthStatus</servlet-class> @@ -213,8 +180,6 @@ <url-pattern>/OvirtEngineWeb/HealthStatus/*</url-pattern> <url-pattern>/OvirtEngineWeb/HealthStatus.aspx</url-pattern> </servlet-mapping> - - <!-- Redirect servlet (used by the reports integration): --> <servlet> <servlet-name>RedirectServlet</servlet-name> <servlet-class>org.ovirt.engine.core.redirect.RedirectServlet</servlet-class> @@ -223,9 +188,6 @@ <servlet-name>RedirectServlet</servlet-name> <url-pattern>/OvirtEngineWeb/RedirectServlet</url-pattern> </servlet-mapping> - - <!-- Servlet used to validate sessions (used by the reports - integration): --> <servlet> <servlet-name>ValidateSession</servlet-name> <servlet-class>org.ovirt.engine.core.validate.ValidateSession</servlet-class> @@ -234,8 +196,6 @@ <servlet-name>ValidateSession</servlet-name> <url-pattern>/OvirtEngineWeb/ValidateSession</url-pattern> </servlet-mapping> - - <!-- Branding Servlet --> <servlet> <servlet-name>BrandingServlet</servlet-name> <servlet-class>org.ovirt.engine.core.utils.branding.BrandingServlet</servlet-class> @@ -244,8 +204,14 @@ <servlet-name>BrandingServlet</servlet-name> <url-pattern>/ovirt-engine-theme/*</url-pattern> </servlet-mapping> - - <!-- Filters --> + <servlet> + <servlet-name>FaviconServlet</servlet-name> + <servlet-class>org.ovirt.engine.core.FaviconServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>FaviconServlet</servlet-name> + <url-pattern>/favicon.ico</url-pattern> + </servlet-mapping> <filter> <filter-name>LocaleFilter</filter-name> <filter-class>org.ovirt.engine.core.utils.servlet.LocaleFilter</filter-class> @@ -254,16 +220,11 @@ <filter-name>LocaleFilter</filter-name> <url-pattern>/ovirt-engine</url-pattern> </filter-mapping> - - <!-- Go to the index when a page is not found (preserving the - 404 status code): --> <error-page> <error-code>404</error-code> <location>/404.html</location> </error-page> - - <!-- This is handled by the welcome servlet --> <welcome-file-list> <welcome-file>ovirt-engine</welcome-file> </welcome-file-list> -</web-app> +</web-app> \ No newline at end of file diff --git a/backend/manager/modules/root/src/main/webapp/favicon.ico b/backend/manager/modules/root/src/main/webapp/favicon.ico deleted file mode 100644 index e0ab818..0000000 --- a/backend/manager/modules/root/src/main/webapp/favicon.ico +++ /dev/null Binary files differ -- To view, visit http://gerrit.ovirt.org/18200 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I929cf7d98fdf67de72b5aadded154d383febd666 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
