Frank Kobzik has uploaded a new change for review. Change subject: frontend: Small changes related to console client resources page ......................................................................
frontend: Small changes related to console client resources page - make console client resources locale-aware - add virt viewer and usbclerk path config to web.xml Change-Id: Id2c347530423983225b77349e994c09d6b4cb0ba Signed-off-by: Frantisek Kobzik <[email protected]> --- M Makefile M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java M packaging/services/ovirt-engine/ovirt-engine.conf.in 4 files changed, 86 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/19451/1 diff --git a/Makefile b/Makefile index e8c936f..7779120 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,11 @@ PKG_TMP_DIR=$(LOCALSTATE_DIR)/tmp/$(ENGINE_NAME) PKG_STATE_DIR=$(LOCALSTATE_DIR)/lib/$(ENGINE_NAME) SPICE_DIR=/usr/share/spice +VIRT_VIEWER_X86="/usr/share/spice/virt-viewer-x86.msi" +VIRT_VIEWER_X64="/usr/share/spice/virt-viewer-x64.msi" +USBCLERK_X86="/usr/share/spice/usbclerk-x86.msi" +USBCLERK_X64="/usr/share/spice/usbclerk-x64.msi" + JBOSS_HOME=/usr/share/jboss-as PYTHON_DIR=$(PYTHON_SYS_DIR) DEV_PYTHON_DIR= @@ -148,6 +153,10 @@ -e "s|@PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \ -e "s|@DISPLAY_VERSION@|$(DISPLAY_VERSION)|g" \ -e "s|@SPICE_DIR@|$(SPICE_DIR)|g" \ + -e "s|@VIRT_VIEWER_X86@|$(VIRT_VIEWER_X86)|g" \ + -e "s|@VIRT_VIEWER_X64@|$(VIRT_VIEWER_X64)|g" \ + -e "s|@USBCLERK_X86@|$(USBCLERK_X86)|g" \ + -e "s|@USBCLERK_X64@|$(USBCLERK_X64)|g" \ -e "s|@JBOSS_HOME@|$(JBOSS_HOME)|g" \ $< > $@ 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 8c92a34..c98427e 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 @@ -171,6 +171,78 @@ <url-pattern>/spice/SpiceVersion_x64.txt</url-pattern> </servlet-mapping> + <!-- virt-viewer-x86 --> + <servlet> + <servlet-name>virt-viewer-x86</servlet-name> + <servlet-class>org.ovirt.engine.core.FileServlet</servlet-class> + <init-param> + <param-name>type</param-name> + <param-value>application/octet-stream</param-value> + </init-param> + <init-param> + <param-name>file</param-name> + <param-value>%{VIRT_VIEWER_X86}</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>virt-viewer-x86</servlet-name> + <url-pattern>/spice/virt-viewer-x86.msi</url-pattern> + </servlet-mapping> + + <!-- virt-viewer-x64 --> + <servlet> + <servlet-name>virt-viewer-x64</servlet-name> + <servlet-class>org.ovirt.engine.core.FileServlet</servlet-class> + <init-param> + <param-name>type</param-name> + <param-value>application/octet-stream</param-value> + </init-param> + <init-param> + <param-name>file</param-name> + <param-value>%{VIRT_VIEWER_X64}</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>virt-viewer-x64</servlet-name> + <url-pattern>/spice/virt-viewer-x64.msi</url-pattern> + </servlet-mapping> + + <!-- usbclerk-x86 --> + <servlet> + <servlet-name>usbclerk-x86</servlet-name> + <servlet-class>org.ovirt.engine.core.FileServlet</servlet-class> + <init-param> + <param-name>type</param-name> + <param-value>application/octet-stream</param-value> + </init-param> + <init-param> + <param-name>file</param-name> + <param-value>%{USBCLERK_X86}</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>usbclerk-x86</servlet-name> + <url-pattern>/spice/usbclerk-x86.msi</url-pattern> + </servlet-mapping> + + <!-- usbclerk-x64 --> + <servlet> + <servlet-name>usbclerk-x64</servlet-name> + <servlet-class>org.ovirt.engine.core.FileServlet</servlet-class> + <init-param> + <param-name>type</param-name> + <param-value>application/octet-stream</param-value> + </init-param> + <init-param> + <param-name>file</param-name> + <param-value>%{USBCLERK_X64}</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>usbclerk-x64</servlet-name> + <url-pattern>/spice/usbclerk-x64.msi</url-pattern> + </servlet-mapping> + <!-- USB filter: --> <servlet> <servlet-name>usbfilter.txt</servlet-name> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java index a680326..452c3d3 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java @@ -306,7 +306,7 @@ * @return The console client resources page url. */ public final String consoleClientResourcesUrl() { - return getString(DynamicMessageKey.CONSOLE_CLIENT_RESOURCES_URL); + return formatString(DynamicMessageKey.CONSOLE_CLIENT_RESOURCES_URL, LocaleInfo.getCurrentLocale().getLocaleName()); } /** diff --git a/packaging/services/ovirt-engine/ovirt-engine.conf.in b/packaging/services/ovirt-engine/ovirt-engine.conf.in index 30a760c..5a86fdf 100644 --- a/packaging/services/ovirt-engine/ovirt-engine.conf.in +++ b/packaging/services/ovirt-engine/ovirt-engine.conf.in @@ -37,6 +37,10 @@ ENGINE_NOVNC_DIR="/usr/share/novnc" ENGINE_SPICE_HTML5_DIR="/usr/share/spice-html5" ENGINE_MANUAL="${ENGINE_DOC}/manual" +VIRT_VIEWER_X86="@VIRT_VIEWER_X86@" +VIRT_VIEWER_X64="@VIRT_VIEWER_X64@" +USBCLERK_X86="@USBCLERK_X86@" +USBCLERK_X64="@USBCLERK_X64@" # # A file created on init and removed on orderly shutdown -- To view, visit http://gerrit.ovirt.org/19451 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2c347530423983225b77349e994c09d6b4cb0ba Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
