Fix duplicate content root problems in IntelliJ

build.gradle

@@ -95,6 +95,16 @@ allprojects {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
+    // Use manual resource copying of log4j2.xml rather than source sets.
+    // This prevents problems in IntelliJ with regard to duplicate source roots.
+    processResources {
+        from file("$rootDir/config/dev/log4j2.xml")
+    }
+
+    processTestResources {
+        from file("$rootDir/config/test/log4j2.xml")
+    }
+
     tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Xlint:-options"
     }

client/jfx/build.gradle

@@ -21,11 +21,6 @@ sourceSets {
             srcDir file('src/integration-test/kotlin')
         }
     }
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
 }
 
 // To find potential version conflicts, run "gradle htmlDependencyReport" and then look in

client/mock/build.gradle

@@ -10,14 +10,6 @@ configurations {
     runtime.exclude module: 'isolated'
 }
 
-sourceSets {
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
-}
-
 // To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
 // build/reports/project/dependencies/index.html for green highlighted parts of the tree.
 

client/rpc/build.gradle

@@ -21,11 +21,6 @@ sourceSets {
             srcDir file('src/integration-test/kotlin')
         }
     }
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
 }
 
 // To find potential version conflicts, run "gradle htmlDependencyReport" and then look in

core/build.gradle

@@ -10,14 +10,6 @@ buildscript {
     }
 }
 
-sourceSets {
-    test {
-        resources {
-            srcDir "../config/test"
-        }
-    }
-}
-
 dependencies {
 
     testCompile "junit:junit:$junit_version"

docs/source/example-code/build.gradle

@@ -21,12 +21,6 @@ configurations {
 }
 
 sourceSets {
-    main {
-        resources {
-            srcDir "../../../config/dev"
-        }
-    }
-
     integrationTest {
         kotlin {
             compileClasspath += main.output + test.output

finance/build.gradle

@@ -22,14 +22,6 @@ dependencies {
     testCompile "com.pholser:junit-quickcheck-generators:$quickcheck_version"
 }
 
-sourceSets {
-    test {
-        resources {
-            srcDir "../config/test"
-        }
-    }
-}
-
 configurations.testCompile {
     // Excluding javassist:javassist because it clashes with Hibernate's
     // transitive org.javassist:javassist dependency.

finance/isolated/build.gradle

@@ -4,11 +4,3 @@ apply plugin: CanonicalizerPlugin
 dependencies {
     compile project(':core')
 }
-
-sourceSets {
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
-}

node-api/build.gradle

@@ -10,19 +10,6 @@ buildscript {
     }
 }
 
-sourceSets {
-    test {
-        resources {
-            srcDir "../config/test"
-        }
-    }
-    main {
-        resources {
-            srcDir "../config/dev"
-        }
-    }
-}
-
 dependencies {
     compile project(":core")
 

node/build.gradle

@@ -38,16 +38,6 @@ sourceSets {
             srcDir file('src/integration-test/resources')
         }
     }
-    test {
-        resources {
-            srcDir "../config/test"
-        }
-    }
-    main {
-        resources {
-            srcDir "../config/dev"
-        }
-    }
 }
 
 // To find potential version conflicts, run "gradle htmlDependencyReport" and then look in

node/capsule/build.gradle

@@ -19,19 +19,6 @@ configurations {
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
-sourceSets {
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
-    main {
-        resources {
-            srcDir "../../config/dev"
-        }
-    }
-}
-
 dependencies {
     compile project(':node')
 }

samples/attachment-demo/build.gradle

@@ -7,16 +7,6 @@ apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'maven-publish'
 
 sourceSets {
-    main {
-        resources {
-            srcDir "../../config/dev"
-        }
-    }
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
     integrationTest {
         kotlin {
             compileClasspath += main.output + test.output

samples/bank-of-corda-demo/build.gradle

@@ -7,16 +7,6 @@ apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'maven-publish'
 
 sourceSets {
-    main {
-        resources {
-            srcDir "../../config/dev"
-        }
-    }
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
     integrationTest {
         kotlin {
             compileClasspath += main.output + test.output

samples/irs-demo/build.gradle

@@ -10,16 +10,6 @@ apply plugin: 'application'
 mainClassName = 'net.corda.irs.IRSDemo'
 
 sourceSets {
-    main {
-        resources {
-            srcDir "../../config/dev"
-        }
-    }
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
     integrationTest {
         kotlin {
             compileClasspath += main.output + test.output

samples/raft-notary-demo/build.gradle

@@ -13,19 +13,6 @@ ext {
     advertisedNotary = "$notaryType|$notaryName"
 }
 
-sourceSets {
-    main {
-        resources {
-            srcDir "../../config/dev"
-        }
-    }
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
-}
-
 configurations {
     integrationTestCompile.extendsFrom testCompile
     integrationTestRuntime.extendsFrom testRuntime

samples/simm-valuation-demo/build.gradle

@@ -11,16 +11,6 @@ apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'maven-publish'
 
 sourceSets {
-    main {
-        resources {
-            srcDir "../../config/dev"
-        }
-    }
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
     integrationTest {
         kotlin {
             compileClasspath += main.output + test.output

samples/trader-demo/build.gradle

@@ -7,16 +7,6 @@ apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'maven-publish'
 
 sourceSets {
-    main {
-        resources {
-            srcDir "../../config/dev"
-        }
-    }
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
     integrationTest {
         kotlin {
             compileClasspath += main.output + test.output

tools/explorer/build.gradle

@@ -12,19 +12,6 @@ apply plugin: 'application'
 sourceCompatibility = 1.8
 mainClassName = 'net.corda.explorer.Main'
 
-sourceSets {
-    main {
-        resources {
-            srcDir "../../config/dev"
-        }
-    }
-    test {
-        resources {
-            srcDir "../../config/test"
-        }
-    }
-}
-
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"

tools/loadtest/build.gradle

@@ -1,14 +1,6 @@
 apply plugin: 'kotlin'
 apply plugin: 'application'
 
-sourceSets {
-    main {
-        resources {
-            srcDir "../../config/dev"
-        }
-    }
-}
-
 mainClassName = 'net.corda.loadtest.MainKt'
 
 dependencies {

verifier/build.gradle

@@ -18,16 +18,6 @@ sourceSets {
             srcDir file('src/integration-test/kotlin')
         }
     }
-    test {
-        resources {
-            srcDir "../config/test"
-        }
-    }
-    main {
-        resources {
-            srcDir "../config/dev"
-        }
-    }
 }
 
 dependencies {

webserver/build.gradle

@@ -17,16 +17,14 @@ sourceSets {
             srcDir file('src/integration-test/kotlin')
         }
     }
-    test {
+}
-        resources {
+
-            srcDir "$rootDir/config/test"
+processResources {
-        }
+    from file("$rootDir/config/dev/jolokia-access.xml")
-    }
+}
-    main {
+
-        resources {
+processTestResources {
-            srcDir "$rootDir/config/dev"
+    from file("$rootDir/config/test/jolokia-access.xml")
-        }
-    }
 }
 
 dependencies {

webserver/webcapsule/build.gradle

@@ -19,19 +19,6 @@ configurations {
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
-sourceSets {
-    test {
-        resources {
-            srcDir "$rootDir/config/test"
-        }
-    }
-    main {
-        resources {
-            srcDir "$rootDir/config/dev"
-        }
-    }
-}
-
 dependencies {
     compile project(':webserver')
 }