New branch

This commit is contained in:
2023-10-02 12:44:06 +03:00
parent 41afcd70ef
commit c13087a947
18 changed files with 227 additions and 231 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ gen
.idea/misc.xml
ncore-properties-local.xml
*.iml
/out

View File

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

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>

25
.idea/compiler.xml generated
View File

@ -11,8 +11,33 @@
<entry name="!?*.kt" />
<entry name="!?*.clj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile name="Gradle Imported" enabled="true">
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncoreAnnotationProcessor/1.0.5/ace0df7e3891cfc64042351df8616cf91e89c800/ncoreAnnotationProcessor-1.0.5.jar" />
<entry name="$PROJECT_DIR$/../../../../../.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="$PROJECT_DIR$/../../../../../.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="$PROJECT_DIR$/../../../../../.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="$PROJECT_DIR$/../../../../../.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="$PROJECT_DIR$/../../../../../.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="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/1.2/ca270191fd7d2a7297da7c8f29184206df10c67d/auto-common-1.2.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.guava/guava/31.0.1-jre/119ea2b2bc205b138974d351777b20f02b92704b/guava-31.0.1-jre.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar" />
<entry name="$PROJECT_DIR$/../../../../../.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="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.12.0/d5692f0526415fcc6de94bb5bfbd3afd9dd3b3e5/checker-qual-3.12.0.jar" />
<entry name="$PROJECT_DIR$/../../../../../.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="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.3/ba035118bc8bac37d7eff77700720999acd9986d/j2objc-annotations-1.3.jar" />
</processorPath>
<module name="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" />
</bytecodeTargetLevel>
</component>
</project>

1
.idea/gradle.xml generated
View File

@ -11,7 +11,6 @@
<option value="$PROJECT_DIR$" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>

View File

@ -21,5 +21,10 @@
<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>
</component>
</project>

2
.idea/modules.xml generated
View File

@ -3,7 +3,7 @@
<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/sample.main.iml" filepath="$PROJECT_DIR$/.idea/modules/sample.main.iml" />
</modules>
</component>
</project>

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

View File

@ -1,22 +1,15 @@
buildscript {
repositories {
maven { url 'http://nexus.red-soft.biz/repository/public' }
mavenLocal()
}
dependencies {
classpath 'biz.redsoft.gradle.ncore:gradle-ncore:1.2.+'
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('2.9.+')
}
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 {
@ -27,22 +20,23 @@ ncore {
repositories {
mavenLocal()
maven {
url 'http://nexus.red-soft.biz/repository/public'
url 'https://nexus.red-soft.ru/repository/public'
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 'org.junit.jupiter:junit-jupiter:5.8.2'
implementation 'javax.servlet:javax.servlet-api:3.1.0'
implementation 'biz.redsoft.gradle.ncore:gradle-ncore:2.9.+'
testCompileClasspath 'org.junit.jupiter:junit-jupiter:5.8.2'
runtimeClasspath files(ncoreGenerateControlDataJar)
runtimeClasspath files(genJar)
annotationProcessor 'biz.redsoft.ncore:ncoreAnnotationProcessor:1.0.+'
}
// writing build process to a log file
@ -52,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
}
@ -83,15 +81,38 @@ 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'
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${version}"
versionPropertyFile = versionPropertiesFilePath
versionProperties = []
snapshotSuffix = '-SNAPSHOT'
buildTasks = ['buildRelease', 'commitNewVersion']
ignoredSnapshotDependencies = []
versionPatterns = [
/(\d+)(\.)(\d+)(\.)(\d+)([^\d]*\u0024)/: { Matcher m, Project p ->
project.getVersion().newVersion().toString()
}
]
pushReleaseVersionBranch = null
}
task buildRelease(type: GradleBuild) {
tasks = ['clean', 'writeVersion', 'nbackup', 'build', 'copyDist', 'publish']
}
idea { module.scopes.PROVIDED.plus += [configurations.provided] }
jar{
manifest{
@ -102,6 +123,13 @@ jar{
}
}
startScripts{
startScripts {
project.startScripts.defaultJvmOpts = ['-Dlogback.configurationFile=./config/logback.xml']
}
distTar {
duplicatesStrategy = DuplicatesStrategy.WARN
}
distZip {
duplicatesStrategy = DuplicatesStrategy.WARN
}

View File

@ -1 +1,3 @@
biz.redsoft.ncore.version=1.9.+
biz.redsoft.ncore.version=1.10.13.0
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

Binary file not shown.

View File

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

26
gradlew vendored
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
##############################################################################
##
@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn ( ) {
warn () {
echo "$*"
}
die ( ) {
die () {
echo
echo "$*"
echo
@ -154,11 +154,19 @@ if $cygwin ; then
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=("$@")
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
APP_ARGS=$(save "$@")
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

6
gradlew.bat vendored
View File

@ -49,7 +49,6 @@ goto fail
@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.
@ -60,11 +59,6 @@ set _SKIP=2
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

View File

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

View File

@ -0,0 +1,45 @@
/*
* Copyright (C) 2023 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;
public class MainForm extends biz.redsoft.ncore.client.MainForm {
public static void main(String[] args) throws Throwable {
biz.redsoft.ncore.client.MainForm.main(args);
}
}