From d00620368ececc583cec2838ff40957d6ee530c7 Mon Sep 17 00:00:00 2001
From: Dmytro Dovbii <ddovbii@mirantis.com>
Date: Wed, 14 Sep 2016 17:40:50 +0300
Subject: [PATCH] Fix wrong usage of join()

Change-Id: Iebb70cea8483b6f0a577ab6b8d8015c39fba6345
Closes-Bug: #1623006
(cherry picked from commit 493ce1927faecf90650dac9e050b4c216f8c7823)
---
 .../GlassFish/package/Classes/DockerGlassFish.yaml | 14 +++++++-------
 .../JBoss/package/Classes/DockerJBoss.yaml         | 11 ++++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Applications/GlassFish/package/Classes/DockerGlassFish.yaml b/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
index 59b39ec..3a592b0 100644
--- a/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
+++ b/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
@@ -63,19 +63,19 @@ Methods:
     Body:
       - If: $.publish
         Then:
-          - $adminEndpoints: join(', ', $.applicationEndpoints.
+          - $adminEndpoints: $.applicationEndpoints.
               where($.scope = $this._scope and $.containerPort = 4848).
-              select(format('http://{0}:{1}', $.address, $.port)))
-          - $httpEndpoints: join(', ', $.applicationEndpoints.
+              select(format('http://{0}:{1}', $.address, $.port))
+          - $httpEndpoints: $.applicationEndpoints.
               where($.scope = $this._scope and $.containerPort = 8080).
-              select(format('http://{0}:{1}', $.address, $.port)))
-          - $httpsEndpoints: join(', ', $.applicationEndpoints.
+              select(format('http://{0}:{1}', $.address, $.port))
+          - $httpsEndpoints: $.applicationEndpoints.
               where($.scope = $this._scope and $.containerPort = 8181).
-              select(format('https://{0}:{1}', $.address, $.port)))
+              select(format('https://{0}:{1}', $.address, $.port))
 
           - $._environment.reporter.report(
               $this,
               'GlassFish {0} is available at {1} (admin) and {2} + {3} (apps)'.format(
-                $.name, $adminEndpoints, $httpEndpoints, $httpsEndpoints))
+                $.name, $adminEndpoints.join(', '), $httpEndpoints.join(', '), $httpsEndpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'GlassFish {0} has deployed but is not accessible from outside'.format($.name))
diff --git a/Applications/JBoss/package/Classes/DockerJBoss.yaml b/Applications/JBoss/package/Classes/DockerJBoss.yaml
index 1faf49f..6154cd1 100644
--- a/Applications/JBoss/package/Classes/DockerJBoss.yaml
+++ b/Applications/JBoss/package/Classes/DockerJBoss.yaml
@@ -61,14 +61,15 @@ Methods:
     Body:
       - If: $.publish
         Then:
-          - $adminEndpoints: join(', ', $.applicationEndpoints.
+          - $adminEndpoints: $.applicationEndpoints.
               where($.scope = $this._scope and $.containerPort = 9990).
-              select(format('http://{0}:{1}', $.address, $.port)))
-          - $httpEndpoints: join(', ', $.applicationEndpoints.
+              select(format('http://{0}:{1}', $.address, $.port))
+          - $httpEndpoints: $.applicationEndpoints.
               where($.scope = $this._scope and $.containerPort = 8080).
-              select(format('http://{0}:{1}', $.address, $.port)))
+              select(format('http://{0}:{1}', $.address, $.port))
           - $._environment.reporter.report(
               $this,
-              'JBoss {0} is available at {1} (admin) and {2} (apps)'.format($.name, $adminEndpoints, $httpEndpoints))
+              'JBoss {0} is available at {1} (admin) and {2} (apps)'.format(
+                $.name, $adminEndpoints.join(', '), $httpEndpoints.join(', ')))
         Else:
           - $._environment.reporter.report($this, 'JBoss {0} has deployed but is not accessible from outside'.format($.name))