Skip to content

Commit 9915d99

Browse files
SilverYoChammoqui
authored andcommitted
Feature #12861: playing cli scripts as a sorted way in order to allow production environment managers to get an execution priority between all cli scripts.
It has been chosen here to apply an alphabetical sort without taking care about the file name case. The idea is to get same sort between the different OS environement about this specific phase of CLI script execution.
1 parent d90570f commit 9915d99

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
@@ -204,17 +204,20 @@ class JBossConfigurationTask extends SilverpeasSetupTask {
204204
Files.createTempFile('jboss-configuration-', '.cli').toString())
205205
log.info "CLI configuration scripts will be merged into ${cliScript.toFile().name}"
206206
Set<Script> scripts = new HashSet<>()
207-
config.jbossConfigurationDir.get().listFiles(new FileFilter() {
208-
@Override
209-
boolean accept(final File child) {
210-
return child.isFile()
211-
}
212-
}).each { File confFile ->
213-
log.info "Load configuration file ${confFile.name}"
214-
scripts.add(ConfigurationScriptBuilder.fromScript(confFile.path)
215-
.mergeOnlyIfCLIInto(cliScript)
216-
.build())
217-
}
207+
config.jbossConfigurationDir.get()
208+
.listFiles(new FileFilter() {
209+
@Override
210+
boolean accept(final File child) {
211+
return child.isFile()
212+
}
213+
})
214+
.sort { it.name.toLowerCase() }
215+
.each { File confFile ->
216+
log.info "Load configuration file ${confFile.name}"
217+
scripts.add(ConfigurationScriptBuilder.fromScript(confFile.path)
218+
.mergeOnlyIfCLIInto(cliScript)
219+
.build())
220+
}
218221
try {
219222
scripts.each { aScript ->
220223
aScript

0 commit comments

Comments
 (0)