Amendments due to migration to logback

.idea/runConfigurations/MainForm.xml

@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="MainForm" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+    <option name="ALTERNATIVE_JRE_PATH" value="1.8 (2)" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="biz.redsoft.ncore.client.MainForm" />
     <module name="biz.redsoft.sample-sample" />
     <option name="PROGRAM_PARAMETERS" value="-config ncore-properties.xml -config ncore-properties-local.xml" />
-    <option name="VM_PARAMETERS" value="-Dlog4j.console.encoding=UTF-8" />
+    <option name="VM_PARAMETERS" value="-Dlog.console.encoding=UTF-8" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

gradle.properties

@@ -1 +1 @@
-biz.redsoft.ncore.version=1.8.5.0
+biz.redsoft.ncore.version=1.8.9.0

log4j.properties

@@ -1,26 +0,0 @@
-log4j.rootLogger=DEBUG, file, stdout
-log4j.logger.biz.redsoft.ncore.docflow.Log4jDocFlowLogger=INFO, 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=logs/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=DEBUG
-
-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=INFO
-
-
-log4j.appender.file.File=logs/ncore.log
-log4j.appender.file.Append=true
- 

src/dist/bin/starter

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 cd $(dirname $0)/..
-bin/sample $1 -config config/ncore-properties.xml -logconfig config/log4j.properties $2 $3 $4 $5
+bin/ncore $1 -config config/ncore-properties.xml $2 $3 $4 $5
 cd $OLDPWD

src/dist/bin/starter.bat

@@ -1,5 +1,5 @@
 @echo off
 
 pushd  "%~dp0\.."
-bin\sample.bat %1 -config config\ncore-properties.xml -logconfig config\log4j.properties %2 %3 %4 %5
+call bin\ncore.bat %1 -config config\ncore-properties.xml %2 %3 %4 %5
 popd

src/main/java/biz/redsoft/sample/Version.java

@@ -2,17 +2,19 @@ package biz.redsoft.sample;
 
 import biz.redsoft.util.IncorrectVersionFormat;
 import biz.redsoft.util.VersionUtils;
-import org.apache.log4j.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * @author Victor Bellavin
  */
 public class Version {
-    public static final Logger LOGGER = Logger.getLogger(Version.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(Version.class);
 
     public static final String VERSION_FILE = "version.properties";
     public static final String VERSION_PROP_NAME = "version";

src/main/webapp/WEB-INF/log4j.properties

@@ -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=ERROR
-
-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

src/main/webapp/WEB-INF/logback.groovy

@@ -0,0 +1,28 @@
+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"])