Добавил зависимость для тестов

logback .groovy files replaced with .xml
replaced old log4j properties file to logback.xml

.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war.xml

@@ -0,0 +1,14 @@
+<component name="ArtifactManager">
+  <artifact type="war" name="Gradle : biz.redsoft.sample : sample-1.1.1.1-SNAPSHOT.war">
+    <output-path>$PROJECT_DIR$/build/libs</output-path>
+    <properties id="gradle-properties">
+      <options external-project-path="$PROJECT_DIR$">
+        <buildTaskPath>:war</buildTaskPath>
+        <cleanTaskPath>:cleanWar</cleanTaskPath>
+      </options>
+    </properties>
+    <root id="archive" name="sample-1.1.1.1-SNAPSHOT.war">
+      <element id="artifact" artifact-name="Gradle : biz.redsoft.sample : sample-1.1.1.1-SNAPSHOT.war (exploded)" />
+    </root>
+  </artifact>
+</component>

.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war__exploded_.xml

@@ -0,0 +1,165 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="Gradle : biz.redsoft.sample : sample-1.1.1.1-SNAPSHOT.war (exploded)">
+    <output-path>$PROJECT_DIR$/build/libs/exploded/sample-1.1.1.1-SNAPSHOT.war</output-path>
+    <properties id="gradle-properties">
+      <options external-project-path="$PROJECT_DIR$">
+        <manifest>TWFuaWZlc3QtVmVyc2lvbjogMS4wDQoNCg==</manifest>
+      </options>
+    </properties>
+    <root id="root">
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/build/libs/exploded/sample-1.1.1.1-SNAPSHOT.war/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="javaee-facet-resources" facet="biz.redsoft.sample-sample/web/Web Gradle : sample-1.1.1.1-SNAPSHOT.war" />
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="biz.redsoft.sample-sample" />
+          <element id="dir-copy" path="$PROJECT_DIR$/build/resources/main" />
+          <element id="library" level="project" name="Gradle: com.sun.media:jai_imageio:1.1:pom" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="library" level="project" name="Gradle: biz.redsoft.ncore:vaadin-module:1.3.83" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.ncore:ncore-ws-gen:1.3.27" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.ncore:ncore-xsd-mapper-gen:1.0.0" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.xsd:xmlschema-gen:1.0.1" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.xsd:wsdl-gen:1.0.1" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.ncorelib:jopendocument:1.4.10" />
+          <element id="library" level="project" name="Gradle: ru.red-soft.jdbc:jaybird-jdk18:4.0.8" />
+          <element id="library" level="project" name="Gradle: ru.red-soft.jdbc:jaybird-cryptoapi-jdk18:4.0.8" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.customlib:binarynotes:1.5.3" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.customlib.openswing:openswing-client:2.4.7.42" />
+          <element id="library" level="project" name="Gradle: com.miglayout:miglayout-swing:5.0" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.customlib:jcalendar:1.4.3" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.customlib.swing:swing-rtf-editor:1.0" />
+          <element id="library" level="project" name="Gradle: com.github.albfernandez:javadbf:1.10.1" />
+          <element id="library" level="project" name="Gradle: com.google.zxing:javase:3.4.0" />
+          <element id="library" level="project" name="Gradle: com.google.zxing:core:3.4.0" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.customlib.webservices:webservices-api:2.4.3.6" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.customlib.webservices:webservices-rt:2.4.3.6" />
+          <element id="library" level="project" name="Gradle: com.github.stephenc.eaio-uuid:uuid:3.4.0" />
+          <element id="library" level="project" name="Gradle: org.vaadin.addons:inputmask-vaadin7:1.0.2" />
+          <element id="library" level="project" name="Gradle: com.wcs.wcslib:wcslib-vaadin-widget-multifileupload:2.0.3" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.vaadin:nwidgets:1.2.50" />
+          <element id="library" level="project" name="Gradle: com.vaadin:vaadin-treegrid:0.7.8" />
+          <element id="library" level="project" name="Gradle: de.datenhahn.vaadin:componentrenderer:1.0.3" />
+          <element id="library" level="project" name="Gradle: com.vaadin:vaadin-server:7.7.17" />
+          <element id="library" level="project" name="Gradle: org.jsoup:jsoup:1.8.3" />
+          <element id="library" level="project" name="Gradle: org.codehaus.jackson:jackson-mapper-asl:1.9.13" />
+          <element id="library" level="project" name="Gradle: args4j:args4j:2.33" />
+          <element id="library" level="project" name="Gradle: javax.mail:javax.mail-api:1.5.5" />
+          <element id="library" level="project" name="Gradle: com.sun.mail:javax.mail:1.5.5" />
+          <element id="library" level="project" name="Gradle: commons-net:commons-net:3.4" />
+          <element id="library" level="project" name="Gradle: commons-pool:commons-pool:1.6" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.jodconverter:jodconverter-local:4.3.2" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.jodconverter:jodconverter-core:4.3.2" />
+          <element id="library" level="project" name="Gradle: org.apache.commons:commons-lang3:3.9" />
+          <element id="library" level="project" name="Gradle: org.apache.poi:poi-ooxml:4.0.0" />
+          <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpmime:4.5.7" />
+          <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpclient:4.5.7" />
+          <element id="library" level="project" name="Gradle: org.antlr:antlr:3.4" />
+          <element id="library" level="project" name="Gradle: org.codehaus.groovy:groovy-console:2.4.5" />
+          <element id="library" level="project" name="Gradle: org.kohsuke:groovy-sandbox:1.11" />
+          <element id="library" level="project" name="Gradle: org.codehaus.groovy:groovy-templates:2.4.5" />
+          <element id="library" level="project" name="Gradle: org.codehaus.groovy:groovy-swing:2.4.5" />
+          <element id="library" level="project" name="Gradle: org.codehaus.groovy:groovy-xml:2.4.5" />
+          <element id="library" level="project" name="Gradle: org.codehaus.groovy:groovy:2.4.5" />
+          <element id="library" level="project" name="Gradle: org.quartz-scheduler:quartz:2.2.2" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.customlib:swingx:1.6.5.8" />
+          <element id="library" level="project" name="Gradle: org.icepdf.os:icepdf-viewer:6.1.1" />
+          <element id="library" level="project" name="Gradle: org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2" />
+          <element id="library" level="project" name="Gradle: commons-fileupload:commons-fileupload:1.4" />
+          <element id="library" level="project" name="Gradle: com.github.jai-imageio:jai-imageio-core:1.4.0" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.customlib:xmlsec:1.5.8.1" />
+          <element id="library" level="project" name="Gradle: joda-time:joda-time:2.9.2" />
+          <element id="library" level="project" name="Gradle: org.tukaani:xz:1.6" />
+          <element id="library" level="project" name="Gradle: log4j:log4j:1.2.17" />
+          <element id="library" level="project" name="Gradle: org.apache.commons:commons-compress:1.18" />
+          <element id="library" level="project" name="Gradle: de.schlichtherle:truezip:6.8.4" />
+          <element id="library" level="project" name="Gradle: org.codehaus.jettison:jettison:1.3.6" />
+          <element id="library" level="project" name="Gradle: biz.redsoft.customlib:opencv:2.4.9" />
+          <element id="library" level="project" name="Gradle: org.iq80.snappy:snappy:0.4" />
+          <element id="library" level="project" name="Gradle: org.anarres.lzo:lzo-core:1.0.6" />
+          <element id="library" level="project" name="Gradle: net.java.dev.jna:jna-platform:5.5.0" />
+          <element id="library" level="project" name="Gradle: org.vaadin.addons:cssinject:2.0.3" />
+          <element id="library" level="project" name="Gradle: org.vaadin.ui:NumberField:0.1.3" />
+          <element id="library" level="project" name="Gradle: net.jcip:jcip-annotations:1.0" />
+          <element id="library" level="project" name="Gradle: org.apache.poi:poi:4.0.0" />
+          <element id="library" level="project" name="Gradle: org.apache.commons:commons-collections4:4.2" />
+          <element id="library" level="project" name="Gradle: org.jopendocument:jdom:1.1.1" />
+          <element id="library" level="project" name="Gradle: rhino:js:1.7R2" />
+          <element id="library" level="project" name="Gradle: ognl:ognl:2.7.3" />
+          <element id="library" level="project" name="Gradle: org.jopendocument:ognl-engine:2.6.9" />
+          <element id="library" level="project" name="Gradle: jaxen:jaxen:1.1.6" />
+          <element id="library" level="project" name="Gradle: javax.resource:connector-api:1.5" />
+          <element id="library" level="project" name="Gradle: org.antlr:antlr4-runtime:4.7.2" />
+          <element id="library" level="project" name="Gradle: net.java.dev.jna:jna:5.5.0" />
+          <element id="library" level="project" name="Gradle: cglib:cglib:3.3.0" />
+          <element id="library" level="project" name="Gradle: org.ow2.asm:asm:7.3.1" />
+          <element id="library" level="project" name="Gradle: org.hibernate:hibernate-core:4.3.11.Final" />
+          <element id="library" level="project" name="Gradle: com.caucho:hessian:3.1.3" />
+          <element id="library" level="project" name="Gradle: com.miglayout:miglayout-core:5.0" />
+          <element id="library" level="project" name="Gradle: com.beust:jcommander:1.72" />
+          <element id="library" level="project" name="Gradle: com.github.stephenc.eaio-grabbag:grabbag:1.8.1" />
+          <element id="library" level="project" name="Gradle: org.codehaus.jackson:jackson-core-asl:1.9.13" />
+          <element id="library" level="project" name="Gradle: javax.activation:activation:1.1" />
+          <element id="library" level="project" name="Gradle: org.apache.poi:poi-ooxml-schemas:4.0.0" />
+          <element id="library" level="project" name="Gradle: com.github.virtuald:curvesapi:1.04" />
+          <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpcore:4.4.11" />
+          <element id="library" level="project" name="Gradle: commons-logging:commons-logging:1.2" />
+          <element id="library" level="project" name="Gradle: org.apache.oltu.oauth2:org.apache.oltu.oauth2.common:1.0.2" />
+          <element id="library" level="project" name="Gradle: commons-codec:commons-codec:1.11" />
+          <element id="library" level="project" name="Gradle: org.antlr:ST4:4.0.4" />
+          <element id="library" level="project" name="Gradle: org.antlr:antlr-runtime:3.4" />
+          <element id="library" level="project" name="Gradle: c3p0:c3p0:0.9.1.1" />
+          <element id="library" level="project" name="Gradle: org.slf4j:slf4j-api:1.7.30" />
+          <element id="library" level="project" name="Gradle: com.itextpdf:itextpdf:5.5.6" />
+          <element id="library" level="project" name="Gradle: org.icepdf.os:icepdf-core:6.1.1" />
+          <element id="library" level="project" name="Gradle: batik:batik-awt-util:1.6" />
+          <element id="library" level="project" name="Gradle: batik:batik-dom:1.6" />
+          <element id="library" level="project" name="Gradle: batik:batik-svg-dom:1.6" />
+          <element id="library" level="project" name="Gradle: batik:batik-svggen:1.6" />
+          <element id="library" level="project" name="Gradle: batik:batik-util:1.6" />
+          <element id="library" level="project" name="Gradle: batik:batik-xml:1.6" />
+          <element id="library" level="project" name="Gradle: commons-io:commons-io:2.6" />
+          <element id="library" level="project" name="Gradle: stax:stax-api:1.0.1" />
+          <element id="library" level="project" name="Gradle: com.google.code.findbugs:annotations:2.0.3" />
+          <element id="library" level="project" name="Gradle: org.openoffice:juh:4.1.2" />
+          <element id="library" level="project" name="Gradle: org.openoffice:jurt:4.1.2" />
+          <element id="library" level="project" name="Gradle: org.openoffice:unoil:4.1.2" />
+          <element id="library" level="project" name="Gradle: org.openoffice:ridl:4.1.2" />
+          <element id="library" level="project" name="Gradle: com.google.code.gson:gson:2.8.6" />
+          <element id="library" level="project" name="Gradle: com.vaadin:vaadin-sass-compiler:0.9.13" />
+          <element id="library" level="project" name="Gradle: com.vaadin:vaadin-shared:7.7.17" />
+          <element id="library" level="project" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.9.2" />
+          <element id="library" level="project" name="Gradle: com.vaadin:vaadin-push:7.7.17" />
+          <element id="library" level="project" name="Gradle: com.vaadin:vaadin-themes:7.7.17" />
+          <element id="library" level="project" name="Gradle: jboss:javassist:3.7.ga" />
+          <element id="library" level="project" name="Gradle: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" />
+          <element id="library" level="project" name="Gradle: org.jboss.logging:jboss-logging:3.1.3.GA" />
+          <element id="library" level="project" name="Gradle: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" />
+          <element id="library" level="project" name="Gradle: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final" />
+          <element id="library" level="project" name="Gradle: dom4j:dom4j:1.6.1" />
+          <element id="library" level="project" name="Gradle: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" />
+          <element id="library" level="project" name="Gradle: org.javassist:javassist:3.18.1-GA" />
+          <element id="library" level="project" name="Gradle: org.antlr:stringtemplate:3.2.1" />
+          <element id="library" level="project" name="Gradle: antlr:antlr:2.7.7" />
+          <element id="library" level="project" name="Gradle: org.jboss:jandex:1.1.0.Final" />
+          <element id="library" level="project" name="Gradle: org.apache.xmlbeans:xmlbeans:3.0.1" />
+          <element id="library" level="project" name="Gradle: javax.media:jai-core:1.1.3" />
+          <element id="library" level="project" name="Gradle: org.json:json:20140107" />
+          <element id="library" level="project" name="Gradle: org.w3c.css:sac:1.3" />
+          <element id="library" level="project" name="Gradle: com.vaadin.external.flute:flute:1.3.0.gg2" />
+          <element id="library" level="project" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.9.0" />
+          <element id="library" level="project" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.9.2" />
+          <element id="library" level="project" name="Gradle: com.vaadin.external.atmosphere:atmosphere-runtime:2.2.13.vaadin1" />
+          <element id="library" level="project" name="Gradle: xml-apis:xml-apis:1.0.b2" />
+          <element id="library" level="project" name="Gradle: com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1" />
+          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore/1.8.5.0/db92fa55660a6045a8c7c9adad7304e08cfce9b9/ncore-1.8.5.0.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore-cryptoapisec/1.8.5.0/4c985bcd238b99d31ac0dbabe7a81080444de403/ncore-cryptoapisec-1.8.5.0.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore-jna/1.8.5.0/fe22eec71dcf6fc1968897384a46caa0bcdb4bc0/ncore-jna-1.8.5.0.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore-util/1.8.5.0/8d3d0e2debb8a67e4514dc7d1ee6da58ae30decd/ncore-util-1.8.5.0.jar" />
+        </element>
+      </element>
+    </root>
+  </artifact>
+</component>

.idea/compiler.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
       <entry name="!?*.form" />
@@ -13,10 +11,8 @@
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
+    <bytecodeTargetLevel>
-      <profile default="true" name="Default" enabled="false">
+      <module name="biz.redsoft.sample-sample" target="1.8" />
-        <processorPath useClasspath="true" />
+    </bytecodeTargetLevel>
-      </profile>
-    </annotationProcessing>
   </component>
 </project>

.idea/gradle.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>

.idea/jarRepositories.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/$MAVEN_REPOSITORY$/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://nexus.red-soft.biz/repository/public" />
+    </remote-repository>
+  </component>
+</project>

.idea/modules.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/biz.redsoft.sample-sample.iml" filepath="$PROJECT_DIR$/.idea/modules/biz.redsoft.sample-sample.iml" group="sample" />
       <module fileurl="file://$PROJECT_DIR$/sample.iml" filepath="$PROJECT_DIR$/sample.iml" />
     </modules>
   </component>

.idea/runConfigurations/MainForm.xml

@@ -1,16 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="MainForm" type="Application" factoryName="Application">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <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" />
-    <option name="VM_PARAMETERS" value="-Dlog4j.console.encoding=UTF-8" />
+    <module name="biz.redsoft.sample-sample" />
     <option name="PROGRAM_PARAMETERS" value="-config ncore-properties.xml -config ncore-properties-local.xml" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+    <option name="VM_PARAMETERS" value="-Dlog.console.encoding=UTF-8" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <method v="2">
-    <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="Make" enabled="true" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
+    </method>
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <envs />
-    <method />
   </configuration>
 </component>

README.md

@@ -100,7 +100,7 @@ rootProject.name = 'biz.redsoft.myproject'
 
 9. Актуальная версия ядра указывается в файле gradle.properties:
 ```
-biz.redsoft.ncore.version=1.6.69.0
+biz.redsoft.ncore.version=1.8.5.0
 ```
 Запуск толстого клиента осуществляется в собранном дистрибутиве (distTar или distZip) в каталоге bin командой:
 start-client.bat (или ./start-client в линуксе)

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'
     }
 }
@@ -38,9 +38,11 @@ repositories {
 }
 
 dependencies {
+    testImplementation 'junit:junit:4.13.1'
+
     provided 'javax.servlet:javax.servlet-api:3.1.0'
 
-    testCompile 'junit:junit:4.+'
+    testCompile 'org.junit.jupiter:junit-jupiter:5.8.2'
 }
 
 // writing build process to a log file

gradle.properties

@@ -1 +1 @@
-biz.redsoft.ncore.version=1.6.92.1
+biz.redsoft.ncore.version=1.8.44.67

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
- 

logback.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <define name="consoleEncoding" class="biz.redsoft.util.logback.ConsoleEncoding"/>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <charset>${consoleEncoding}</charset>
+      <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>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>

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/dist/config/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=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

src/dist/config/logback.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <define name="consoleEncoding" class="biz.redsoft.util.logback.ConsoleEncoding"/>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <charset>${consoleEncoding}</charset>
+      <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>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>

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";
@@ -36,7 +38,7 @@ public class Version {
         if (is != null) {
             loadVersion(version, is);
         } else {
-            LOGGER.warn("No version resource at " + versionPath + " Trying to load it from the main package...");
+            LOGGER.warn("No version resource at {} Trying to load it from the main package...", versionPath);
             final InputStream oldStream = Version.class.getResourceAsStream(VERSION_FILE);
             if (oldStream != null)
                 loadVersion(version, oldStream);

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.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>

updates/SAMPLE-0000001.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<Objects
-    xsi:schemaLocation="http://www.red-soft.biz/2009/ncore xsd/ncore.xsd" xmlns="http://www.red-soft.biz/2009/ncore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <SysPatch
-        CreateDate="2015-03-01T21:15:50.513"
-        Description="<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> sample."
-        Documentclassid="8001"
-        DocDate="2015-03-01"
-        DocNumber="SAMPLE-0000001"
-        Metaobjectname="SYS_PATCH"
-        SpControlNumber="644"
-        SpControlProject="tracker"
-        SpNumber="1"
-        SpRevision="1"
-        SpSqlAfter=""
-        SpSqlBefore=""
-        SpStatus="2"
-        SpSubsystem="SAMPLE"
-        SpSyncSql=""
-        SpTimestamp="2015-03-01T21:15:50.513"
-        SpUser="<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-        TagList="">
-        <DetSysLogSysPatch/>
-</SysPatch>
-</Objects>