From 62b0f219dda12922a54f33eb93fddb494e08da7d Mon Sep 17 00:00:00 2001
From: "sergey.tolstyh" <sergey.tolstyh@red-soft.ru>
Date: Tue, 31 Jan 2023 17:48:22 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=84=D0=B0=D0=B9=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=B3?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0=20=D0=B8=20=D0=BF=D0=BE=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D1=81=D1=82=D0=B0=D0=B1=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=83=D1=8E=20=D0=B2=D0=B5=D1=82=D0=BA=D1=83=20gradle-nc?=
 =?UTF-8?q?ore=20=D0=B2=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8F=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                           |  2 +-
 src/main/webapp/WEB-INF/logback.groovy | 28 ------------
 src/main/webapp/WEB-INF/logback.xml    | 62 ++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 29 deletions(-)
 delete mode 100644 src/main/webapp/WEB-INF/logback.groovy
 create mode 100644 src/main/webapp/WEB-INF/logback.xml

diff --git a/build.gradle b/build.gradle
index 832333e..00fff76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'biz.redsoft.gradle.ncore:gradle-ncore:+'
+        classpath 'biz.redsoft.gradle.ncore:gradle-ncore:1.2.+'
         classpath 'nu.studer:gradle-credentials-plugin:1.0.4'
     }
 }
diff --git a/src/main/webapp/WEB-INF/logback.groovy b/src/main/webapp/WEB-INF/logback.groovy
deleted file mode 100644
index 2806dd4..0000000
--- a/src/main/webapp/WEB-INF/logback.groovy
+++ /dev/null
@@ -1,28 +0,0 @@
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder
-import com.sun.jna.Platform
-import java.nio.charset.Charset
-
-appender("FILE", FileAppender) {
-    def catalinaBase = System.properties['catalina.home']
-    file = "${catalinaBase}/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"])
-root(DEBUG, ["FILE"])
diff --git a/src/main/webapp/WEB-INF/logback.xml b/src/main/webapp/WEB-INF/logback.xml
new file mode 100644
index 0000000..d0c82ff
--- /dev/null
+++ b/src/main/webapp/WEB-INF/logback.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2022 Red Soft Corporation.
+  ~
+  ~ This file is part of Red nCore.
+  ~
+  ~ Red nCore is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2, or (at your option)
+  ~ any later version.
+  ~
+  ~ Red nCore is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with Red nCore; see the file COPYING. If not, write to the
+  ~ Red Soft Corporation, 117105, Russia, Moscow, Nagornyy proyezd, 5.
+  ~
+  ~ Linking this library statically or dynamically with other modules is
+  ~ making a combined work based on this library. Thus, the terms and
+  ~ conditions of the GNU General Public License cover the whole
+  ~ combination.
+  ~
+  ~ As a special exception, the copyright holders of this library give you
+  ~ permission to link this library with independent modules to produce an
+  ~ executable, regardless of the license terms of these independent
+  ~ modules, and to copy and distribute the resulting executable under
+  ~ terms of your choice, provided that you also meet, for each linked
+  ~ independent module, the terms and conditions of the license of that
+  ~ module. An independent module is a module which is not derived from
+  ~ or based on this library. If you modify this library, you may extend
+  ~ this exception to your version of the library, but you are not
+  ~ obligated to do so. If you do not wish to do so, delete this
+  ~ exception statement from your version.
+  -->
+
+<configuration>
+<!--  
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n</pattern>
+    </encoder>
+  </appender>
+-->
+
+  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+    <file>${catalina.home}/logs/ncore.log</file>
+    <append>true</append>
+    <immediateFlush>true</immediateFlush>
+    <encoder>
+      <charset>UTF-8</charset>
+      <pattern>%d{dd.MM.yy HH:mm:ss.SSS} [%t] %p %c{0} - %m%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="debug">
+<!--    <appender-ref ref="STDOUT" /> -->
+    <appender-ref ref="FILE" />
+  </root>
+</configuration>
\ No newline at end of file