Itamar Heim has submitted this change and it was merged. Change subject: engine: root.war cleanup ...................................................................... engine: root.war cleanup - Fixed minor text issue in message, replaced 'pack' with the word documentation to be more consistent. - i18ned the message so they can be translated. - Fixed issue where the locale in the links would have an underscore, while the documentation would contain a dash. This caused the message to popup even though the documentation was installed. Fixed it so it no longer matters if the link has an underscore or dash in it, both will correctly determine if the language is available. - Added DocsMissingServlet that displays branded page notifying the user that the documentation in their locale is missing. - Fixed missing documentation JSP to remove references to documenation style sheets and links. - When DocsServlet determines the documentation is missing it forwards control to the missing documentation servlet. - Put branding theme paths in web.xml - Added tags for common branding patterns. - Removed 404 page from branding, as none of the messages in there are brand related. the messages are added to the root messages - Removed 404 servlet as it was no longer needed. - Added branding module to consolidate all branding related code into a single package, allowing it to be easily shared between applications. - Added PageNotFoundForwardServlet to allow other applications to forward their 404 to the root 404 handler. Change-Id: Iceae0ebf671efc951522c464db1a5b2b95dd5637 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1011430 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1010743 Signed-off-by: Alexander Wels <awels@redhat.com> --- A backend/manager/modules/branding/exclude-filters.xml A backend/manager/modules/branding/pom.xml R backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingCascadingResourceServlet.java R backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingFilter.java R backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingManager.java R backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingResourceBundle.java R backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingServlet.java R backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingTheme.java R backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/CascadingResource.java A backend/manager/modules/branding/src/main/resources/META-INF/obrand.tld A backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/favicon.tag A backend/manager/modules/branding/src/main/resources/META-INF/tags/obrand/stylesheets.tag R backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingCascadingResourceServletTest.java R backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingFilterTest.java R backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingManagerTest.java R backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingServletTest.java R backend/manager/modules/branding/src/test/java/org/ovirt/engine/core/branding/BrandingThemeTest.java R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/branding.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/images/favicon.ico R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/messages.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/messages_fr.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/01-test.brand/resources.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/branding.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/images/favicon.ico R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/messages.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/messages_fr.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/02-test2.brand/resources.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/03-test3.brand/branding.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/03-test3.brand/messages.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/03-test3.brand/messages_fr.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/03-test3.brand/resources.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/04-test4.brand/branding.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/04-test4.brand/messages.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/04-test4.brand/messages_fr.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/05-test5.brand/branding.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/05-test5.brand/messages.properties R backend/manager/modules/branding/src/test/resources/org/ovirt/engine/core/branding/05-test5.brand/messages_fr.properties M backend/manager/modules/pom.xml M backend/manager/modules/restapi/jaxrs/pom.xml M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java M backend/manager/modules/restapi/webapp/pom.xml M backend/manager/modules/root/pom.xml M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/DocsServlet.java M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java A backend/manager/modules/root/src/main/resources/messages.properties D backend/manager/modules/root/src/main/webapp/404.jsp A backend/manager/modules/root/src/main/webapp/WEB-INF/404.jsp D backend/manager/modules/root/src/main/webapp/WEB-INF/help/no_lang.jsp A backend/manager/modules/root/src/main/webapp/WEB-INF/no_lang.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/root/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java A backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/PageNotFoundForwardServlet.java D backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/PageNotFoundServlet.java D backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/PageNotFoundServletTest.java M frontend/webadmin/modules/frontend/pom.xml M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/UserPortalHostPageServlet.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java D frontend/webadmin/modules/frontend/src/main/resources/META-INF/resources/404.jsp M frontend/webadmin/modules/frontend/src/main/resources/META-INF/resources/GwtHostPage.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/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/UserPortalHostPageServletTest.java M frontend/webadmin/modules/userportal-gwtp/pom.xml M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml M frontend/webadmin/modules/webadmin/pom.xml M frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml M packaging/branding/ovirt.brand/branding.properties M packaging/branding/ovirt.brand/messages.properties 70 files changed, 564 insertions(+), 420 deletions(-) Approvals: Itamar Heim: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/20557 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iceae0ebf671efc951522c464db1a5b2b95dd5637 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Alexander Wels <awels@redhat.com> Gerrit-Reviewer: Alexander Wels <awels@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Einav Cohen <ecohen@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Itamar Heim <iheim@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez@redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs@redhat.com> Gerrit-Reviewer: automation@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server