From b6cc70e923657744afc152aec73fee83facef05a Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Mon, 16 Nov 2020 11:43:21 +0100
Subject: [PATCH] Move mvnd logback config file into [MVND_HOME]/conf and use
 the standard name for the mvn specific config file, fixes #226

---
 .../mvnd/client/DaemonParameters.java         |  2 +-
 dist/src/main/distro/bin/mvnd.sh              |  2 +-
 .../logback-mvn.xml => conf/logback.xml}      | 19 ++++++++++++++++---
 dist/src/main/distro/mvn/bin/mvn              |  2 +-
 dist/src/main/distro/mvn/bin/mvn.cmd          |  2 +-
 .../main/distro/mvn/conf/logging/logback.xml  | 19 +++----------------
 pom.xml                                       |  1 -
 7 files changed, 23 insertions(+), 24 deletions(-)
 rename dist/src/main/distro/{mvn/conf/logging/logback-mvn.xml => conf/logback.xml} (70%)

diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
index 945c71f8..f299cc7c 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
@@ -203,7 +203,7 @@ public class DaemonParameters {
 
     public Path logbackConfigurationPath() {
         return property(Environment.LOGBACK_CONFIGURATION_FILE)
-                .orDefault(() -> mvndHome().resolve("mvn/conf/logging/logback.xml").toString())
+                .orDefault(() -> mvndHome().resolve("conf/logback.xml").toString())
                 .orFail()
                 .asPath();
     }
diff --git a/dist/src/main/distro/bin/mvnd.sh b/dist/src/main/distro/bin/mvnd.sh
index 6a11a821..18fc30f0 100755
--- a/dist/src/main/distro/bin/mvnd.sh
+++ b/dist/src/main/distro/bin/mvnd.sh
@@ -193,7 +193,7 @@ exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
   -classpath "${DAEMON_JAR}" \
-  "-Dlogback.configurationFile=${MVND_HOME}/mvn/conf/logging/logback.xml" \
+  "-Dlogback.configurationFile=${MVND_HOME}/conf/logback.xml" \
   "-Dmvnd.home=${MVND_HOME}" \
   "-Dmaven.home=${MVND_HOME}/mvn" \
   "-Dlibrary.jansi.path=${MVND_HOME}/mvn/lib/jansi-native" \
diff --git a/dist/src/main/distro/mvn/conf/logging/logback-mvn.xml b/dist/src/main/distro/conf/logback.xml
similarity index 70%
rename from dist/src/main/distro/mvn/conf/logging/logback-mvn.xml
rename to dist/src/main/distro/conf/logback.xml
index 1628306d..1ed19734 100644
--- a/dist/src/main/distro/mvn/conf/logging/logback-mvn.xml
+++ b/dist/src/main/distro/conf/logback.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2020 the original author or authors.
+    Copyright 2019 the original author or authors.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -28,7 +28,20 @@
   <!--
     | write project-specific build log messages to ${project.build.directory}/build.log files
    -->
-  <appender name="CONSOLE" class="org.mvndaemon.mvnd.logging.internal.SimpleAppender" />
+  <appender name="MEM" class="org.mvndaemon.mvnd.logging.smart.ProjectBuildLogAppender">
+    <pattern>[%level] %msg%n</pattern>
+  </appender>
+
+  <appender name="DAEMON" class="ch.qos.logback.core.FileAppender">
+    <file>${mvnd.daemon.storage}/daemon-${daemon.uid}.log</file>
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} %.-1level %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.mvndaemon.mvnd.daemon" level="DEBUG" additivity="false">
+    <appender-ref ref="DAEMON" />
+  </logger>
 
   <logger name="Sisu" level="INFO" />
 
@@ -37,6 +50,6 @@
   <logger name="org.eclipse.aether.internal.impl.WarnChecksumPolicy" level="ERROR" />
 
   <root level="${consoleLevel:-info}">
-    <appender-ref ref="CONSOLE" />
+    <appender-ref ref="MEM" />
   </root>
 </configuration>
diff --git a/dist/src/main/distro/mvn/bin/mvn b/dist/src/main/distro/mvn/bin/mvn
index e149b765..249dab14 100755
--- a/dist/src/main/distro/mvn/bin/mvn
+++ b/dist/src/main/distro/mvn/bin/mvn
@@ -192,7 +192,7 @@ exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
   -classpath "${CLASSWORLDS_JAR}" \
-  "-Dlogback.configurationFile=${MAVEN_HOME}/conf/logging/logback-mvn.xml" \
+  "-Dlogback.configurationFile=${MAVEN_HOME}/conf/logging/logback.xml" \
   "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
   "-Dmvnd.home=${MAVEN_HOME}" \
   "-Dmaven.home=${MAVEN_HOME}" \
diff --git a/dist/src/main/distro/mvn/bin/mvn.cmd b/dist/src/main/distro/mvn/bin/mvn.cmd
index 9b30b480..305ad527 100644
--- a/dist/src/main/distro/mvn/bin/mvn.cmd
+++ b/dist/src/main/distro/mvn/bin/mvn.cmd
@@ -177,7 +177,7 @@ set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
   %MAVEN_OPTS% ^
   %MAVEN_DEBUG_OPTS% ^
   -classpath %CLASSWORLDS_JAR% ^
-  "-Dlogback.configurationFile=%MAVEN_HOME%\conf\logging\logback-mvn.xml" ^
+  "-Dlogback.configurationFile=%MAVEN_HOME%\conf\logging\logback.xml" ^
   "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
   "-Dmvnd.home=%MAVEN_HOME%" ^
   "-Dmaven.home=%MAVEN_HOME%" ^
diff --git a/dist/src/main/distro/mvn/conf/logging/logback.xml b/dist/src/main/distro/mvn/conf/logging/logback.xml
index 1ed19734..1628306d 100644
--- a/dist/src/main/distro/mvn/conf/logging/logback.xml
+++ b/dist/src/main/distro/mvn/conf/logging/logback.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2019 the original author or authors.
+    Copyright 2020 the original author or authors.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -28,20 +28,7 @@
   <!--
     | write project-specific build log messages to ${project.build.directory}/build.log files
    -->
-  <appender name="MEM" class="org.mvndaemon.mvnd.logging.smart.ProjectBuildLogAppender">
-    <pattern>[%level] %msg%n</pattern>
-  </appender>
-
-  <appender name="DAEMON" class="ch.qos.logback.core.FileAppender">
-    <file>${mvnd.daemon.storage}/daemon-${daemon.uid}.log</file>
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} %.-1level %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <logger name="org.mvndaemon.mvnd.daemon" level="DEBUG" additivity="false">
-    <appender-ref ref="DAEMON" />
-  </logger>
+  <appender name="CONSOLE" class="org.mvndaemon.mvnd.logging.internal.SimpleAppender" />
 
   <logger name="Sisu" level="INFO" />
 
@@ -50,6 +37,6 @@
   <logger name="org.eclipse.aether.internal.impl.WarnChecksumPolicy" level="ERROR" />
 
   <root level="${consoleLevel:-info}">
-    <appender-ref ref="MEM" />
+    <appender-ref ref="CONSOLE" />
   </root>
 </configuration>
diff --git a/pom.xml b/pom.xml
index 5f73d9cc..5098a1b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,7 +236,6 @@ limitations under the License.</inlineHeader>
                             <exclude>**/README.*</exclude>
                             <exclude>**/.cache/**</exclude>
                             <exclude>**/.gitkeep</exclude>
-                            <exclude>**/conf/logging/logback.xml</exclude>
                             <exclude>**/mvnd.properties.template</exclude>
                             <exclude>**/m2.conf</exclude>
                             <exclude>**/mvnd</exclude>