Change in ovirt-engine[master]: core: re-support broken apache proxy

[yzaslavs at redhat.com]

Yair Zaslavsky has submitted this change and it was merged.

Change subject: core: re-support broken apache proxy
......................................................................


core: re-support broken apache proxy

apache proxy support was broken in:
I37156061cbdd, 'core: i18n splash screen.'

The changed cause invalid redirection and the following error message in
console log:
---
Exception while dispatching incoming RPC call:
java.lang.SecurityException: Blocked request without GWT base path
header (XSRF attack?)
---

Content:

1. Remove unused ovirt-engine.html (what was index.html) as it is
   superseded by index.jsp

2. Remove redundant welcome directive from web.xml

3. Rename /index.jsp to /ovirt-engine.jsp to be referenced by both
   apache and jboss.

4. Rename servlet mapping of /index to /ovirt-engine.

5. Modify 404.html pages to redirect to /ovirt-engine instead of
   /ovirt-engine.html

6. Remove reference of ovirt-engine.html from the proxy.

Change-Id: I7ac8feb720d73f0b1107b0bf0908930c525ea542
Signed-off-by: Alon Bar-Lev <alonbl at redhat.com>
---
M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/SplashServlet.java
M backend/manager/modules/root/src/main/webapp/404.html
R backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml
D backend/manager/modules/root/src/main/webapp/ovirt-engine.html
M backend/manager/modules/root/src/test/java/org/ovirt/engine/core/SplashServletTest.java
M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/404.html
M frontend/webadmin/modules/webadmin/src/main/webapp/404.html
M packaging/fedora/setup/ovirt-engine-proxy.conf.in
9 files changed, 14 insertions(+), 74 deletions(-)

Approvals:
  Yair Zaslavsky: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ac8feb720d73f0b1107b0bf0908930c525ea542
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Alexander Wels <awels at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Daniel Erez <derez at redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen at redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs at redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs at redhat.com>