Compare commits
56 Commits
ncore-samp
...
ncore-samp
| Author | SHA1 | Date | |
|---|---|---|---|
| 4c87ee8325 | |||
| 079c5a8074 | |||
| c6c7da53fa | |||
| f6ebda575a | |||
| 5124bac61b | |||
| 197efd0354 | |||
| 53c26d3b8d | |||
| 86834a4de4 | |||
| b67e2c8a75 | |||
| 2cacafb9c1 | |||
| 4b192e8e6f | |||
| 470b4c05d1 | |||
| a1cb2a6240 | |||
| 8214db2388 | |||
| 85dccc65fd | |||
| b0061ba410 | |||
| 2222a7c231 | |||
| be0b4c4dd0 | |||
| 6d9489b894 | |||
| 9f2d4c9db5 | |||
| 48fe400d01 | |||
| 195c5e701b | |||
| af1d01e503 | |||
| 6fff193d2f | |||
| 2c8d756763 | |||
| 40a232f3b2 | |||
| f589f49015 | |||
| b48b53e28a | |||
| a01f5c547a | |||
| f89be239fc | |||
| 8558b245be | |||
| 03e4997b05 | |||
| 05cdc4fde3 | |||
| 306ae182c1 | |||
| 410ea4d826 | |||
| 044ef38cbd | |||
| 15233b2d09 | |||
| 642a8eedce | |||
| c75b2aca5d | |||
| 1a25a0d85c | |||
| 29ac441c33 | |||
| 8fc5daf4d2 | |||
| bbecab908a | |||
| 4e2db97690 | |||
| e229c0ea44 | |||
| 3f865cf0dd | |||
| c13087a947 | |||
| 41afcd70ef | |||
| af2d6bb049 | |||
| 842155d887 | |||
| a242fe86ff | |||
| 4300f62951 | |||
| 861c6af76a | |||
| cd4cc614a6 | |||
| 2481138e00 | |||
| 43bce7ea55 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -7,3 +7,5 @@ gen
|
||||
.idea/misc.xml
|
||||
ncore-properties-local.xml
|
||||
*.iml
|
||||
/out
|
||||
dependencies.gradle
|
||||
@ -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>
|
||||
@ -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
54
.idea/codeStyles/Project.xml
generated
Normal 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
6
.idea/codeStyles/codeStyleConfig.xml
generated
Normal 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>
|
||||
45
.idea/compiler.xml
generated
45
.idea/compiler.xml
generated
@ -11,8 +11,53 @@
|
||||
<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>
|
||||
<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>
|
||||
</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>
|
||||
3
.idea/gradle.xml
generated
3
.idea/gradle.xml
generated
@ -4,14 +4,13 @@
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="1.8" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
</set>
|
||||
</option>
|
||||
<option name="resolveModulePerSourceSet" value="false" />
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
|
||||
15
.idea/jarRepositories.xml
generated
15
.idea/jarRepositories.xml
generated
@ -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>
|
||||
5
.idea/modules.xml
generated
5
.idea/modules.xml
generated
@ -3,7 +3,10 @@
|
||||
<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/sample.main.iml" filepath="$PROJECT_DIR$/.idea/modules/sample.main.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
2
.idea/runConfigurations/MainForm.xml
generated
2
.idea/runConfigurations/MainForm.xml
generated
@ -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">
|
||||
|
||||
10
README.md
10
README.md
@ -5,7 +5,7 @@
|
||||
|
||||
Для данного проекта можно использовать базу ядра.
|
||||
|
||||
Таски запускаются с помощью gradle wrapper. Версия Gradle - 4.10.3.
|
||||
Таски запускаются с помощью gradle wrapper. Версия Gradle - 7.6.4.
|
||||
|
||||
Nix
|
||||
```bash
|
||||
@ -20,6 +20,7 @@ gradlew.bat build
|
||||
|
||||
### Основные таски
|
||||
|
||||
* ncoreRestoreDatabase (или nRDB) - восстановление базы из бекапа
|
||||
* ncoreLoadPatches (или patch) - загрузка патчей
|
||||
* ncoreApplyPatches (или update) - применение патчей
|
||||
* ncoreUpdateDb (или updateDatabase) - загрузка и применение патчей
|
||||
@ -34,6 +35,11 @@ gradlew.bat build
|
||||
|
||||
Если нужно выполнить таск, но при этом не выполнять определенные такси из его зависимостей, то можно воспользоваться ключом -x.
|
||||
|
||||
Запуск проекта одной командой:
|
||||
```bash
|
||||
./gradlew nRDB build run
|
||||
```
|
||||
|
||||
Компиляция классов:
|
||||
```bash
|
||||
./gradlew classes -x generateSources
|
||||
@ -100,7 +106,7 @@ rootProject.name = 'biz.redsoft.myproject'
|
||||
|
||||
9. Актуальная версия ядра указывается в файле gradle.properties:
|
||||
```
|
||||
biz.redsoft.ncore.version=1.8.5.0
|
||||
biz.redsoft.ncore.version=1.10.339.9
|
||||
```
|
||||
Запуск толстого клиента осуществляется в собранном дистрибутиве (distTar или distZip) в каталоге bin командой:
|
||||
start-client.bat (или ./start-client в линуксе)
|
||||
|
||||
142
build.gradle
142
build.gradle
@ -1,33 +1,36 @@
|
||||
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.7')
|
||||
id 'idea'
|
||||
id 'eclipse'
|
||||
id 'application'
|
||||
id 'java-library'
|
||||
id 'war'
|
||||
id 'gradle-ncore' version("$pluginVersion")
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
group = 'biz.redsoft.sample'
|
||||
java {
|
||||
withSourcesJar()
|
||||
sourceCompatibility = project.properties.'java.version' ?: 17
|
||||
}
|
||||
|
||||
apply plugin: 'nu.studer.credentials'
|
||||
apply plugin: 'idea'
|
||||
apply plugin: 'application'
|
||||
apply plugin: 'war'
|
||||
apply plugin: 'ncore'
|
||||
|
||||
targetCompatibility = 1.8
|
||||
test {
|
||||
failOnNoDiscoveredTests = false
|
||||
}
|
||||
|
||||
ncore {
|
||||
coreVersion = project.properties.'biz.redsoft.ncore.version'
|
||||
sourceEncoding = 'UTF-8'
|
||||
}
|
||||
|
||||
group = 'biz.redsoft.sample'
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
maven {
|
||||
url 'http://nexus.red-soft.biz/repository/public'
|
||||
def repo = getProperty("biz.redsoft.private.repo")
|
||||
url repo
|
||||
if (repo.contains("http:/"))
|
||||
allowInsecureProtocol = true
|
||||
if (project.credentials.user != null && project.credentials.password != null) {
|
||||
credentials {
|
||||
username project.credentials.user
|
||||
@ -38,13 +41,15 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testImplementation 'junit:junit:4.13.1'
|
||||
|
||||
provided 'javax.servlet:javax.servlet-api:3.1.0'
|
||||
|
||||
testCompile 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||
testCompileOnly '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'
|
||||
runtimeOnly files(ncoreGenerateControlDataJar)
|
||||
runtimeOnly files(genJar)
|
||||
implementation("jakarta.servlet:jakarta.servlet-api:5.0.0")
|
||||
}
|
||||
|
||||
|
||||
// writing build process to a log file
|
||||
// --------------------- BUILD LOG SETTINGS ----------------------
|
||||
def tstamp = new Date().format('yyyy-MM-dd_HH-mm-ss')
|
||||
@ -52,7 +57,11 @@ 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() {
|
||||
@ -68,12 +77,13 @@ gradle.services.get(LoggingOutputInternal).addStandardErrorListener (new Standar
|
||||
})
|
||||
// --------------------- BUILD LOG SETTINGS ----------------------
|
||||
|
||||
run.args = ['client',
|
||||
run.args += ['client',
|
||||
'-config', 'ncore-properties.xml',
|
||||
'-config', 'ncore-properties-local.xml']
|
||||
|
||||
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'))
|
||||
@ -83,12 +93,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
|
||||
}
|
||||
BIN
db/ncore.7z
BIN
db/ncore.7z
Binary file not shown.
BIN
db/ncore.zip
Normal file
BIN
db/ncore.zip
Normal file
Binary file not shown.
10
dependencies.gradle
Normal file
10
dependencies.gradle
Normal file
@ -0,0 +1,10 @@
|
||||
dependencies {
|
||||
implementation("biz.redsoft.ncore:ncore-JDK17:1.10.339.68")
|
||||
updates("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:updates")
|
||||
codemaker("biz.redsoft.ncore:ncore-JDK17:1.10.339.68")
|
||||
implementation("biz.redsoft.ncore:ncore-util-JDK17:1.10.339.68")
|
||||
implementation("biz.redsoft.ncore:ncore-cryptoapisec-JDK17:1.10.339.68")
|
||||
implementation("biz.redsoft.ncore:ncore-jna-JDK17:1.10.339.68")
|
||||
codemaker("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:gen")
|
||||
testImplementation("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:tests")
|
||||
}
|
||||
@ -1 +1,7 @@
|
||||
biz.redsoft.ncore.version=1.8.44.67
|
||||
biz.redsoft.ncore.version=1.10.339.68
|
||||
org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError
|
||||
org.gradle.daemon=false
|
||||
org.gradle.configureondemand=true
|
||||
pluginVersion=4.0.18
|
||||
biz.redsoft.public.repo=https://ncore-repo.red-soft.ru/repository/public
|
||||
biz.redsoft.private.repo=https://ncore-repo.red-soft.ru/repository/ncorez
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@ -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-9.0.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
|
||||
|
||||
22
gradlew
vendored
22
gradlew
vendored
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/usr/bin/env sh
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
@ -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
6
gradlew.bat
vendored
@ -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
|
||||
|
||||
@ -3,4 +3,9 @@
|
||||
<properties>
|
||||
<entry key="ncore.developer.mode">true</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 +1,13 @@
|
||||
pluginManagement{
|
||||
repositories {
|
||||
mavenLocal()
|
||||
maven {
|
||||
def repo = getProperty("biz.redsoft.public.repo")
|
||||
url repo
|
||||
if (repo.contains("http:/"))
|
||||
allowInsecureProtocol = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rootProject.name = 'sample'
|
||||
2
src/dist/bin/starter
vendored
2
src/dist/bin/starter
vendored
@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
|
||||
cd $(dirname $0)/..
|
||||
bin/ncore $1 -config config/ncore-properties.xml $2 $3 $4 $5
|
||||
bin/sample $1 -config config/ncore-properties.xml $2 $3 $4 $5
|
||||
cd $OLDPWD
|
||||
2
src/dist/bin/starter.bat
vendored
2
src/dist/bin/starter.bat
vendored
@ -1,5 +1,5 @@
|
||||
@echo off
|
||||
|
||||
pushd "%~dp0\.."
|
||||
call bin\ncore.bat %1 -config config\ncore-properties.xml %2 %3 %4 %5
|
||||
call bin\sample.bat %1 -config config\ncore-properties.xml %2 %3 %4 %5
|
||||
popd
|
||||
15
src/dist/bin/sync-full
vendored
Normal file
15
src/dist/bin/sync-full
vendored
Normal file
@ -0,0 +1,15 @@
|
||||
#!/bin/bash
|
||||
|
||||
$(dirname $0)/starter patch updates
|
||||
|
||||
if [ $? -ne 0 ] ; then
|
||||
echo Error patch loading
|
||||
exit 10
|
||||
fi
|
||||
|
||||
$(dirname $0)/starter update -fullSync
|
||||
|
||||
if [ $? -ne 0 ] ; then
|
||||
echo Error updating database
|
||||
exit 11
|
||||
fi
|
||||
7
src/dist/bin/sync-full.bat
vendored
Normal file
7
src/dist/bin/sync-full.bat
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
@echo off
|
||||
|
||||
call "%~dp0\starter.bat" patch updates
|
||||
if ERRORLEVEL == 1 goto :EOF
|
||||
|
||||
call "%~dp0\starter.bat" update -fullSync
|
||||
@pause
|
||||
@ -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();
|
||||
|
||||
|
||||
@ -10,9 +10,6 @@ import java.util.Properties;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* @author Victor Bellavin
|
||||
*/
|
||||
public class Version {
|
||||
public static final Logger LOGGER = LoggerFactory.getLogger(Version.class);
|
||||
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 953 B |
Binary file not shown.
|
After Width: | Height: | Size: 1016 B |
@ -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>
|
||||
|
||||
@ -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");
|
||||
}
|
||||
}
|
||||
|
||||
120
src/test/java/biz/redsoft/sample/TomcatStarter.java
Normal file
120
src/test/java/biz/redsoft/sample/TomcatStarter.java
Normal file
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
0
updates/.gitkeep
Normal file
0
updates/.gitkeep
Normal file
41
updates/SAMPLE-0000001.xml
Normal file
41
updates/SAMPLE-0000001.xml
Normal file
@ -0,0 +1,41 @@
|
||||
<?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="Создана подсистема "SAMPLE"" 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>
|
||||
Reference in New Issue
Block a user