From 0309426cb91ef9bf9b2869042737d2c3ce7de85f Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Fri, 5 May 2017 13:12:36 +0100
Subject: [PATCH] Include log4j2.xml into application jars only. This allows
 applications to use their own log4j2.xml files, if required. (#635)

---
 build.gradle                      | 4 ----
 node/build.gradle                 | 6 ++++++
 node/capsule/build.gradle         | 7 ++++++-
 tools/explorer/build.gradle       | 6 ++++++
 verifier/build.gradle             | 6 ++++++
 webserver/build.gradle            | 1 +
 webserver/webcapsule/build.gradle | 2 +-
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9e842dd05a..00b8adeb4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,10 +97,6 @@ allprojects {
 
     // 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")
     }
diff --git a/node/build.gradle b/node/build.gradle
index f069f88dd2..7520a85a70 100644
--- a/node/build.gradle
+++ b/node/build.gradle
@@ -40,6 +40,12 @@ sourceSets {
     }
 }
 
+// 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")
+}
+
 // 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.
 
diff --git a/node/capsule/build.gradle b/node/capsule/build.gradle
index ba8fa1647f..a3d4c6e650 100644
--- a/node/capsule/build.gradle
+++ b/node/capsule/build.gradle
@@ -26,7 +26,12 @@ dependencies {
 task buildCordaJAR(type: FatCapsule) {
     applicationClass 'net.corda.node.Corda'
     archiveName "corda-${corda_release_version}.jar"
-    applicationSource = files(project.tasks.findByName('jar'), '../build/classes/main/CordaCaplet.class', '../build/classes/main/CordaCaplet$1.class', 'config/dev/log4j2.xml')
+    applicationSource = files(
+            project.tasks.findByName('jar'),
+            '../build/classes/main/CordaCaplet.class',
+            '../build/classes/main/CordaCaplet$1.class',
+            "$rootDir/config/dev/log4j2.xml"
+    )
     from 'NOTICE' // Copy CDDL notice
 
     capsuleManifest {
diff --git a/tools/explorer/build.gradle b/tools/explorer/build.gradle
index 5f373e15a2..fb89bc99f5 100644
--- a/tools/explorer/build.gradle
+++ b/tools/explorer/build.gradle
@@ -12,6 +12,12 @@ apply plugin: 'application'
 sourceCompatibility = 1.8
 mainClassName = 'net.corda.explorer.Main'
 
+// 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")
+}
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
diff --git a/verifier/build.gradle b/verifier/build.gradle
index 74286c77c2..ea3518a7f2 100644
--- a/verifier/build.gradle
+++ b/verifier/build.gradle
@@ -20,6 +20,12 @@ sourceSets {
     }
 }
 
+// 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")
+}
+
 dependencies {
     compile project(":node-api")
 
diff --git a/webserver/build.gradle b/webserver/build.gradle
index cd88349266..0cb4d9452b 100644
--- a/webserver/build.gradle
+++ b/webserver/build.gradle
@@ -20,6 +20,7 @@ sourceSets {
 }
 
 processResources {
+    from file("$rootDir/config/dev/log4j2.xml")
     from file("$rootDir/config/dev/jolokia-access.xml")
 }
 
diff --git a/webserver/webcapsule/build.gradle b/webserver/webcapsule/build.gradle
index f3297a5733..1a7bf04992 100644
--- a/webserver/webcapsule/build.gradle
+++ b/webserver/webcapsule/build.gradle
@@ -30,7 +30,7 @@ task buildWebserverJar(type: FatCapsule) {
             project.tasks.findByName('jar'),
             new File(project(':node').rootDir, 'node/build/classes/main/CordaCaplet.class'),
             new File(project(':node').rootDir, 'node/build/classes/main/CordaCaplet$1.class'),
-            'config/dev/log4j2.xml'
+            "$rootDir/config/dev/log4j2.xml"
     )
     from 'NOTICE' // Copy CDDL notice