[Engine-patches] Change in ovirt-engine[master]: core: calculate console_client_resources_url if not provided

[tjelinek]

Tomas Jelinek has uploaded a new change for review.

Change subject: core: calculate console_client_resources_url if not provided
......................................................................

core: calculate console_client_resources_url if not provided

Change-Id: I41542d6653f3102cd3908bddeb25b3277dd219bc
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
M backend/manager/modules/bll/pom.xml
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ConfigureConsoleOptionsQuery.java
M ear/src/main/application/META-INF/jboss-deployment-structure.xml
3 files changed, 17 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/42273/1

diff --git a/backend/manager/modules/bll/pom.xml 
b/backend/manager/modules/bll/pom.xml
index cce44d3..ee53778 100644
--- a/backend/manager/modules/bll/pom.xml
+++ b/backend/manager/modules/bll/pom.xml
@@ -192,6 +192,12 @@
           <version>${hamcrest.version}</version>
           <scope>test</scope>
       </dependency>
+
+      <dependency>
+          <groupId>org.ovirt.engine.core</groupId>
+          <artifactId>branding</artifactId>
+          <version>${engine.version}</version>
+      </dependency>
   </dependencies>
 
   <build>
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ConfigureConsoleOptionsQuery.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ConfigureConsoleOptionsQuery.java
index 754e1e2..e861963 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ConfigureConsoleOptionsQuery.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ConfigureConsoleOptionsQuery.java
@@ -1,6 +1,7 @@
 package org.ovirt.engine.core.bll;
 
 import org.apache.commons.lang.StringUtils;
+import org.ovirt.engine.core.branding.BrandingManager;
 import org.ovirt.engine.core.common.action.SetVmTicketParameters;
 import org.ovirt.engine.core.common.action.VdcActionType;
 import org.ovirt.engine.core.common.action.VdcReturnValueBase;
@@ -128,13 +129,21 @@
         }
 
         String engineBaseUrlString = 
calculateEngineBaseUrl(sanitizeUrl(getParameters().getEngineBaseUrl()));
-        String consoleClientResourcesUrl = 
sanitizeUrl(getParameters().getConsoleClientResourcesUrl());
+        String consoleClientResourcesUrl = 
calculateResourcesUrl(sanitizeUrl(getParameters().getConsoleClientResourcesUrl()));
 
         
options.setRemoteViewerSupportedVersions(remoteViewerSupportedVersions);
 
         fillRemoteViewerUrl(options, remoteViewerNewerVersionUrl, 
engineBaseUrlString, consoleClientResourcesUrl);
     }
 
+    private String calculateResourcesUrl(String passedUrl) {
+        if (!StringUtils.isEmpty(passedUrl)) {
+            return passedUrl;
+        }
+
+        return 
sanitizeUrl(BrandingManager.getInstance().getMessage("obrand.common.console_client_resources_url"));
+    }
+
     /**
      * If passed explicitly, just return it. If not, return the one calculated 
from ENGINE_FQDN and ENGINE_PROXY_HTTPS_PORT
      */
diff --git a/ear/src/main/application/META-INF/jboss-deployment-structure.xml 
b/ear/src/main/application/META-INF/jboss-deployment-structure.xml
index 86c6595..7120494 100644
--- a/ear/src/main/application/META-INF/jboss-deployment-structure.xml
+++ b/ear/src/main/application/META-INF/jboss-deployment-structure.xml
@@ -13,6 +13,7 @@
       <module name="org.ovirt.engine.core.dal" export="true" 
meta-inf="import"/>
       <module name="org.ovirt.engine.core.aaa" export="true" 
meta-inf="import"/>
       <module name="org.ovirt.engine.extensions.builtin" export="true" 
meta-inf="import"/>
+      <module name="org.ovirt.engine.core.branding" export="true" 
meta-inf="import"/>
     </dependencies>
   </deployment>
 </jboss-deployment-structure>


-- 
To view, visit https://gerrit.ovirt.org/42273
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41542d6653f3102cd3908bddeb25b3277dd219bc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches