Skip to content

Commit 376e2b1

Browse files
committed
Feature #12861: playing cli scripts as a sorted way in order to allow production environment managers to perform execution priority between cli scripts.
1 parent e99d884 commit 376e2b1

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

src/main/groovy/org/silverpeas/setup/configuration/JBossConfigurationTask.groovy

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,17 +164,20 @@ class JBossConfigurationTask extends SilverpeasSetupTask {
164164
Files.createTempFile('jboss-configuration-', '.cli').toString())
165165
log.info "CLI configuration scripts will be merged into ${cliScript.toFile().name}"
166166
Set<Script> scripts = new HashSet<>()
167-
config.jbossConfigurationDir.get().listFiles(new FileFilter() {
168-
@Override
169-
boolean accept(final File child) {
170-
return child.isFile()
171-
}
172-
}).each { File confFile ->
173-
log.info "Load configuration file ${confFile.name}"
174-
scripts.add(ConfigurationScriptBuilder.fromScript(confFile.path)
175-
.mergeOnlyIfCLIInto(cliScript)
176-
.build())
177-
}
167+
config.jbossConfigurationDir.get()
168+
.listFiles(new FileFilter() {
169+
@Override
170+
boolean accept(final File child) {
171+
return child.isFile()
172+
}
173+
})
174+
.sort { it.name.toLowerCase() }
175+
.each { File confFile ->
176+
log.info "Load configuration file ${confFile.name}"
177+
scripts.add(ConfigurationScriptBuilder.fromScript(confFile.path)
178+
.mergeOnlyIfCLIInto(cliScript)
179+
.build())
180+
}
178181
try {
179182
scripts.each { aScript ->
180183
aScript

0 commit comments

Comments
 (0)