Skip to content

Commit f3881d2

Browse files
committed
Replace the use of @InputDirectory by @input in some classes. Indeed,
the difference between this two annotations is the first is for the directory and its content whereas the second is just for the location of the directory (in the case the input is a directory). So, when a directory is annotated by @InputDirectory all the content is scanned for modification so that for any modified content the task containing such an input is elected to be executed.
1 parent bcba3a7 commit f3881d2

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

src/main/groovy/org/silverpeas/setup/SilverpeasConfigurationProperties.groovy

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ package org.silverpeas.setup
2525

2626
import org.gradle.api.Project
2727
import org.gradle.api.provider.Property
28-
import org.gradle.api.tasks.InputDirectory
28+
import org.gradle.api.tasks.Input
2929
import org.gradle.api.tasks.Internal
3030

3131
import javax.inject.Inject
@@ -44,28 +44,28 @@ class SilverpeasConfigurationProperties {
4444
* configuration properties, the Silverpeas and the JBoss configuration directory. By default
4545
* SILVERPEAS_HOME/configuration.
4646
*/
47-
@InputDirectory
47+
@Input
4848
final Property<File> configurationHome
4949

5050
/**
5151
* The directory that contains all the configuration scripts to configure JBoss/Wildfly for
5252
* Silverpeas. By default SILVERPEAS_HOME/configuration/jboss.
5353
*/
54-
@InputDirectory
54+
@Input
5555
final Property<File> jbossConfigurationDir
5656

5757
/**
5858
* The directory that contains all the configuration scripts to configure specifically the
5959
* Silverpeas web portal and components. By default SILVERPEAS_HOME/configuration/silverpeas.
6060
*/
61-
@InputDirectory
61+
@Input
6262
final Property<File> silverpeasConfigurationDir
6363

6464
/**
6565
* The directory that contains the additional JBoss/Wildfly modules to install in JBoss/Wildfy
6666
* for Silverpeas. By default SILVERPEAS_HOME/configuration/jboss/modules.
6767
*/
68-
@InputDirectory
68+
@Input
6969
final Property<File> jbossModulesDir
7070

7171
/**

src/main/groovy/org/silverpeas/setup/SilverpeasMigrationProperties.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.silverpeas.setup
22

33
import org.gradle.api.Project
44
import org.gradle.api.provider.Property
5-
import org.gradle.api.tasks.InputDirectory
5+
import org.gradle.api.tasks.Input
66

77
import javax.inject.Inject
88

@@ -30,7 +30,7 @@ class SilverpeasMigrationProperties {
3030
* </li>
3131
* </ul>
3232
*/
33-
@InputDirectory
33+
@Input
3434
final Property<File> homeDir
3535

3636
@Inject

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,23 @@
2323
*/
2424
package org.silverpeas.setup.configuration
2525

26-
import org.gradle.api.tasks.InputDirectory
27-
import org.gradle.api.tasks.Internal
28-
import org.gradle.api.tasks.Nested
29-
import org.gradle.api.tasks.TaskAction
30-
import org.gradle.api.tasks.TaskExecutionException
26+
import org.gradle.api.tasks.*
3127
import org.silverpeas.setup.SilverpeasConfigurationProperties
3228
import org.silverpeas.setup.api.FileLogger
3329
import org.silverpeas.setup.api.Script
3430
import org.silverpeas.setup.api.SilverpeasSetupTask
3531

3632
import java.nio.file.Files
3733
import java.nio.file.Paths
34+
3835
/**
3936
* This task aims to configure Silverpeas from the Silverpeas configuration file, from some XML
4037
* configuration rules and from Groovy scripts.
4138
* @author mmoquillon
4239
*/
4340
class SilverpeasConfigurationTask extends SilverpeasSetupTask {
4441

45-
@InputDirectory
42+
@Input
4643
File silverpeasHome
4744
@Nested
4845
SilverpeasConfigurationProperties config
@@ -69,7 +66,7 @@ class SilverpeasConfigurationTask extends SilverpeasSetupTask {
6966
boolean accept(final File child) {
7067
return child.isFile()
7168
}
72-
}).sort{
69+
}).sort {
7370
it.name
7471
}.each { configurationFile ->
7572
try {

src/main/groovy/org/silverpeas/setup/construction/SilverpeasConstructionTask.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
package org.silverpeas.setup.construction
2525

26-
import org.gradle.api.tasks.InputDirectory
26+
import org.gradle.api.tasks.Input
2727
import org.gradle.api.tasks.Internal
2828
import org.gradle.api.tasks.Nested
2929
import org.gradle.api.tasks.TaskAction
@@ -43,7 +43,7 @@ class SilverpeasConstructionTask extends SilverpeasSetupTask {
4343

4444
public static final String SILVERPEAS_WAR = 'silverpeas.war'
4545

46-
@InputDirectory
46+
@Input
4747
File silverpeasHome
4848
@Nested
4949
SilverpeasInstallationProperties installation

0 commit comments

Comments
 (0)