Skip to content

Commit 8c4836b

Browse files
committed
Improved: Provide multi-arguments to the ‘Exec#args’ method
Previously only one argument at a time was passed to the ‘Exec#args’ method. Since it is possible to pass multiple arguments we can remove some syntax redudancy. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1855678 13f79535-47bb-0310-9956-ffa450edef68
1 parent 2b77397 commit 8c4836b

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

build.gradle

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -383,16 +383,13 @@ task loadTenant(group: ofbizServer, description: 'Load data using tenantId') {
383383
createOfbizCommandTask('executeLoadTenant', [], jvmArguments, false)
384384

385385
if (project.hasProperty('tenantId')) {
386-
executeLoadTenant.args '--load-data'
387-
executeLoadTenant.args "delegator=default#${tenantId}"
386+
executeLoadTenant.args '--load-data', "delegator=default#${tenantId}"
388387
}
389388
if (project.hasProperty('tenantReaders')) {
390-
executeLoadTenant.args '--load-data'
391-
executeLoadTenant.args "readers=${tenantReaders}"
389+
executeLoadTenant.args '--load-data', "readers=${tenantReaders}"
392390
}
393391
if (project.hasProperty('tenantComponent')) {
394-
executeLoadTenant.args '--load-data'
395-
executeLoadTenant.args "component=${tenantComponent}"
392+
executeLoadTenant.args '--load-data', "component=${tenantComponent}"
396393
}
397394

398395
executeLoadTenant.doFirst {
@@ -472,17 +469,14 @@ task createTenant(group: ofbizServer, description: 'Create a new tenant in your
472469
* because we are in the configuration phase. We cannot
473470
* set the parameters at the execution phase. */
474471
if (project.hasProperty('tenantId')) {
475-
loadTenantData.args '--load-data'
476-
loadTenantData.args "delegator=default#${tenantId}"
477-
478-
loadTenantAdminUserLogin.args '--load-data'
479-
loadTenantAdminUserLogin.args "delegator=default#${tenantId}"
480-
loadTenantAdminUserLogin.args '--load-data'
481-
loadTenantAdminUserLogin.args "file=${rootDir}/runtime/tmp/tmpFilteredUserLogin.xml"
472+
loadTenantData.args '--load-data', "delegator=default#${tenantId}"
473+
loadTenantAdminUserLogin.args(
474+
'--load-data', "delegator=default#${tenantId}",
475+
'--load-data', "file=${rootDir}/runtime/tmp/tmpFilteredUserLogin.xml"
476+
)
482477
}
483478
if (project.hasProperty('tenantReaders')) {
484-
loadTenantData.args '--load-data'
485-
loadTenantData.args "readers=${tenantReaders}"
479+
loadTenantData.args '--load-data', "readers=${tenantReaders}"
486480
}
487481

488482
dependsOn(loadTenantAdminUserLogin)
@@ -996,9 +990,7 @@ def createOfbizCommandTask(taskName, arguments, jvmArguments, isDebugMode) {
996990
debug = isDebugMode
997991
classpath = files(ofbizJarName)
998992
main = ofbizMainClass
999-
arguments.each { argument ->
1000-
args argument
1001-
}
993+
args arguments
1002994

1003995
if (taskName ==~ /^ofbiz.*--test.*/
1004996
|| taskName ==~ /^ofbiz.*-t.*/) {

0 commit comments

Comments
 (0)