Обновить gradle.properties

# Conflicts:
#	build.gradle
#	ncore-properties-template.xml

.gitattributes

@@ -1 +1,79 @@
-*.bat text eol=crlf
+# Explicitly declare text=auto files you want to always be normalized and converted
+# to native line endings on checkout.
+* text=auto
+*.txt text
+*.log text
+*.sql text
+*.template text
+*.properties text
+*.rc text
+*.ini text
+*.tpl text
+*.cfg text
+*.bat text
+*.cmd text
+*.iss text
+*.ipr text
+*.iml text
+*.iws text
+*.java text
+*.jj text
+*.cup text
+*.pl text
+*.pas text
+*.pp text
+*.inc text
+*.dpk text
+*.bpk text
+*.dfm text
+*.xfm text
+*.lfm text
+*.dpr text
+*.bpr text
+*.bpg text
+*.lpr text
+*.lrs text
+*.frc text
+*.lpk text
+*.lpi text
+*.dproj text
+*.bdsproj text
+*.bdsgroup text
+*.groupproj text
+*.cbproj text
+*.dof text
+*.cpp text
+*.c text
+*.h text
+*.awk text
+*.sh text eol=lf
+*.csv text
+*.url text
+*.tld text
+*.xml text
+*.xsl text
+*.xsd text
+*.jrxml text
+*.dtd text
+*.js  text
+*.json  text
+*.css text
+*.jsp text
+*.htm text
+*.html text
+*.rtx text
+*.tsv text
+*.etx text
+*.sgm text
+*.sgml text
+*.talk text
+*.vcf text
+makefile text eol=lf
+COPYING text
+.gitattributes text
+.gitignore text
+*.gradle text
+.*src text
+*.stg text
+*.g text
+*. eol=lf

.gitignore

@@ -6,4 +6,5 @@ gen
 .idea/workspace.xml
 .idea/misc.xml
 ncore-properties-local.xml
-*.iml
+*.iml
+/out

.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war.xml

@@ -2,7 +2,10 @@
   <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$" />
+      <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)" />

.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war__exploded_.xml

@@ -1,167 +0,0 @@
-<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>
-        <element id="directory" name="lib">
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore/1.7.90.76/9100ac7dd327019b81ab574dc7b32173e65b91ba/ncore-1.7.90.76.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore-cryptoapisec/1.7.90.76/fcc96281f303d4447f70ecaaea6c249f8a837772/ncore-cryptoapisec-1.7.90.76.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore-jna/1.7.90.76/d56f01eb6f236ae5db57d8ac8280e17cdda80db9/ncore-jna-1.7.90.76.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore-util/1.7.90.76/169a2b611ccf444093ef64ef4422cf3146e480e1/ncore-util-1.7.90.76.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/vaadin-module/1.3.83/372c1186616cc0709e774cd7e63f45321b885ff1/vaadin-module-1.3.83.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore-ws-gen/1.3.27/aa4286baf42f3ecc342b52eae8c07bf7ebee5ae0/ncore-ws-gen-1.3.27.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncore-xsd-mapper-gen/1.0.0/f83ba82072cfad9a379d09897ea0e8638702d95/ncore-xsd-mapper-gen-1.0.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.xsd/xmlschema-gen/1.0.1/3a97b24e2420c3c313c2b3f18455f4a74e138a9b/xmlschema-gen-1.0.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.xsd/wsdl-gen/1.0.1/bde4e73859a856118874db515e27648c15cdaba9/wsdl-gen-1.0.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncorelib/jopendocument/1.4.10/b5fa34d5449d217168951ceaa9e0f06c0d94b40e/jopendocument-1.4.10.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/ru.red-soft.jdbc/jaybird-jdk18/3.0.29/cf062e591608a578ec329c53d434caa4a0953b77/jaybird-jdk18-3.0.29.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/ru.red-soft.jdbc/jaybird-cryptoapi-jdk18/3.0.29/c9d3b135fd91e8651d75d37cc0ca27ff5303e4cd/jaybird-cryptoapi-jdk18-3.0.29.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.customlib/binarynotes/1.5.3/c0914d7121966d582dfb59dc568e83b3402a0e98/binarynotes-1.5.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.customlib.openswing/openswing-client/2.4.7.42/333722ff37ff1c7ffd81d9a3aa992a05b28d026c/openswing-client-2.4.7.42.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.miglayout/miglayout-swing/5.0/7b4c4d92002459e68e8f115b9ae8a774b2660490/miglayout-swing-5.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.customlib/jcalendar/1.4.3/41cf6a5e188ac4a83afd8ba817651b8942095da1/jcalendar-1.4.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.customlib.swing/swing-rtf-editor/1.0/b8b56ea4390a07b1ef48e9593667887c65181c61/swing-rtf-editor-1.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.github.albfernandez/javadbf/1.10.1/fe5ff36927ebd7dee3403ed797830b8b3be50ede/javadbf-1.10.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.google.zxing/javase/3.4.0/8be20100f28515037a31cc0bbe557501c0538147/javase-3.4.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.google.zxing/core/3.4.0/5264296c46634347890ec9250bc65f14b7362bf8/core-3.4.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.customlib.webservices/webservices-api/2.4.3.6/5de0bfd3657e118caa1328370aa08ee42f9eb41a/webservices-api-2.4.3.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.customlib.webservices/webservices-rt/2.4.3.6/5b1fc16cc7273d5d276b32113d70d0962487419c/webservices-rt-2.4.3.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.github.stephenc.eaio-uuid/uuid/3.4.0/9a948fd4710fd822196f3db55f1145e8e190fc90/uuid-3.4.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.vaadin.addons/inputmask-vaadin7/1.0.2/da6d431e3ea5796eb2b3d9b89970107d61e7df72/inputmask-vaadin7-1.0.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.wcs.wcslib/wcslib-vaadin-widget-multifileupload/2.0.3/7a11d6d18ce86b2136a37304bf1cfdda72715d9b/wcslib-vaadin-widget-multifileupload-2.0.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.vaadin/nwidgets/1.2.50/ecb758a99bb762e9700f0376f1ba70f0d6f6635b/nwidgets-1.2.50.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.vaadin/vaadin-treegrid/0.7.8/2457f06b14ce9156072b355d65a5145ebe7cde0d/vaadin-treegrid-0.7.8.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/de.datenhahn.vaadin/componentrenderer/1.0.3/8f0985141013f9d75c25e1cbbbb03176fe4fafc1/componentrenderer-1.0.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.vaadin/vaadin-server/7.7.17/74c2dd441bd8bf1419965f1d29b45aa06ac4788b/vaadin-server-7.7.17.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.8.3/65fd012581ded67bc20945d85c32b4598c3a9cf1/jsoup-1.8.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.codehaus.jackson/jackson-mapper-asl/1.9.13/1ee2f2bed0e5dd29d1cb155a166e6f8d50bbddb7/jackson-mapper-asl-1.9.13.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/args4j/args4j/2.33/bd87a75374a6d6523de82fef51fc3cfe9baf9fc9/args4j-2.33.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/javax.mail/javax.mail-api/1.5.5/c21af4475b2873b39b0d7b5d08cf4a7547eb37f8/javax.mail-api-1.5.5.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.sun.mail/javax.mail/1.5.5/ffcd34b5de820f35bcc9303649cf6ab2c65ad44e/javax.mail-1.5.5.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.4/5e984db9554728564d58e90da5d90eff8ae8cf2d/commons-net-3.4.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/commons-pool/commons-pool/1.6/4572d589699f09d866a226a14b7f4323c6d8f040/commons-pool-1.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.jodconverter/jodconverter-local/4.3.2/ca45615b4c35cbe4dead9c34190bef6815d80884/jodconverter-local-4.3.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.jodconverter/jodconverter-core/4.3.2/fd18346468a90207ca22481b85a19936a13f10a1/jodconverter-core-4.3.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.9/122c7cee69b53ed4a7681c03d4ee4c0e2765da5/commons-lang3-3.9.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.poi/poi-ooxml/4.0.0/f3fa9c2bd64eb3ec15378de960a07d077ae5b26d/poi-ooxml-4.0.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpmime/4.5.7/cc971b74052f1c949581e257c6580ef3662eac7a/httpmime-4.5.7.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.5.7/dda059f4908e1b548b7ba68d81a3b05897f27cb0/httpclient-4.5.7.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.antlr/antlr/3.4/7797e70e3f5cb4229695f08ff50333266cf81125/antlr-3.4.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.codehaus.groovy/groovy-console/2.4.5/836e417dd20d67c1fed31000d9fbf24af588f2ee/groovy-console-2.4.5.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.kohsuke/groovy-sandbox/1.11/eff509deb86238f442009d54205efca71a4184f9/groovy-sandbox-1.11.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.codehaus.groovy/groovy-templates/2.4.5/7e125934b98430ba7a80ffea2150f59dfdf71978/groovy-templates-2.4.5.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.codehaus.groovy/groovy-swing/2.4.5/f7d598d30bf0e5387259e12f9368b958ac348b19/groovy-swing-2.4.5.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.codehaus.groovy/groovy-xml/2.4.5/bbbb0cdd8a566362454372adb1601f0c052e51c6/groovy-xml-2.4.5.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.codehaus.groovy/groovy/2.4.5/4c7cd3b294af0a32609402c9d12ccc4218890e12/groovy-2.4.5.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.quartz-scheduler/quartz/2.2.2/6fd24da6803ab7c3a08bc519a62219a9bebeb0df/quartz-2.2.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.customlib/swingx/1.6.5.8/39270dae420b6ce58454abd39d279ea7263b553e/swingx-1.6.5.8.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.icepdf.os/icepdf-viewer/6.1.1/403ee28315605fdc699832b863d926b7b38ebad2/icepdf-viewer-6.1.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.oltu.oauth2/org.apache.oltu.oauth2.client/1.0.2/b34e09d1cb84c4b63cedb65c5346ac44eecc22c5/org.apache.oltu.oauth2.client-1.0.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/commons-fileupload/commons-fileupload/1.4/f95188e3d372e20e7328706c37ef366e5d7859b0/commons-fileupload-1.4.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.github.jai-imageio/jai-imageio-core/1.4.0/fb6d79b929556362a241b2f65a04e538062f0077/jai-imageio-core-1.4.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.customlib/xmlsec/1.5.8.1/49b6c0e0c8f7249e25c9f276b77039e4d3a228c6/xmlsec-1.5.8.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/joda-time/joda-time/2.9.2/36d6e77a419cb455e6fd5909f6f96b168e21e9d0/joda-time-2.9.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.tukaani/xz/1.6/5b6f921f1810bdf90e25471968f741f87168b64/xz-1.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/log4j/log4j/1.2.17/5af35056b4d257e4b64b9e8069c0746e8b08629f/log4j-1.2.17.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.18/1191f9f2bc0c47a8cce69193feb1ff0a8bcb37d5/commons-compress-1.18.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/de.schlichtherle/truezip/6.8.4/65de36c179caa66eef37ee3732fa5534e9f897f6/truezip-6.8.4.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.codehaus.jettison/jettison/1.3.6/447f9be5c92b83109f5cef5cd329199e3bb7f3c7/jettison-1.3.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.customlib/opencv/2.4.9/e1b6380f37b6cf9ae66988755f61ab54c0162ed8/opencv-2.4.9.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.iq80.snappy/snappy/0.4/a42b2d92a89efd35bb14738000dabcac6bd07a8d/snappy-0.4.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.anarres.lzo/lzo-core/1.0.6/2da9ed7683d09843c30f78e86b60f35146cd82eb/lzo-core-1.0.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna-platform/4.5.0/ab163522ed76eb01c8c9a750dedacb134fc8c0/jna-platform-4.5.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.vaadin.addons/cssinject/2.0.3/1a141fc68910b4dc9b9f7902be18bfcfa40cb9aa/cssinject-2.0.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.vaadin.ui/NumberField/0.1.3/f069ea7f1f9729f834cb760907a44252560976a1/NumberField-0.1.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/net.jcip/jcip-annotations/1.0/afba4942caaeaf46aab0b976afd57cc7c181467e/jcip-annotations-1.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.poi/poi/4.0.0/7ddb9b983ed682c93a986e8bb596d5935b13086c/poi-4.0.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-collections4/4.2/54ebea0a5b653d3c680131e73fe807bb8f78c4ed/commons-collections4-4.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.jopendocument/jdom/1.1.1/9986f2db44c7d183a861e72d3003eea1fcfe7a99/jdom-1.1.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/rhino/js/1.7R2/b95d5212ff4cea92cee1c3c6fa50aa82c9d4905b/js-1.7R2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/ognl/ognl/2.7.3/8c391fdc943b352045bd35c4f57306ccc6442f7c/ognl-2.7.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.jopendocument/ognl-engine/2.6.9/3402b66243c045d245540799c5242cc95d2a28db/ognl-engine-2.6.9.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/jaxen/jaxen/1.1.6/3f8c36d9a0578e8e98f030c662b69888b1430ac0/jaxen-1.1.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/javax.resource/connector-api/1.5/a5cee35dc703a9d9ea305cc3f4a2baa7c4919145/connector-api-1.5.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.antlr/antlr4-runtime/4.7/30b13b7efc55b7feea667691509cf59902375001/antlr4-runtime-4.7.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/4.5.0/55b548d3195efc5280bf1c3f17b49659c54dee40/jna-4.5.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/cglib/cglib/3.2.6/7bc15a662e50ec528b78549cb9ead5c9980e201/cglib-3.2.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/6.1/94a0d17ba8eb24833cd54253ace9b053786a9571/asm-6.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.hibernate/hibernate-core/4.3.11.Final/536ac0021240d97db99c7d2983067cef1a6f3af5/hibernate-core-4.3.11.Final.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.caucho/hessian/3.1.3/da34b0170ece685be729ef5cf18f9d9fe2cd2343/hessian-3.1.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.miglayout/miglayout-core/5.0/956daa1576bccb24e727ab75540b078171c7c432/miglayout-core-5.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.github.stephenc.eaio-grabbag/grabbag/1.8.1/f358c023dac1e373fe40fc0479802053c1ef4bfa/grabbag-1.8.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.codehaus.jackson/jackson-core-asl/1.9.13/3c304d70f42f832e0a86d45bd437f692129299a4/jackson-core-asl-1.9.13.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/javax.activation/activation/1.1/e6cb541461c2834bdea3eb920f1884d1eb508b50/activation-1.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.poi/poi-ooxml-schemas/4.0.0/125f9ccd2cf652fa4169b1c30e9023362e23324f/poi-ooxml-schemas-4.0.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.github.virtuald/curvesapi/1.04/3386abf821719bc89c7685f9eaafaf4a842f0199/curvesapi-1.04.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.4.11/de748cf874e4e193b42eceea9fe5574fabb9d4df/httpcore-4.4.11.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/4bfc12adfe4842bf07b657f0369c4cb522955686/commons-logging-1.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.oltu.oauth2/org.apache.oltu.oauth2.common/1.0.2/a82fff95276f4c6feadc7993670e659076e43260/org.apache.oltu.oauth2.common-1.0.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.11/3acb4705652e16236558f0f4f2192cc33c3bd189/commons-codec-1.11.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.antlr/ST4/4.0.4/467a2aa12be6d0f0f68c70eecf6714ab733027ac/ST4-4.0.4.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.antlr/antlr-runtime/3.4/8f011408269a8e42b8548687e137d8eeb56df4b4/antlr-runtime-3.4.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/c3p0/c3p0/0.9.1.1/302704f30c6e7abb7a0457f7771739e03c973e80/c3p0-0.9.1.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.30/b5a4b6d16ab13e34a88fae84c35cd5d68cac922c/slf4j-api-1.7.30.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.itextpdf/itextpdf/5.5.6/19448fdba5df68602aed364b86fd14d89c07a66e/itextpdf-5.5.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.icepdf.os/icepdf-core/6.1.1/6a58aecb35b3dc28fa0db43e9c662bb8878161b7/icepdf-core-6.1.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/batik/batik-awt-util/1.6/590750cc8d6a1ba0189b437172b6444578d79c99/batik-awt-util-1.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/batik/batik-dom/1.6/27983405f0871f28d3b9ab35b44e62610a60564a/batik-dom-1.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/batik/batik-svg-dom/1.6/99c4c49c1852b62396fc0c9777d48c0e03f1dc74/batik-svg-dom-1.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/batik/batik-svggen/1.6/983914d5e27957145e34b55ad7f48df96eb6d280/batik-svggen-1.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/batik/batik-util/1.6/7bea0185bb630bca235ffa904b1a03e8a4786a45/batik-util-1.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/batik/batik-xml/1.6/4f2c18a0d41b8804e6fd24f183a567b41c928ed0/batik-xml-1.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.6/815893df5f31da2ece4040fe0a12fd44b577afaf/commons-io-2.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/stax/stax-api/1.0.1/49c100caf72d658aca8e58bd74a4ba90fa2b0d70/stax-api-1.0.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/annotations/2.0.3/191383fa0deb88f393558eec231b206edc23aba0/annotations-2.0.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.openoffice/juh/4.1.2/bbd1b7b49879b5ca34b50053a5929755bcab5063/juh-4.1.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.openoffice/jurt/4.1.2/49fc3e3808c2a6c97831824794d3b1313c12e406/jurt-4.1.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.openoffice/unoil/4.1.2/48921ffdfdf14f47d91d90c5e7c9ec6138941340/unoil-4.1.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.openoffice/ridl/4.1.2/2b3f48a310c7bdc1526146c0e2bd97c4ce3b8b85/ridl-4.1.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.6/9180733b7df8542621dc12e21e87557e8c99b8cb/gson-2.8.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.vaadin/vaadin-sass-compiler/0.9.13/663088831773c35e033ea1538b96d817ce7cef52/vaadin-sass-compiler-0.9.13.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.vaadin/vaadin-shared/7.7.17/f012ebdbb69e1805bba404db23c0719965ff36f/vaadin-shared-7.7.17.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-databind/2.9.2/1d8d8cb7cf26920ba57fb61fa56da88cc123b21f/jackson-databind-2.9.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.vaadin/vaadin-push/7.7.17/732ad2651354e0a4f1e0deb88d6e2d956340cb8d/vaadin-push-7.7.17.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.vaadin/vaadin-themes/7.7.17/eed698837ff80f9fc9a29d7842c1da1cf453c3fd/vaadin-themes-7.7.17.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/jboss/javassist/3.7.ga/6d271a67a1d8718bfb225ace5a25f1c09427c9f8/javassist-3.7.ga.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.9.6/80e2063b01bab3c79c2d84e4ed5e73868394c85a/ant-1.9.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.hibernate.common/hibernate-commons-annotations/4.0.5.Final/2a581b9edb8168e45060d8bad8b7f46712d2c52c/hibernate-commons-annotations-4.0.5.Final.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.jboss.logging/jboss-logging/3.1.3.GA/64499e907f19e5e1b3fdc02f81440c1832fe3545/jboss-logging-3.1.3.GA.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.jboss.logging/jboss-logging-annotations/1.2.0.Beta1/2f437f37bb265d9f8f1392823dbca12d2bec06d6/jboss-logging-annotations-1.2.0.Beta1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.jboss.spec.javax.transaction/jboss-transaction-api_1.2_spec/1.0.0.Final/1f9fef7a9fcbb41cc390fc370a291cf30729e094/jboss-transaction-api_1.2_spec-1.0.0.Final.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/dom4j/dom4j/1.6.1/5d3ccc056b6f056dbf0dddfdf43894b9065a8f94/dom4j-1.6.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final/5e731d961297e5a07290bfaf3db1fbc8bbbf405a/hibernate-jpa-2.1-api-1.0.0.Final.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.javassist/javassist/3.18.1-GA/d9a09f7732226af26bf99f19e2cffe0ae219db5b/javassist-3.18.1-GA.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.antlr/stringtemplate/3.2.1/59ec8083721eae215c6f3caee944c410d2be34de/stringtemplate-3.2.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/antlr/antlr/2.7.7/83cd2cd674a217ade95a4bb83a8a14f351f48bd0/antlr-2.7.7.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.jboss/jandex/1.1.0.Final/e84a2122e76f0b6503be78094ddf2108057ac15f/jandex-1.1.0.Final.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.xmlbeans/xmlbeans/3.0.1/50d94da791ab1e799a11d6f82410fd7d49f402ca/xmlbeans-3.0.1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.sun.media/jai_imageio/1.1/5948475b702a75ba46ab72b4ec89b83efcb8cf85/jai_imageio-1.1.pom" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/javax.media/jai-core/1.1.3/b179d2efb1174658483e8b41bf4ac9d2eb5de438/jai-core-1.1.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.json/json/20140107/d1ffca6e2482b002702c6a576166fd685e3370e3/json-20140107.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.w3c.css/sac/1.3/cdb2dcb4e22b83d6b32b93095f644c3462739e82/sac-1.3.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.vaadin.external.flute/flute/1.3.0.gg2/48e8c3a235544a0506ca3081519ce114169242a/flute-1.3.0.gg2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-annotations/2.9.0/7c10d545325e3a6e72e06381afe469fd40eb701/jackson-annotations-2.9.0.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.9.2/aed20e50152a2f19adc1995c8d8f307c7efa414d/jackson-core-2.9.2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.vaadin.external.atmosphere/atmosphere-runtime/2.2.13.vaadin1/6d7937031790509c29106e4396e3b9fe9a09201e/atmosphere-runtime-2.2.13.vaadin1.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.9.6/d75dd4c39ba06401f20e7afffb861d268baec6bc/ant-launcher-1.9.6.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/xml-apis/xml-apis/1.0.b2/3136ca936f64c9d68529f048c2618bd356bf85c9/xml-apis-1.0.b2.jar" />
-          <element id="file-copy" path="$PROJECT_DIR$/../../../../.gradle/caches/modules-2/files-2.1/com.vaadin.external.slf4j/vaadin-slf4j-jdk14/1.6.1/2268b4bb8226e01963357bc9a02a5d56c9992b8a/vaadin-slf4j-jdk14-1.6.1.jar" />
-        </element>
-      </element>
-    </root>
-  </artifact>
-</component>

.idea/codeStyles/Project.xml

@@ -0,0 +1,54 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="FORMATTER_TAGS_ENABLED" value="true" />
+    <JavaCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="biz.redsoft" withSubpackages="true" static="false" />
+          <package name="biz.red_soft" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="true" />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="THROWS_LIST_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSERT_STATEMENT_WRAP" value="1" />
+      <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
+      <option name="ENUM_CONSTANTS_WRAP" value="2" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,6 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Red" />
+  </state>
+</component>

.idea/compiler.xml

@@ -11,8 +11,56 @@
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
     </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile name="Gradle Imported" enabled="true">
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncoreAnnotationProcessor/1.0.10/52f347369a8b6f7467f9be747d42f1386c632c2c/ncoreAnnotationProcessor-1.0.10.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service/1.0.1/c9779f7372192a96c957a3df1faeeabd07881085/auto-service-1.0.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.13.4/jackson-databind-2.13.4.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.13.4/jackson-core-2.13.4.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service-annotations/1.0.1/ac86dacc0eb9285ea9d42eee6aad8629ca3a7432/auto-service-annotations-1.0.1.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/1.2/ca270191fd7d2a7297da7c8f29184206df10c67d/auto-common-1.2.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.13.4/jackson-annotations-2.13.4.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" />
+        </processorPath>
+        <module name="biz.redsoft.sample.sample.main" />
+      </profile>
+      <profile name="Gradle Imported" enabled="true">
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncoreAnnotationProcessor/1.0.10/52f347369a8b6f7467f9be747d42f1386c632c2c/ncoreAnnotationProcessor-1.0.10.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service/1.0.1/c9779f7372192a96c957a3df1faeeabd07881085/auto-service-1.0.1.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.13.4/cf934c681294b97ef6d80082faeefbe1edadf56/jackson-core-2.13.4.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-annotations/2.13.4/858c6cc78e1f08a885b1613e1d817c829df70a6e/jackson-annotations-2.13.4.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-databind/2.13.4/98b0edfa8e4084078f10b7b356c300ded4a71491/jackson-databind-2.13.4.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service-annotations/1.0.1/ac86dacc0eb9285ea9d42eee6aad8629ca3a7432/auto-service-annotations-1.0.1.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/1.2/ca270191fd7d2a7297da7c8f29184206df10c67d/auto-common-1.2.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/31.0.1-jre/119ea2b2bc205b138974d351777b20f02b92704b/guava-31.0.1-jre.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/b421526c5f297295adef1c886e5246c39d4ac629/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.12.0/d5692f0526415fcc6de94bb5bfbd3afd9dd3b3e5/checker-qual-3.12.0.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.7.1/458d9042f7aa6fa9a634df902b37f544e15aacac/error_prone_annotations-2.7.1.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.3/ba035118bc8bac37d7eff77700720999acd9986d/j2objc-annotations-1.3.jar" />
+        </processorPath>
+        <module name="ncore-sample.sample.main" />
+      </profile>
+    </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="biz.redsoft.sample-sample" target="1.8" />
+      <module name="biz.redsoft.sample.sample" target="1.8" />
+      <module name="biz.redsoft.sample.sample.main" target="1.8" />
+      <module name="biz.redsoft.sample.sample.test" target="1.8" />
+      <module name="ncore-sample.sample.main" target="1.8" />
+      <module name="sample" target="1.8" />
+      <module name="sample.test" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>

.idea/jarRepositories.xml

@@ -21,5 +21,20 @@
       <option name="name" value="maven" />
       <option name="url" value="http://nexus.red-soft.biz/repository/public" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://nexus.red-soft.ru/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://ncore-repo.red-soft.ru/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$MAVEN_REPOSITORY$/" />
+    </remote-repository>
   </component>
 </project>

.idea/modules.xml

@@ -3,7 +3,12 @@
   <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" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.iml" filepath="$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.main.iml" filepath="$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.test.iml" filepath="$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/2142120877/ncore-sample.sample.main.iml" filepath="$PROJECT_DIR$/.idea/modules/2142120877/ncore-sample.sample.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/2142120877/sample.iml" filepath="$PROJECT_DIR$/.idea/modules/2142120877/sample.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/2142120877/sample.test.iml" filepath="$PROJECT_DIR$/.idea/modules/2142120877/sample.test.iml" />
     </modules>
   </component>
 </project>

.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" />
+    <module name="sample.main" />
     <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>

README.md

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

build.gradle

@@ -1,22 +1,13 @@
-buildscript {
-    repositories {
-        maven { url 'http://nexus.red-soft.biz/repository/public' }
-        mavenLocal()
-    }
-    dependencies {
-        classpath 'biz.redsoft.gradle.ncore:gradle-ncore:+'
-        classpath 'nu.studer:gradle-credentials-plugin:1.0.4'
-    }
+plugins {
+    id 'nu.studer.credentials' version('1.0.4')
+    id 'idea'
+    id 'eclipse'
+    id 'application'
+    id 'java-library'
+    id 'war'
+    id 'gradle-ncore' version("$pluginVersion")
 }
 
-group = 'biz.redsoft.sample'
-
-apply plugin: 'nu.studer.credentials'
-apply plugin: 'idea'
-apply plugin: 'application'
-apply plugin: 'war'
-apply plugin: 'ncore'
-
 targetCompatibility = 1.8
 
 ncore {
@@ -24,25 +15,30 @@ ncore {
     sourceEncoding = 'UTF-8'
 }
 
+group = 'biz.redsoft.sample'
+
 repositories {
-    mavenLocal()
     maven {
-        url 'http://nexus.red-soft.biz/repository/public'
+        url 'https://ncore-repo.red-soft.ru/repository/ncore'
         if (project.credentials.user != null && project.credentials.password != null) {
-          credentials {
-            username project.credentials.user
-            password project.credentials.password
-          }
+            credentials {
+                username project.credentials.user
+                password project.credentials.password
+            }
         }
     }
 }
 
 dependencies {
-    provided 'javax.servlet:javax.servlet-api:3.1.0'
-
-    testCompile 'junit:junit:4.+'
+    implementation 'javax.servlet:javax.servlet-api:3.1.0'
+    testCompileClasspath 'org.junit.jupiter:junit-jupiter:5.8.2'
+    testImplementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.76'
+    testImplementation 'org.apache.tomcat.embed:tomcat-embed-jasper:9.0.76'
+    runtimeClasspath files(ncoreGenerateControlDataJar)
+    runtimeClasspath files(genJar)
 }
 
+
 // writing build process to a log file
 // --------------------- BUILD LOG SETTINGS ----------------------
 def tstamp = new Date().format('yyyy-MM-dd_HH-mm-ss')
@@ -50,16 +46,20 @@ def buildLogDir = "${rootDir}/logs"
 mkdir("${buildLogDir}")
 def buildLog = new File("${buildLogDir}/${tstamp}_buildLog.log")
 
-import org.gradle.internal.logging.*
+
+import org.gradle.internal.logging.LoggingOutputInternal
+
+import java.util.regex.Matcher
+
 System.setProperty('org.gradle.color.error', 'RED')
 
-gradle.services.get(LoggingOutputInternal).addStandardOutputListener (new StandardOutputListener () {
+gradle.services.get(LoggingOutputInternal).addStandardOutputListener(new StandardOutputListener() {
     void onOutput(CharSequence output) {
         buildLog << output
     }
 })
 
-gradle.services.get(LoggingOutputInternal).addStandardErrorListener (new StandardOutputListener () {
+gradle.services.get(LoggingOutputInternal).addStandardErrorListener(new StandardOutputListener() {
     void onOutput(CharSequence output) {
         buildLog << output
     }
@@ -72,6 +72,7 @@ run.args = ['client',
 
 task copyDist(type: Copy) {
     from distZip
+    from distTar
     from war
     def releaseDir
     if (project.hasProperty('biz.redsoft.release.dir') && project.getProperty('biz.redsoft.release.dir'))
@@ -81,12 +82,84 @@ task copyDist(type: Copy) {
     into "$releaseDir/$project.name/$version"
 }
 
+def versionPropertiesFilePath = sourceSets.main.resources.srcDirs[0].toString() + File.separator + "META-INF/ncore-product/${project.group}/version.properties"
+
 release {
-    tagPrefix = 'v'
+    def newVersion = project.getVersion().toString().replace("-SNAPSHOT", "")
+    commitNewVersion.enabled(true)
+    failOnCommitNeeded = false
+    failOnPublishNeeded = true
+    failOnSnapshotDependencies = true
+    failOnUnversionedFiles = false
+    failOnUpdateNeeded = false
+    revertOnFail = true
+    preCommitText = ''
+    preTagCommitMessage = '[Gradle Release Plugin] - pre tag commit: '
+    tagCommitMessage = '[Gradle Release Plugin] - creating tag: '
+    newVersionCommitMessage = '[Gradle Release Plugin] - new version commit: '
+    tagTemplate = "${project.name}/v${newVersion}"
+    versionPropertyFile = versionPropertiesFilePath
+    versionProperties = []
+    snapshotSuffix = '-SNAPSHOT'
+    buildTasks = ['ncoreTestDbConnection', 'clean', 'unSnapshotVersion', 'writeVersion', 'commitNewVersion', 'nbackup', 'build', 'copyDist', 'publish', 'dockerFile', 'commitNewVersion']
+    ignoredSnapshotDependencies = []
+    versionPatterns = [
+            /(\d+)(\.)(\d+)(\.)(\d+)([^\d]*\u0024)/: { Matcher m, Project p ->
+                project.getVersion().newVersion().toString()
+            }
+    ]
+    git.requireBranch.set('master')
+    pushReleaseVersionBranch = 'master'
 }
 
-task buildRelease(type: GradleBuild) {
-    tasks = ['clean', 'writeVersion', 'nbackup', 'build', 'copyDist', 'publish']
+//Добавить флаг -Pbiz.redsoft.release=true к таске release для того чтобы публиковалось в releases и false если в snapshots.
+//./gradlew release -Pbiz.redsoft.release=true 
+publishing {
+    repositories {
+        maven {
+            def isRepoCredetionals = project.hasProperty('biz.redsoft.repo.user') && project.hasProperty('biz.redsoft.repo.password')
+            def isCredentialsInsideBuildScript = project.credentials.user != null && project.credentials.password != null
+            println(isRepoCredetionals ? "Using repoCredentials for publish..." :
+                    isCredentialsInsideBuildScript ? "Using buildScript credentials for publish..." : "Credentials are not presented!!!")
+            if (isRepoCredetionals) {
+                credentials {
+                    username project.'biz.redsoft.repo.user'
+                    password project.'biz.redsoft.repo.password'
+                }
+            } else if (isCredentialsInsideBuildScript) {
+                credentials {
+                    username project.credentials.user
+                    password project.credentials.password
+                }
+            }
+            def suffix = project.findProperty('biz.redsoft.release') ? 'releases' : 'snapshots'
+            url "https://ncore-repo.red-soft.ru/repository/${suffix}"
+        }
+    }
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+        }
+    }
 }
 
-idea { module.scopes.PROVIDED.plus += [configurations.provided] }
+
+jar{
+    manifest{
+        attributes(
+                'Main-Class': 'biz.redsoft.ncore.client.MainForm',
+                'Class-Path': configurations.runtimeClasspath.collect { it.name }.join(' ')
+        )
+    }
+}
+
+startScripts {
+    project.startScripts.defaultJvmOpts = ['-Dlogback.configurationFile=./config/logback.xml']
+}
+
+distTar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+distZip {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}

creds.gradle

@@ -0,0 +1,13 @@
+buildscript {
+    repositories {
+        maven {
+          url 'https://nexus.red-soft.ru/repository/ncore-public'
+        }
+        mavenLocal()
+    }
+    dependencies {
+        classpath 'nu.studer:gradle-credentials-plugin:1.0.7'
+    }
+}
+
+apply plugin: 'nu.studer.credentials'

dependencies.gradle

@@ -0,0 +1,9 @@
+dependencies {
+  implementation("biz.redsoft.ncore:ncore:1.10.275.0")
+  updates("biz.redsoft.ncore:ncore:1.10.275.0:updates")
+  codemaker("biz.redsoft.ncore:ncore:1.10.275.0")
+  implementation("biz.redsoft.ncore:ncore-util:1.10.275.0")
+  implementation("biz.redsoft.ncore:ncore-cryptoapisec:1.10.275.0")
+  implementation("biz.redsoft.ncore:ncore-jna:1.10.275.0")
+  codemaker("biz.redsoft.ncore:ncore-gen:1.10.275.0")
+}

gradle.properties

@@ -1 +1,7 @@
-biz.redsoft.ncore.version=1.7.90.76
+biz.redsoft.ncore.version=1.10.339.9
+org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.daemon=false
+org.gradle.configureondemand=true
+pluginVersion=3.0.96
+biz.redsoft.public.repo=https://ncore-repo.red-soft.ru/repository/public
+biz.redsoft.private.repo=https://ncore-repo.red-soft.ru/repository/ncore

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Oct 02 13:02:10 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip

gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,76 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,4 +1,20 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,19 +25,23 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,44 +65,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

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>

ncore-properties-template.xml

@@ -2,5 +2,10 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
   <entry key="ncore.developer.mode">true</entry>
-<!--  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-sample-dev?lc_ctype=WIN1251</entry> -->
+  <!--  <entry key="ncore.db.url">jdbc:firebirdsql:localhost:ncore-sample-dev?lc_ctype=WIN1251</entry> -->
+  <!-- Для автоматизированного рестора базы данных запустить gradlew nRDB-->
+  <!-- На линуксе файл должен быть доступен группе firbird/reddatabase!!! -->
+  <entry key="ncore.db.backup.path">db/ncore.zip</entry>
+  <!-- На линуксе файл должен быть доступен группе firbird/reddatabase!!! -->
+  <entry key="ncore.db.restore.path">/db/ncore-sample.fdb</entry>
 </properties>

settings.gradle

@@ -1 +1,8 @@
+pluginManagement{
+    repositories {
+        mavenLocal()
+        maven { url 'https://ncore-repo.red-soft.ru/repository/public' }
+    }
+}
+
 rootProject.name = 'sample'

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/sample $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\sample.bat %1 -config config\ncore-properties.xml %2 %3 %4 %5
 popd

src/dist/bin/sync-full

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+$(dirname $0)/starter update -fullSync -skipUpdate
+
+if [ $? -ne 0 ] ; then 
+    echo Error updating database
+    exit 11
+fi

src/dist/bin/sync-full.bat

@@ -0,0 +1,4 @@
+@echo off
+
+call "%~dp0\starter.bat" update -fullSync -skipUpdate
+@pause

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/Product.java

@@ -4,9 +4,7 @@ import biz.redsoft.ncore.system.application.Application;
 
 import java.util.Map;
 
-/**
- * @author Victor Bellavin
- */
+
 public class Product implements biz.redsoft.ncore.product.Product {
   private static String PRODUCT_NAME = Product.class.getPackage().getName();
 

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

@@ -2,17 +2,17 @@ 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;
 
-/**
- * @author Victor Bellavin
- */
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
 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 +36,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/resources/META-INF/ncore-product/biz.redsoft.sample/register.json

@@ -1,4 +1,4 @@
 {
-  "dependencies": [],
-  "register": {}
-}
+  "dependencies" : [ ],
+  "register" : { }
+}

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>

src/main/webapp/WEB-INF/web.xml

@@ -22,11 +22,12 @@
   </context-param>
   <servlet>
     <servlet-name>ncore</servlet-name>
-    <servlet-class>biz.redsoft.ncore.server.NcoreApplicationServlet</servlet-class>
+      <!-- <servlet-class>biz.redsoft.ncore_vaadin.server.NcoreApplicationServlet</servlet-class> -->
+      <!-- <servlet-class>biz.redsoft.ncore_vaadinflow.server.NcoreApplicationServlet</servlet-class> -->
     <init-param>
       <description>Vaadin application class to start</description>
       <param-name>UI</param-name>
-      <param-value>biz.redsoft.ncore.client.vaadin.WebApplication</param-value>
+      <param-value>biz.redsoft.ncore_vaadin.client.vaadin.WebApplication</param-value>
     </init-param>
     <init-param>
       <description>Application widgetset</description>
@@ -37,19 +38,20 @@
  </servlet>
   <servlet-mapping>
     <servlet-name>ncore</servlet-name>
-    <url-pattern>/client/*</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>ncore</servlet-name>
-    <url-pattern>/VAADIN/*</url-pattern>
+    <url-pattern>/*</url-pattern>
   </servlet-mapping>
+<!-- TLS/SSL logback JNDI selector section -->
+<!--  <env-entry>
+    <env-entry-name>logback/context-name</env-entry-name>
+    <env-entry-type>java.lang.String</env-entry-type>
+    <env-entry-value>ncore</env-entry-value>
+  </env-entry>-->
+<!-- end of TLS/SSL logback JNDI selector section -->
   <listener>
     <listener-class>biz.redsoft.ncore.dx.init.DxInitializationListener</listener-class>
   </listener>
-  <welcome-file-list>
-    <welcome-file>client</welcome-file>
-  </welcome-file-list>
   <listener>
-    <listener-class>biz.redsoft.ncore.client.vaadin.VaadinSessionListener</listener-class>
+    <!-- <listener-class>biz.redsoft.ncore_vaadin.client.vaadin.VaadinSessionListener</listener-class> -->
+    <!-- <listener-class>biz.redsoft.ncore_vaadinflow.client.vaadin.VaadinSessionListener</listener-class> -->
   </listener>
 </web-app>

src/test/java/biz/redsoft/sample/SampleTests.java

@@ -6,17 +6,15 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Properties;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 
-/**
- * @author Victor Bellavin
- */
 public class SampleTests {
   @Test
   public void testProductName() throws IOException {
     final Properties props = new Properties(System.getProperties());
     Misc.loadProperties(props, Arrays.asList("ncore-properties.xml", "ncore-properties-local.xml"));
-    Assert.assertEquals(props.getProperty("product.name"), "sample");
+    Assertions.assertEquals(props.getProperty("product.name"), "sample");
   }
 }

src/test/java/biz/redsoft/sample/TomcatStarter.java

@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+package biz.redsoft.sample;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import javax.servlet.ServletException;
+
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Server;
+import org.apache.catalina.WebResourceRoot;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.webresources.DirResourceSet;
+import org.apache.catalina.webresources.FileResourceSet;
+import org.apache.catalina.webresources.StandardRoot;
+import org.apache.tomcat.util.scan.StandardJarScanner;
+
+
+public class TomcatStarter {
+  private String contextPath = "/ncore";
+  private int port = 8080;
+
+  private int shutdownPort = 8020;
+  private String shutdownCommand = "SHUTDOWN";
+
+  public void start() throws ServletException, LifecycleException {
+    System.setProperty("catalina.home", new File(".").getAbsolutePath());
+    final Tomcat tomcat = new Tomcat();
+    tomcat.setPort(port);
+    tomcat.setBaseDir(".");
+    tomcat.getHost().setAppBase(".");
+    tomcat.getConnector(); // initialize standard HTTP 1.1 connector
+    tomcat.enableNaming();
+    final Server server = tomcat.getServer();
+    server.setPort(shutdownPort);
+    server.setShutdown(shutdownCommand);
+    final StandardContext webContext = (StandardContext) tomcat.addWebapp(contextPath, "src/main/webapp");
+    webContext.setUseNaming(true);
+    final WebResourceRoot resources = new StandardRoot(webContext);
+    //aliases to resources
+    final String base = ap("");
+    resources.addPreResources(new DirResourceSet(resources, "/META-INF/resources", ap("src/main/resources"), "/META-INF/resources"));
+    //resources.addPreResources(new DirResourceSet(resources, "/WEB-INF/classes/export_templates", base, "/export_templates"));
+    if (new File(base, "ncore-properties-local.xml").exists())
+      resources.addPreResources(new FileResourceSet(resources, "/WEB-INF/ncore-properties-local.xml", base, "/ncore-properties-local.xml"));
+    //resources.addPreResources(new FileResourceSet(resources, "/WEB-INF/ncore-properties-local-openid.xml", base, "/ncore-properties-local-openid.xml"));
+    resources.addPreResources(new FileResourceSet(resources, "/WEB-INF/logback.xml", base, "/logback.xml"));
+    webContext.setResources(resources);
+    // IDEA не всегда корректно формирует пути. Отключим проверку ресурсов.
+    ((StandardJarScanner)webContext.getJarScanner()).setScanClassPath(false);
+    webContext.setWorkDir("build/tomcat/work");
+    tomcat.start();
+    server.await();
+    tomcat.stop();
+  }
+
+  private String ap(String s) {
+    return new File(s).getAbsolutePath();
+  }
+
+  public void stop() throws IOException {
+    final InetAddress serverAddress = InetAddress.getByName("localhost");
+    final Socket socket = new Socket(serverAddress, shutdownPort);
+    try (OutputStream os = socket.getOutputStream()) {
+      final byte[] buffer = shutdownCommand.getBytes();
+      os.write(buffer, 0, buffer.length);
+      os.flush();
+    }
+  }
+
+  public static void main(String[] args) throws ServletException, LifecycleException, IOException {
+    if (args.length > 0) {
+      String command = args[0];
+      if ("start".equals(command))
+        new TomcatStarter().start();
+      else if ("stop".equals(command))
+        new TomcatStarter().stop();
+    }
+  }
+}

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>