Frank Kobzik has uploaded a new change for review.
Change subject: engine: change path of console descriptors
......................................................................
engine: change path of console descriptors
This patch changes the path from which console descriptors are served
(from console/console.* to ovirt-engine-attachment/console.*).
The configuration of apache proxy is modified accordingly.
Change-Id: Ib35c02a8edb1dd638d4062e4e33854b4df139547
Signed-off-by: Frantisek Kobzik <fkob...@redhat.com>
---
M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java
M packaging/conf/ovirt-engine-proxy.conf.in
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/15727/1
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 431b27a..f0c4c85 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
@@ -54,7 +54,7 @@
</servlet>
<servlet-mapping>
<servlet-name>GetAttachmentServlet</servlet-name>
- <url-pattern>/console/*</url-pattern>
+ <url-pattern>/ovirt-engine-attachment/*</url-pattern>
</servlet-mapping>
<!-- Documentation: -->
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java
index 5064260..fa7040c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java
@@ -29,7 +29,7 @@
public abstract class ConsoleModel extends EntityModel {
public static final String EjectLabel = "[" +
ConstantsManager.getInstance().getConstants().eject() + "]"; //$NON-NLS-1$
//$NON-NLS-2$
- public static final String GET_ATTACHMENT_SERVLET_URL = "/console/";
//$NON-NLS-1$
+ public static final String GET_ATTACHMENT_SERVLET_URL =
"/ovirt-engine-attachment/"; //$NON-NLS-1$
public static EventDefinition ErrorEventDefinition;
private Event privateErrorEvent;
diff --git a/packaging/conf/ovirt-engine-proxy.conf.in
b/packaging/conf/ovirt-engine-proxy.conf.in
index a9ce1ef..b7e14b6 100644
--- a/packaging/conf/ovirt-engine-proxy.conf.in
+++ b/packaging/conf/ovirt-engine-proxy.conf.in
@@ -25,7 +25,7 @@
ProxyPass ajp://localhost:@JBOSS_AJP_PORT@/
</Location>
- <LocationMatch
^/(UserPortal($|/)|OvirtEngineWeb($|/)|webadmin($|/)|docs($|/)|ovirt-engine-novnc($|/)|ovirt-engine-novnc-main.html$|spice/|ca.crt$|engine.ssh.key.txt$|rhevm.ssh.key.txt$|ovirt-engine-style.css$|console.vv$)>
+ <LocationMatch
^/(UserPortal($|/)|OvirtEngineWeb($|/)|webadmin($|/)|docs($|/)|ovirt-engine-novnc($|/)|ovirt-engine-novnc-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/15727
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib35c02a8edb1dd638d4062e4e33854b4df139547
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <fkob...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
