diff --git a/gradle.properties b/gradle.properties index bb2fae2..f6276a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -biz.redsoft.ncore.version=1.8.31.0 +biz.redsoft.ncore.version=1.8.44.0 diff --git a/logback.groovy b/logback.groovy deleted file mode 100644 index 2f1da30..0000000 --- a/logback.groovy +++ /dev/null @@ -1,27 +0,0 @@ -import ch.qos.logback.classic.encoder.PatternLayoutEncoder -import com.sun.jna.Platform - -import java.nio.charset.Charset - -appender("FILE", FileAppender) { - file = "logs/ncore.log" - append = true - immediateFlush = true - encoder(PatternLayoutEncoder) { - pattern = "%d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n" - } -} - -appender("STDOUT", ConsoleAppender) { - encoder(PatternLayoutEncoder) { - def predefined = System.getProperty("log.console.encoding") - if (predefined) - charset = Charset.forName(predefined) - else - charset = Charset.forName(Platform.isWindows() ? "Cp866" : "UTF-8") - pattern = "%d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n" - outputPatternAsHeader = true - } -} - -root(DEBUG, ["FILE", "STDOUT"]) \ No newline at end of file diff --git a/logback.xml b/logback.xml new file mode 100644 index 0000000..c02b561 --- /dev/null +++ b/logback.xml @@ -0,0 +1,26 @@ + + + + + + + ${consoleEncoding} + %d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n + + + + + logs/ncore.log + true + true + + UTF-8 + %d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n + + + + + + + + \ No newline at end of file diff --git a/src/dist/config/log4j.properties b/src/dist/config/log4j.properties deleted file mode 100644 index 8e2cfc1..0000000 --- a/src/dist/config/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -log4j.rootLogger=ERROR, file, stdout -log4j.logger.biz.redsoft.ncore.docflow.Log4jDocFlowLogger=ERROR, biz.redsoft.ncore.docflow.Log4jDocFlowLogger - -log4j.appender.biz.redsoft.ncore.docflow.Log4jDocFlowLogger=org.apache.log4j.FileAppender -log4j.appender.biz.redsoft.ncore.docflow.Log4jDocFlowLogger.layout=org.apache.log4j.PatternLayout -log4j.appender.biz.redsoft.ncore.docflow.Log4jDocFlowLogger.layout.ConversionPattern=%d{dd.MM.yy HH:mm:ss.SSS},%t,%p,%c{1},%m%n -log4j.appender.biz.redsoft.ncore.docflow.Log4jDocFlowLogger.encoding=UTF-8 -log4j.appender.biz.redsoft.ncore.docflow.Log4jDocFlowLogger.File=${server.home}/logs/sample-docflow.log - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{dd.MM.yy HH:mm:ss.SSS},%t,%p,%c{1},%m%n -log4j.appender.stdout.encoding=UTF-8 - -log4j.appender.stdout.Threshold=FATAL - -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{dd.MM.yy HH:mm:ss.SSS},%t,%p,%c{1},%m%n -log4j.appender.file.encoding=UTF-8 -log4j.appender.file.Threshold=ERROR - -log4j.appender.file.File=${server.home}/logs/ncore-sample.log -log4j.appender.file.Append=true \ No newline at end of file diff --git a/src/dist/config/logback.xml b/src/dist/config/logback.xml new file mode 100644 index 0000000..c02b561 --- /dev/null +++ b/src/dist/config/logback.xml @@ -0,0 +1,26 @@ + + + + + + + ${consoleEncoding} + %d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n + + + + + logs/ncore.log + true + true + + UTF-8 + %d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n + + + + + + + + \ No newline at end of file