Move back mvn script into the mvn/bin folder to avoid conflicts, fixes #787 (#803)

dist/src/main/distro/bin/mvnd-client.conf

@@ -16,7 +16,7 @@
 # under the License.
 main is org.mvndaemon.mvnd.client.DefaultClient from plexus.core
 
-set maven.home default ${mvnd.home}
+set maven.home default ${mvnd.home}/mvn
 set maven.conf default ${maven.home}/conf
 
 set logback.configurationFile default ${maven.conf}/logging/logback-client.xml

dist/src/main/distro/bin/mvnd-server.conf

@@ -16,9 +16,12 @@
 # under the License.
 main is org.mvndaemon.mvnd.daemon.Server from plexus.core
 
-set maven.home default ${mvnd.home}
+set maven.home default ${mvnd.home}/mvn
 set maven.conf default ${maven.home}/conf
 
+set logback.configurationFile default ${maven.conf}/logging/logback-server.xml
+set logback.configurationFile.fallback default ${maven.conf}/logging/logback.xml
+
 [plexus.core]
 load       ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar

dist/src/main/distro/bin/mvnd.cmd

@@ -197,7 +197,7 @@ set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
   %MAVEN_OPTS% ^
   %MAVEN_DEBUG_OPTS% ^
   -classpath %CLASSWORLDS_JAR% ^
-  "-Dclassworlds.conf=%MVND_HOME%\bin\mvnd.conf"
+  "-Dclassworlds.conf=%MVND_HOME%\bin\mvnd-client.conf" ^
   "-Dmvnd.home=%MVND_HOME%" ^
   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
   %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%

dist/src/main/distro/bin/mvnd.sh

@@ -219,7 +219,7 @@ exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
   -classpath "${CLASSWORLDS_JAR}" \
-  "-Dclassworlds.conf=${MVND_HOME}/bin/mvnd.conf" \
+  "-Dclassworlds.conf=${MVND_HOME}/bin/mvnd-client.conf" \
   "-Dmvnd.home=${MVND_HOME}" \
   "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${CLASSWORLDS_LAUNCHER} "$@"

dist/src/main/distro/mvn/bin/mvn.conf

@@ -18,6 +18,9 @@ main is org.apache.maven.cli.MavenCli from plexus.core
 
 set maven.conf default ${maven.home}/conf
 
+set logback.configurationFile default ${maven.conf}/logging/logback-mvn.xml
+set logback.configurationFile.fallback default ${maven.conf}/logging/logback.xml
+
 [plexus.core]
 load       ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar