Author: taher
Date: Wed Aug 31 18:41:51 2016
New Revision: 1758662
URL: http://svn.apache.org/viewvc?rev=1758662&view=rev
Log:
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.
Modified:
ofbiz/trunk/build.gradle
Modified: ofbiz/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/build.gradle?rev=1758662&r1=1758661&r2=1758662&view=diff
==============================================================================
--- ofbiz/trunk/build.gradle (original)
+++ ofbiz/trunk/build.gradle Wed Aug 31 18:41:51 2016
@@ -374,11 +374,11 @@ task createTenant(group: ofbizServer, de
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')
