diff --git a/.gitignore b/.gitignore index b3cbfe2a4..d0e607b49 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ dynamo-spring/target dynamo-vaadin/target dynamo-frontend-export/frontend/ *.sh +dynamo-frontend/frontend/generated diff --git a/dynamo-angular/pom.xml b/dynamo-angular/pom.xml index 03a8441e5..0b715df35 100644 --- a/dynamo-angular/pom.xml +++ b/dynamo-angular/pom.xml @@ -8,7 +8,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT ../target/staging/maven @@ -17,24 +17,41 @@ maven-jar-plugin - - model - dynamo/model - - - - maven-jar-plugin - - i18n - i18n - - - - maven-jar-plugin - - shared - shared - + + + package-model + package + + jar + + + model + dynamo/model + + + + package-i18n + package + + jar + + + i18n + i18n + + + + package-shared + package + + jar + + + shared + shared + + + maven-install-plugin diff --git a/dynamo-angular/src/main/resources/README.txt b/dynamo-angular/src/main/resources/README.txt new file mode 100644 index 000000000..a002559fa --- /dev/null +++ b/dynamo-angular/src/main/resources/README.txt @@ -0,0 +1 @@ +No content. diff --git a/dynamo-api/pom.xml b/dynamo-api/pom.xml index 7a1803e8b..ecee5a57f 100644 --- a/dynamo-api/pom.xml +++ b/dynamo-api/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 dynamo-api jar @@ -9,7 +8,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT ../target/staging/maven diff --git a/dynamo-export/pom.xml b/dynamo-export/pom.xml index d59d5d549..fac700d5b 100644 --- a/dynamo-export/pom.xml +++ b/dynamo-export/pom.xml @@ -8,7 +8,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT diff --git a/dynamo-formfill/pom.xml b/dynamo-formfill/pom.xml index 33d4d5921..a50b1523e 100644 --- a/dynamo-formfill/pom.xml +++ b/dynamo-formfill/pom.xml @@ -8,7 +8,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT diff --git a/dynamo-functional-domain/pom.xml b/dynamo-functional-domain/pom.xml index e3eafcdec..8fffa37d9 100644 --- a/dynamo-functional-domain/pom.xml +++ b/dynamo-functional-domain/pom.xml @@ -8,7 +8,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT diff --git a/dynamo-impl/pom.xml b/dynamo-impl/pom.xml index 86dea5499..963c78b1a 100644 --- a/dynamo-impl/pom.xml +++ b/dynamo-impl/pom.xml @@ -8,7 +8,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT diff --git a/dynamo-integration-camel/pom.xml b/dynamo-integration-camel/pom.xml index 80e6ca9b2..fb096d743 100644 --- a/dynamo-integration-camel/pom.xml +++ b/dynamo-integration-camel/pom.xml @@ -8,7 +8,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT 4.0.0-M2 diff --git a/dynamo-integration-import/pom.xml b/dynamo-integration-import/pom.xml index 264defc3c..9c4191eb2 100644 --- a/dynamo-integration-import/pom.xml +++ b/dynamo-integration-import/pom.xml @@ -8,7 +8,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT diff --git a/dynamo-rest/pom.xml b/dynamo-rest/pom.xml index ac2d84f21..22f35c701 100644 --- a/dynamo-rest/pom.xml +++ b/dynamo-rest/pom.xml @@ -8,7 +8,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT diff --git a/dynamo-test/pom.xml b/dynamo-test/pom.xml index c0dcc6657..45012f6b1 100644 --- a/dynamo-test/pom.xml +++ b/dynamo-test/pom.xml @@ -4,7 +4,7 @@ org.dynamoframework dynamo-parent - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT dynamo-test jar diff --git a/pom.xml b/pom.xml index 8bdc20da9..903629d53 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 org.dynamoframework dynamo-parent pom - 4.0.0-SNAPSHOT + 4.0.0-RC2-SNAPSHOT Dynamo Framework Dynamo Web Application Accelerator is a development framework that aims to increase productivity. https://www.dynamoframework.org @@ -107,7 +106,7 @@ 5.10.3 1.18.34 5.9 - 3.1.0 + 3.2.7 1.6.13 5.3.0 5.1.0 @@ -126,6 +125,7 @@ ${project.organization.name} ${project.organization.url} ${project.scm.url} + 1F134B2687255F8C @@ -291,6 +291,7 @@ -Prelease deploy nexus-staging:release + dynamoframework-@{project.version} @@ -537,7 +538,7 @@ maven-scm-publish-plugin false - gh-pages-tommy + gh-pages ${project.build.directory}/staging true .git diff --git a/src/docs/asciidoc/css/ocs.css b/src/docs/asciidoc/css/ocs.css index 7d1f4f5b5..d87a7a9cc 100644 --- a/src/docs/asciidoc/css/ocs.css +++ b/src/docs/asciidoc/css/ocs.css @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -155,5 +155,10 @@ table.tableblock > .title, } pre.rouge { - background-color: #cee0cf !important; + background-color: #e9f0e8 !important; +} + +p { + text-align: justify; + text-justify: inter-word; } diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc index 355dfe12a..3428426fa 100644 --- a/src/docs/asciidoc/index.adoc +++ b/src/docs/asciidoc/index.adoc @@ -55,8 +55,8 @@ But this overview is intended to summarize the most notable features and benefit * Choice of layouts: ** A _simple search_ layout consisting of a search form based on the Dynamo Entity Model and a results table ** An _edit form_ that can be used to create new entities or modify existing ones -** A _split layout_ that can be used to display a results table and an input form next to each other. The results table can optionaly be filtered with a simple quick search or a search popup dialog -** A _search dialog_ to filter and select one or more entities from a potential large resultset +** A _split layout_ that can be used to display a results table and an input form next to each other. The results table can optionally be filtered with a simple quick search or a search popup dialog +** A _search dialog_ to filter and select one or more entities from a potential large result set ** The _FlexibleSearchLayout_ is a search layout that allows the user to create complex search query’s by adding/removing search criteria ** The _EntityPopupDialog_ is a popup dialog that allows the user to create or modify a single entity. * Automatic form filler using AI (LLM), copy your unstructured data to the form filler dialog and the AI will interpret the data and automatically translate, transform, convert and fill in the form fields @@ -77,7 +77,7 @@ But this overview is intended to summarize the most notable features and benefit * Field ordering can be declared * Integrated bean validation with fields in UI * Custom validation support in UI -* Paging and Lazy loading of large resultsets +* Paging and Lazy loading of large result sets * Default transformation of Enum values to select component * Automatic link generation to navigate from a child relationship to the applicable detail form * The option to post-process the edit form after the components have been created (e.g. to add dependencies between fields) diff --git a/src/docs/asciidoc/reference.adoc b/src/docs/asciidoc/reference.adoc index 9931584c9..39152ca71 100644 --- a/src/docs/asciidoc/reference.adoc +++ b/src/docs/asciidoc/reference.adoc @@ -1072,13 +1072,13 @@ element collection. In this case, you must set the `maxLength` directly using the `@Attribute` annotation. [source,java] ---- +-- @ElementCollection(fetch = FetchType.LAZY) @CollectionTable(name = "person_tags") @Column(name = "tag") @Attribute(visibleInForm = VisibilityType.SHOW, visibleInGrid = VisibilityType.HIDE, minLength = 4, maxLength = 12, elementCollectionMode = ElementCollectionMode.DIALOG) ---- +-- === Max length in grid @@ -1111,7 +1111,7 @@ element collection. In this case, you must set the `maxValue` directly using the `@Attribute` annotation. [source,java] ---- +-- @ElementCollection(fetch = FetchType.LAZY) @CollectionTable(name = "person_lucky_numbers") @Column(name = "lucky_number") @@ -1119,7 +1119,7 @@ using the `@Attribute` annotation. minValue = 10, maxValue = 100, elementCollectionMode = ElementCollectionMode.CHIPS) @Size(max = 3) private Set<@Min(10) @Max(value = 100) Integer> luckyNumbers = new HashSet<>(); ---- +-- === Member type @@ -5113,7 +5113,7 @@ In order to view a PDF file that is stored in a field on an entity, use the foll > -- -With the "mode" pointing to `PdfViewerMode.MODEL`. This will render a PDF file stored in the `logo.image` +With the `mode` pointing to `PdfViewerMode.MODEL`. This will render a PDF file stored in the `logo.image` field of the `Gift` entity with primary key `2`. To refer to an internal URL, use the following: