fix a bug reported by Hani Hankir in OFBIZ-8097

This is a bug in which createTenant crashes due to groovy gstring
evaluation where a string is needed. The fix is simple by removing
gstring and passing variables directly.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758662 13f79535-47bb-0310-9956-ffa450edef68

build.gradle

@@ -374,11 +374,11 @@ task createTenant(group: ofbizServer, description: 'Create a new tenant in your
 
     task generateDatabaseTemplateFile(dependsOn: prepareAndValidateTenantArguments) << {
         def filterTokens = ['tenantId': tenantId,
-            'tenantName': project.hasProperty('tenantName')? "${tenantName}":tenantId,
-            'domainName': project.hasProperty('domainName')? "${domainName}":'org.apache.ofbiz',
-            'db-IP': project.hasProperty('dbIp')? "${dbIp}":'',
-            'db-User': project.hasProperty('dbUser')? "${dbUser}":'',
-            'db-Password': project.hasProperty('dbPassword')? "${dbPassword}":'']
+            'tenantName': project.hasProperty('tenantName')? tenantName : tenantId,
+            'domainName': project.hasProperty('domainName')? domainName : 'org.apache.ofbiz',
+            'db-IP': project.hasProperty('dbIp')? dbIp : '',
+            'db-User': project.hasProperty('dbUser')? dbUser : '',
+            'db-Password': project.hasProperty('dbPassword')? dbPassword : '']
 
         generateFileFromTemplate(databaseTemplateFile, 'runtime/tmp',
             filterTokens, 'tmpFilteredTenantData.xml')