Repair Portal defects; upgrade Docker build.

PORTAL-39 Remove MojoHaus Maven plug-in from pom file
PORTAL-38 VID tab is not showing portal for VID
PORTAL-37 Portal cannot resolve UEB host vm1-message-router;
  use ueb.api.simpledemo.openecomp.org instead
PORTAL-36 Show Portal app version number in footer;
  unpack war file instead of copying directory
PORTAL-35 update ECOMP Portal to ONAP logo on login page
PORTAL-34 Portal partners (Policy, VID) got 404 on landing page;
  recognize process_csp as valid endpoint in Portal
PORTAL-30 Failed to communicate with the widget microservice;
  add configuration properties with widget-ms host name and protocol.

Issue: PORTAL-30, PORTAL-34, PORTAL-35, PORTAL-36, PORTAL-37, PORTAL-38, PORTAL-39
Change-Id: I1e53e4985266f736ddad4ed49b287a23178ea3c3
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

4 files changed, 19 insertions, 2 deletions

diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthServiceImpl.java
index 175a1c71..0cfa4f81 100644
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthServiceImpl.java
@@ -21,6 +21,7 @@ package org.openecomp.portalapp.portal.service;
 
 import java.util.List;
 
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.stereotype.Component;
 
@@ -44,7 +45,7 @@ public class ConsulHealthServiceImpl implements ConsulHealthService {
 			HealthClient healthClient = consul.healthClient();
 			nodes = healthClient.getHealthyServiceInstances(service).getResponse();
 		} catch (Exception e) {
-			String localFallbackServiceLocation = "localhost:" + fallbackPortOnLocalHost;
+			String localFallbackServiceLocation = EcompPortalUtils.localOrDockerHost() + ":" + fallbackPortOnLocalHost;
 			logger.debug(EELFLoggerDelegate.debugLogger,
 					" problem getting nodes for service {1}. Defaulting to {2}. Exception: {3}", service,
 					localFallbackServiceLocation, e.getMessage());
@@ -57,7 +58,7 @@ public class ConsulHealthServiceImpl implements ConsulHealthService {
 		if (nodes == null || nodes.size() == 0) {
 			logger.debug(EELFLoggerDelegate.debugLogger, "No healthy node found in the consul cluster running service " + service
 					+ ". Defaulting to localhost");
-			return "localhost:" + fallbackPortOnLocalHost;
+			return EcompPortalUtils.localOrDockerHost() + ":" + fallbackPortOnLocalHost;
 		} else {
 			String locationFromConsul;
 			ServiceHealth node = nodes.get(0);
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java
index 23bb3567..dd33bf6e 100644
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java
@@ -62,5 +62,6 @@ public class EPCommonSystemProperties extends SystemProperties {
 	public static final String AUTH_USER_SERVER 					= "auth_user_server";
 	public static final String EXTERNAL_ACCESS_ENABLE 				= "external_access_enable";
 	public static final String WIDGET_MS_PROTOCOL 					= "microservices.widget.protocol";
+	public static final String WIDGET_MS_HOSTNAME 					= "microservices.widget.hostname";
 
 }
\ No newline at end of file
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java
index 2b39da0a..d471d90b 100644
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java
@@ -354,5 +354,20 @@ public class EcompPortalUtils {
 			return "https";
 		}		
 	}
+	
+	public static String localOrDockerHost(){
+		final String effectiveHost;
+		try{
+			effectiveHost = SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_HOSTNAME);
+			return (effectiveHost == null || effectiveHost.trim().equals("")) ? "localhost" : effectiveHost ;
+		}
+		catch(IllegalStateException ese){
+			//looks like SystemProperties.getProperty throws IllegalStateException if it cannot find a property you are looking for
+			//In order to not break the code if a non-required property is missing from system.properties, returning https as default
+			//when this exception is caught.
+			return "localhost";
+		}		
+	}
+
 
 }
diff --git a/ecomp-portal-BE-common/src/main/webapp/static/fusion/images/onap-portal-logo.png b/ecomp-portal-BE-common/src/main/webapp/static/fusion/images/onap-portal-logo.png
new file mode 100644
index 00000000..f48d3d47
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/webapp/static/fusion/images/onap-portal-logo.png