public/ncore-sample
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: public:ncore-sample-1.9
Branches Tags
public:master public:ncore-sample-1.10 public:ncore-sample-1.9 public:ncore-sample-1.8 public:ncore-sample-1.7
..
compare: public:master
Branches Tags
public:ncore-sample-1.10 public:ncore-sample-1.9 public:master public:ncore-sample-1.8 public:ncore-sample-1.7

54 Commits
ncore-samp ... master

Author SHA1 Message Date
Сергей Толстых
85fc8a07b2 Обновить gradle.properties 2025-08-13 13:27:20 +03:00
sergey.tolstyh
347e6274e3 Update build.gradle 2025-05-23 18:14:38 +03:00
sergey.tolstyh
9c6dc8b714 Update build.gradle 2025-05-23 18:05:30 +03:00
sergey.tolstyh
9af601cb30 Update build.gradle 2025-05-23 17:50:27 +03:00
sergey.tolstyh
0cb0312aae Update build.gradle 2025-05-23 17:44:22 +03:00
sergey.tolstyh
53c72731ec Update build.gradle 2025-05-23 17:33:50 +03:00
sergey.tolstyh
6770c43346 Update build.gradle 2025-05-23 17:15:29 +03:00
sergey.tolstyh
cbc1f71184 Update gradle.properties 2025-05-23 17:14:57 +03:00
sergey.tolstyh
40f41f5858 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	build.gradle
#	ncore-properties-template.xml
 2025-05-23 17:13:04 +03:00
sergey.tolstyh
2a2a1ed029 merge 1.10 2025-05-23 17:11:52 +03:00
sergey.tolstyh
2839e859ab merge 1.10 2025-05-23 17:11:52 +03:00
sergey.tolstyh
ccd347ccb1 Update build.gradle 2025-05-23 16:36:46 +03:00
sergey.tolstyh
4b192e8e6f Обновление эталонной базы данных до 1.10.274.0 2025-05-20 19:08:41 +03:00
sergey.tolstyh
470b4c05d1 Обновление эталонной базы данных 2025-05-20 18:41:30 +03:00
sergey.tolstyh
06f9972d76 Update ncore-properties-template.xml 2025-05-20 18:34:40 +03:00
sergey.tolstyh
10d2c67860 Update build.gradle 2025-05-20 17:55:00 +03:00
sergey.tolstyh
a1cb2a6240 #230905 Исправлено задвоение файлов в архиве. 2025-05-20 17:52:31 +03:00
sergey.tolstyh
8214db2388 Update build.gradle 2025-05-05 16:07:03 +03:00
sergey.tolstyh
85dccc65fd Update build.gradle 2025-05-05 16:02:35 +03:00
sergey.tolstyh
b0061ba410 Revert "Закомментирован пустой listenner" 
This reverts commit 2222a7c231.
 2025-04-07 15:53:39 +03:00
sergey.tolstyh
2222a7c231 Закомментирован пустой listenner 2025-04-07 15:27:58 +03:00
Роман Кислухин
d44acad887 gradle updated 2025-04-01 19:49:19 +03:00
Роман Кислухин
63859ce45d minor 2025-04-01 19:49:06 +03:00
Роман Кислухин
fcd46c5264 Fixed repository url 2025-04-01 16:47:41 +03:00
sergey.tolstyh
be0b4c4dd0 Update web.xml 2025-01-30 16:53:13 +03:00
sergey.tolstyh
6d9489b894 Update web.xml 2025-01-30 16:44:01 +03:00
sergey.tolstyh
9f2d4c9db5 Update web.xml 2025-01-30 16:30:09 +03:00
sergey.tolstyh
48fe400d01 Update build.gradle 2025-01-20 13:57:27 +03:00
sergey.tolstyh
195c5e701b Update build.gradle 2024-12-27 16:46:40 +03:00
sergey.tolstyh
af1d01e503 Update gradle.properties 2024-12-27 16:46:11 +03:00
sergey.tolstyh
6fff193d2f Update build.gradle 2024-12-26 12:09:02 +03:00
sergey.tolstyh
2c8d756763 Update ncore-properties-template.xml 2024-12-24 15:47:53 +03:00
sergey.tolstyh
40a232f3b2 Update build.gradle 2024-12-24 15:31:24 +03:00
sergey.tolstyh
f589f49015 Update build.gradle 2024-12-24 15:30:34 +03:00
sergey.tolstyh
b48b53e28a Update build.gradle 2024-12-09 15:58:48 +03:00
sergey.tolstyh
a01f5c547a Update build.gradle 2024-11-19 15:07:56 +03:00
sergey.tolstyh
f89be239fc remove author TomcatStarter.java 2024-11-18 16:50:24 +03:00
sergey.tolstyh
8558b245be remove author SampleTests.java 2024-11-18 16:50:14 +03:00
sergey.tolstyh
03e4997b05 remove author Version.java 2024-11-18 16:50:08 +03:00
sergey.tolstyh
05cdc4fde3 remove author Product.java 2024-11-18 16:49:57 +03:00
sergey.tolstyh
306ae182c1 Добавлен TomcatStarter 2024-07-02 18:19:30 +03:00
sergey.tolstyh
410ea4d826 template edited 2024-07-02 17:29:02 +03:00
sergey.tolstyh
044ef38cbd nRDB settings 2024-07-02 17:28:48 +03:00
sergey.tolstyh
15233b2d09 ncore version update 2024-07-02 17:28:21 +03:00
sergey.tolstyh
642a8eedce Update settings.gradle 2024-07-01 16:14:43 +03:00
sergey.tolstyh
c75b2aca5d Update build.gradle 2024-07-01 16:14:13 +03:00
sergey.tolstyh
1a25a0d85c Update dependencies.gradle 2024-07-01 16:13:40 +03:00
sergey.tolstyh
29ac441c33 Update gradle.properties 2024-05-15 17:26:18 +03:00
sergey.tolstyh
8fc5daf4d2 Подключен файл с зависимостями 2024-01-29 16:50:13 +03:00
sergey.tolstyh
bbecab908a Добавлен файл для зависимостей 2024-01-29 16:49:03 +03:00
sergey.tolstyh
4e2db97690 Update build.gradle 2023-11-28 12:25:30 +03:00
sergey.tolstyh
e229c0ea44 Updated etalon database. (from rdb 3.0) 2023-10-30 18:22:16 +03:00
sergey.tolstyh
3f865cf0dd Fix 'README' 2023-10-02 12:47:27 +03:00
sergey.tolstyh
c13087a947 New branch 2023-10-02 12:44:06 +03:00
20 changed files with 196 additions and 239 deletions
Expand all files Collapse all files

3
.gitignore vendored
View File

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

165
.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war__exploded_.xml generated
View File

@ -1,165 +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 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>

54
.idea/codeStyles/Project.xml generated Normal file
View File

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

6
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View File

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

48
.idea/compiler.xml generated
View File

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

15
.idea/jarRepositories.xml generated
View File

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

7
.idea/modules.xml generated
View File

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

2
.idea/runConfigurations/MainForm.xml generated
View File

@ -3,7 +3,7 @@
<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="-Dlog.console.encoding=UTF-8" />
<method v="2">

2
README.md
View File

@ -5,7 +5,7 @@
Для данного проекта можно использовать базу ядра.
Таски запускаются с помощью gradle wrapper. Версия Gradle - 4.10.3.
Таски запускаются с помощью gradle wrapper. Версия Gradle - 7.5.1.
Nix
```bash

43
build.gradle
View File

@ -8,8 +8,6 @@ plugins {
id 'gradle-ncore' version("$pluginVersion")
}
//apply from: "dependencies.gradle"
targetCompatibility = 1.8
ncore {
@ -17,7 +15,7 @@ ncore {
sourceEncoding = 'UTF-8'
}
group = 'biz.redsoft.sample'
repositories {
maven {
@ -87,6 +85,7 @@ task copyDist(type: Copy) {
def versionPropertiesFilePath = sourceSets.main.resources.srcDirs[0].toString() + File.separator + "META-INF/ncore-product/${project.group}/version.properties"
release {
def newVersion = project.getVersion().toString().replace("-SNAPSHOT", "")
commitNewVersion.enabled(true)
failOnCommitNeeded = false
failOnPublishNeeded = true
@ -98,22 +97,50 @@ release {
preTagCommitMessage = '[Gradle Release Plugin] - pre tag commit: '
tagCommitMessage = '[Gradle Release Plugin] - creating tag: '
newVersionCommitMessage = '[Gradle Release Plugin] - new version commit: '
tagTemplate = "${project.name}/v${version}"
tagTemplate = "${project.name}/v${newVersion}"
versionPropertyFile = versionPropertiesFilePath
versionProperties = []
snapshotSuffix = '-SNAPSHOT'
buildTasks = ['buildRelease', 'commitNewVersion']
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()
}
]
pushReleaseVersionBranch = null
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
}
}
}

BIN
db/ncore.zip Executable file → Normal file
View File

Binary file not shown.

21
dependencies.gradle
View File

@ -1,12 +1,9 @@
repositories {
mavenLocal()
maven {
url 'https://ncore-repo.red-soft.ru/repository/public'
if (project.credentials.user != null && project.credentials.password != null) {
credentials {
username project.credentials.user
password project.credentials.password
}
}
}
}
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")
}

9
gradle.properties
View File

@ -1,2 +1,7 @@
biz.redsoft.ncore.version=1.9.19.251
pluginVersion=3.0.82
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

4
ncore-properties-template.xml
View File

@ -2,8 +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>

1
settings.gradle
View File

@ -1,5 +1,6 @@
pluginManagement{
repositories {
mavenLocal()
maven { url 'https://ncore-repo.red-soft.ru/repository/public' }
}
}

1
src/main/java/biz/redsoft/sample/Product.java
View File

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

1
src/main/java/biz/redsoft/sample/Version.java
View File

@ -10,6 +10,7 @@ import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Version {
public static final Logger LOGGER = LoggerFactory.getLogger(Version.class);

8
src/main/webapp/WEB-INF/web.xml
View File

@ -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>
@ -50,6 +51,7 @@
<listener-class>biz.redsoft.ncore.dx.init.DxInitializationListener</listener-class>
</listener>
<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>

4
src/test/java/biz/redsoft/sample/SampleTests.java
View File

@ -9,9 +9,7 @@ import java.util.Properties;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
* @author Victor Bellavin
*/
public class SampleTests {
@Test
public void testProductName() throws IOException {

41
updates/SAMPLE-0000001.xml
View File

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<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="2025-05-27T19:56:20.177" Description="Создана подсистема &quot;SAMPLE&quot;" Documentclassid="8001" DocDate="2025-05-27" DocNumber="SAMPLE-0000001" Metaobjectname="SYS_PATCH"
SpNumber="1" SpRevision="1" SpStatus="2" SpSubsystem="SAMPLE" SpTimestamp="2025-05-27T19:56:20.177" SpUser="SYSDBA">
<DetSysLogSysPatch>
<SysLog SlogAction="I" SlogAddress="127.0.0.1/54126" SlogSubsystem="NCORE" SlogTimestamp="2025-05-27T19:56:07.197" SlogTransaction="2808158" SlogUser="SYSDBA"
SobjName="SYS_SUBSYSTEM">
<DetSysLogFieldsSysLog>
<SysLogFields SlfFieldName="CAPTION" SlfFieldString="SAMPLE" SlfIsNew="true"/>
<SysLogFields SlfFieldName="CODE" SlfFieldString="SAMPLE" SlfIsNew="true"/>
<SysLogFields SlfFieldName="UPDATE_ORDER" SlfFieldString="10" SlfIsNew="true"/>
</DetSysLogFieldsSysLog>
</SysLog>
<SysLog SlogAction="I" SlogAddress="127.0.0.1/54126" SlogSubsystem="SAMPLE" SlogTimestamp="2025-05-27T19:56:07.197" SlogTransaction="2808158" SlogUser="SYSDBA"
SobjName="SYS_LOOKUP">
<DetSysLogFieldsSysLog>
<SysLogFields SlfFieldName="SDOM_NAME" SlfFieldString="D_SUBSYSTEM" SlfIsNew="true"/>
<SysLogFields SlfFieldName="SLU_CAPTION" SlfFieldString="SAMPLE" SlfIsNew="true"/>
<SysLogFields SlfFieldName="SLU_GROUP" SlfIsNew="true"/>
<SysLogFields SlfFieldName="SLU_KEY" SlfFieldString="SAMPLE" SlfIsNew="true"/>
<SysLogFields SlfFieldName="SLU_MEMO" SlfIsNew="true"/>
<SysLogFields SlfFieldName="SLU_ORDER" SlfFieldString="10" SlfIsNew="true"/>
<SysLogFields SlfFieldName="SLU_SUBSYSTEM" SlfFieldString="SAMPLE" SlfIsNew="true"/>
</DetSysLogFieldsSysLog>
</SysLog>
<SysLog SlogAction="U" SlogAddress="127.0.0.1/54126" SlogSubsystem="NCORE" SlogTimestamp="2025-05-27T19:56:07.197" SlogTransaction="2808158" SlogUser="SYSDBA"
SobjName="SYS_LOOKUP">
<DetSysLogFieldsSysLog>
<SysLogFields SlfFieldName="SDOM_NAME" SlfFieldString="D_SUBSYSTEM" SlfIsNew="false"/>
<SysLogFields SlfFieldName="SLU_CAPTION" SlfFieldString="Ред Платформа" SlfIsNew="false"/>
<SysLogFields SlfFieldName="SLU_GROUP" SlfIsNew="false"/>
<SysLogFields SlfFieldName="SLU_KEY" SlfFieldString="NCORE" SlfIsNew="false"/>
<SysLogFields SlfFieldName="SLU_MEMO" SlfIsNew="false"/>
<SysLogFields SlfFieldName="SLU_ORDER" SlfFieldString="10" SlfIsNew="false"/>
<SysLogFields SlfFieldName="SLU_ORDER" SlfFieldString="20" SlfIsNew="true"/>
<SysLogFields SlfFieldName="SLU_SUBSYSTEM" SlfFieldString="NCORE" SlfIsNew="false"/>
</DetSysLogFieldsSysLog>
</SysLog>
</DetSysLogSysPatch>
</SysPatch>
</Objects>