Alon Bar-Lev has uploaded a new change for review.
Change subject: root: branding: integrate properly with apache proxy
......................................................................
root: branding: integrate properly with apache proxy
Change-Id: I6b2f6bf069b14b47d8128d2739e965b33888c1c0
Signed-off-by: Alon Bar-Lev <alo...@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
M packaging/branding/ovirt.brand/welcome_page.template
M packaging/conf/ovirt-engine-proxy.conf.v2.in
4 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/17567/1
diff --git
a/backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
b/backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
index e9a659b..2c61aef 100644
--- a/backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
+++ b/backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
@@ -10,7 +10,7 @@
<c:if test="${requestScope['brandingStyle'] != null}">
<c:forEach items="${requestScope['brandingStyle']}" var="theme">
<c:if
test="${theme.getThemeStyleSheet(requestScope['applicationType']) != null}">
- <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/theme${theme.path}/${theme.getThemeStyleSheet(requestScope['applicationType'])}">
+ <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/ovirt-engine-theme${theme.path}/${theme.getThemeStyleSheet(requestScope['applicationType'])}">
</c:if>
</c:forEach>
</c:if>
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 c13bae1..b797367 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
@@ -242,7 +242,7 @@
</servlet>
<servlet-mapping>
<servlet-name>BrandingServlet</servlet-name>
- <url-pattern>/theme/*</url-pattern>
+ <url-pattern>/ovirt-engine-theme/*</url-pattern>
</servlet-mapping>
<!-- Filters -->
diff --git a/packaging/branding/ovirt.brand/welcome_page.template
b/packaging/branding/ovirt.brand/welcome_page.template
index 5adbc5d..1930bef 100644
--- a/packaging/branding/ovirt.brand/welcome_page.template
+++ b/packaging/branding/ovirt.brand/welcome_page.template
@@ -3,12 +3,12 @@
<span class="obrand_section_header">{portal_title}</span>
</h2>
<div>
- <a
href="UserPortal/org.ovirt.engine.ui.userportal.UserPortal/UserPortal.html?locale={userLocale}">{portal_user_portal}</a>
+ <a
href="/UserPortal/org.ovirt.engine.ui.userportal.UserPortal/UserPortal.html?locale={userLocale}">{portal_user_portal}</a>
</div>
<div>
- <a
href="webadmin/webadmin/WebAdmin.html?locale={userLocale}">{portal_admin}</a>
+ <a
href="/webadmin/webadmin/WebAdmin.html?locale={userLocale}">{portal_admin}</a>
</div>
<div>
- <a href="OvirtEngineWeb/RedirectServlet?Page=Reports">{portal_reports}</a>
+ <a href="/OvirtEngineWeb/RedirectServlet?Page=Reports">{portal_reports}</a>
</div>
</div>
diff --git a/packaging/conf/ovirt-engine-proxy.conf.v2.in
b/packaging/conf/ovirt-engine-proxy.conf.v2.in
index a24cfca..a32263a 100644
--- a/packaging/conf/ovirt-engine-proxy.conf.v2.in
+++ b/packaging/conf/ovirt-engine-proxy.conf.v2.in
@@ -41,7 +41,7 @@
ProxyPass ajp://localhost:@JBOSS_AJP_PORT@/
</Location>
- <LocationMatch
^/(UserPortal($|/)|OvirtEngineWeb($|/)|webadmin($|/)|docs($|/)|ovirt-engine-novnc/|ovirt-engine-novnc-main.html$|ovirt-engine-spicehtml5/|ovirt-engine-spicehtml5-main.html$|spice/|ca.crt$|engine.ssh.key.txt$|rhevm.ssh.key.txt$|ovirt-engine-style.css$|ovirt-engine-attachment/)>
+ <LocationMatch
^/(UserPortal($|/)|OvirtEngineWeb($|/)|webadmin($|/)|docs($|/)|ovirt-engine-novnc/|ovirt-engine-novnc-main.html$|ovirt-engine-theme/|ovirt-engine-spicehtml5/|ovirt-engine-spicehtml5-main.html$|spice/|ca.crt$|engine.ssh.key.txt$|rhevm.ssh.key.txt$|ovirt-engine-style.css$|ovirt-engine-attachment/)>
ProxyPassMatch ajp://localhost:@JBOSS_AJP_PORT@
<IfModule deflate_module>
AddOutputFilterByType DEFLATE text/javascript text/css text/html
text/xml text/json application/xml application/json application/x-yaml
--
To view, visit http://gerrit.ovirt.org/17567
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b2f6bf069b14b47d8128d2739e965b33888c1c0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
