Change in ovirt-engine[master]: userportal, webadmin: added branding cascading resource servlet

[ecohen at redhat.com]

Einav Cohen has submitted this change and it was merged.

Change subject: userportal, webadmin: added branding cascading resource servlet
......................................................................


userportal, webadmin: added branding cascading resource servlet

- Added BrandingCascadingResourceServlet to serve cascaded images and
other resources outside of CSS.
- Added favicon.ico serving in host page and root page.

Change-Id: I1dcd9d0f22a7c5867c39576020ad16dd6c53deda
Bug-Url: https://bugzilla.redhat.com/997547
Signed-off-by: Greg Sheremeta <gshereme at redhat.com>
---
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
A backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingCascadingResourceServlet.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingManager.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/branding/CascadingResource.java
A backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/branding/BrandingCascadingResourceServletTest.java
M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/branding/BrandingManagerTest.java
M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/branding/BrandingThemeTest.java
M backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/01-test.brand/branding.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/01-test.brand/images/favicon.ico
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/01-test.brand/resources.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/02-test2.brand/branding.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/02-test2.brand/images/favicon.ico
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/02-test2.brand/messages.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/02-test2.brand/messages_fr.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/02-test2.brand/resources.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/03-test3.brand/branding.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/03-test3.brand/messages.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/03-test3.brand/messages_fr.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/03-test3.brand/resources.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/04-test4.brand/branding.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/04-test4.brand/messages.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/04-test4.brand/messages_fr.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/05-test5.brand/branding.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/05-test5.brand/messages.properties
A backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/branding/05-test5.brand/messages_fr.properties
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/userportal-gwtp/src/main/webapp/WEB-INF/web.xml
M frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml
M packaging/branding/ovirt.brand/branding.properties
R packaging/branding/ovirt.brand/images/favicon.ico
A packaging/branding/ovirt.brand/resources.properties
M packaging/conf/ovirt-engine-proxy.conf.v2.in
35 files changed, 591 insertions(+), 5 deletions(-)

Approvals:
  Einav Cohen: Verified; Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/18385
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1dcd9d0f22a7c5867c39576020ad16dd6c53deda
Gerrit-PatchSet: 10
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Sheremeta <gshereme at redhat.com>
Gerrit-Reviewer: Alexander Wels <awels at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen at redhat.com>
Gerrit-Reviewer: Greg Sheremeta <gshereme at redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server