Einav Cohen has submitted this change and it was merged. Change subject: userportal,webadmin: brand 404 error pages. ...................................................................... userportal,webadmin: brand 404 error pages. - Fixed broken 404 error page style sheet links. - Used same styling for 404 error pages as the welcome page. - The messages are now brandable and i18ned - Removed automatic redirect to welcome page. - Added BrandingFilter that automatically passes branding information to the servlets. Change-Id: I3b0406ab6dea4a2cacebd4ad6e62c8bb7a0d44c0 Signed-off-by: Alexander Wels <awels(a)redhat.com&gt; --- M backend/manager/modules/root/pom.xml M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java D backend/manager/modules/root/src/main/webapp/404.html A backend/manager/modules/root/src/main/webapp/404.jsp M backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml M backend/manager/modules/utils/pom.xml M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingManager.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingResourceBundle.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingTheme.java A backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/BrandingFilter.java A backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/PageNotFoundServlet.java M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml A backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/BrandingFilterTest.java A backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/PageNotFoundServletTest.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java A frontend/webadmin/modules/frontend/src/main/resources/META-INF/resources/404.jsp M frontend/webadmin/modules/frontend/src/main/resources/META-INF/web-fragment.xml M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java M frontend/webadmin/modules/userportal-gwtp/pom.xml D frontend/webadmin/modules/userportal-gwtp/src/main/webapp/404.html M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml M frontend/webadmin/modules/webadmin/pom.xml D frontend/webadmin/modules/webadmin/src/main/webapp/404.html M frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml M packaging/branding/ovirt.brand/messages.properties 26 files changed, 463 insertions(+), 120 deletions(-) Approvals: Einav Cohen: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/18196 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b0406ab6dea4a2cacebd4ad6e62c8bb7a0d44c0 Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <awels(a)redhat.com&gt; Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com&gt; Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com&gt; Gerrit-Reviewer: Greg Sheremeta <gshereme(a)redhat.com&gt; Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com&gt; Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server