From d8e5998f21fcd226205917609fc5ef6d63b93c3e Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Fri, 27 Apr 2018 15:08:15 +0200
Subject: [PATCH] Fixed package creation, missend bin/ folder

---
 distribution/build.gradle                        | 2 +-
 distribution/src/main/resources/log4j.properties | 6 ++----
 settings.gradle                                  | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/distribution/build.gradle b/distribution/build.gradle
index 32a1cac2..1f2d74f5 100644
--- a/distribution/build.gradle
+++ b/distribution/build.gradle
@@ -16,7 +16,7 @@ def packageSet = project.copySpec {
   from 'src/main/resources/README.txt'
 
   into ('bin') {
-    from 'src/ main/scripts/'
+    from 'src/main/scripts/'
     fileMode=0755
   }
 
diff --git a/distribution/src/main/resources/log4j.properties b/distribution/src/main/resources/log4j.properties
index 8e47755e..96d40879 100644
--- a/distribution/src/main/resources/log4j.properties
+++ b/distribution/src/main/resources/log4j.properties
@@ -1,5 +1,3 @@
-# Set root logger level to DEBUG and its only appender to A1.
-#log4j.rootLogger=ERROR, A1
 log4j.rootLogger=ERROR, stdout, file
 
 log4j.logger.io.moquette=INFO
@@ -21,7 +19,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 #log4j.appender.stdout.Threshold=DEBUG
 log4j.appender.stdout.Threshold=TRACE
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{dd/MM/yyyy HH:mm:ss,SSS} [%t] %-5p %c{1} %M %L %x - %m%n
 
 #file appender
 log4j.appender.file=org.apache.log4j.RollingFileAppender
@@ -30,7 +28,7 @@ log4j.appender.file.File=moquette.log
 log4j.appender.file.MaxFileSize=1MB
 log4j.appender.file.MaxBackupIndex=1
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n
+log4j.appender.file.layout.ConversionPattern=%d{dd/MM/yyyy HH:mm:ss,SSS} [%t] %-5p %c{1} %M %L %x - %m%n
 
 
 ####################################
diff --git a/settings.gradle b/settings.gradle
index 185b1d6a..e6b58d9d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 rootProject.name = 'moquette-parent'
 include ':moquette-broker'
-include ':distribution'
+include ':moquette-distribution'
 include ':moquette-h2-storage'
 include ':moquette-mapdb-storage'
 include ':moquette-embedded-test'
@@ -8,7 +8,7 @@ include ':moquette-osgi-test'
 include ':moquette-performance'
 
 project(':moquette-broker').projectDir = "$rootDir/broker" as File
-project(':distribution').projectDir = "$rootDir/distribution" as File
+project(':moquette-distribution').projectDir = "$rootDir/distribution" as File
 project(':moquette-embedded-test').projectDir = "$rootDir/embedding_moquette" as File
 project(':moquette-performance').projectDir = "$rootDir/perf" as File
 project(':moquette-h2-storage').projectDir = "$rootDir/h2_storage" as File