Merge remote-tracking branch 'origin/dynamo-v40' into dynamo-v40

.gitignore

@@ -60,3 +60,4 @@ dynamo-spring/target
 dynamo-vaadin/target
 dynamo-frontend-export/frontend/
 *.sh
+dynamo-frontend/frontend/generated

dynamo-angular/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.dynamoframework</groupId>
 		<artifactId>dynamo-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-RC2-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<stagingDirectory>../target/staging/maven</stagingDirectory>
@@ -17,24 +17,41 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<classifier>model</classifier>
-					<classesDirectory>dynamo/model</classesDirectory>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<classifier>i18n</classifier>
-					<classesDirectory>i18n</classesDirectory>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<classifier>shared</classifier>
-					<classesDirectory>shared</classesDirectory>
-				</configuration>
+				<executions>
+					<execution>
+						<id>package-model</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<classifier>model</classifier>
+							<classesDirectory>dynamo/model</classesDirectory>
+						</configuration>
+					</execution>
+					<execution>
+						<id>package-i18n</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<classifier>i18n</classifier>
+							<classesDirectory>i18n</classesDirectory>
+						</configuration>
+					</execution>
+					<execution>
+						<id>package-shared</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<classifier>shared</classifier>
+							<classesDirectory>shared</classesDirectory>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<artifactId>maven-install-plugin</artifactId>

dynamo-angular/src/main/resources/README.txt

@@ -0,0 +1 @@
+No content.

dynamo-api/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dynamo-api</artifactId>
     <packaging>jar</packaging>
@@ -9,7 +8,7 @@
     <parent>
         <groupId>org.dynamoframework</groupId>
         <artifactId>dynamo-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.0-RC2-SNAPSHOT</version>
     </parent>
     <properties>
         <stagingDirectory>../target/staging/maven</stagingDirectory>

dynamo-export/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.dynamoframework</groupId>
 		<artifactId>dynamo-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-RC2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

dynamo-formfill/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.dynamoframework</groupId>
 		<artifactId>dynamo-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-RC2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

dynamo-functional-domain/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.dynamoframework</groupId>
 		<artifactId>dynamo-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-RC2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<!-- Other Dynamo modules -->

dynamo-impl/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.dynamoframework</groupId>
 		<artifactId>dynamo-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-RC2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

dynamo-integration-camel/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.dynamoframework</groupId>
 		<artifactId>dynamo-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-RC2-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<camel.version>4.0.0-M2</camel.version>

dynamo-integration-import/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.dynamoframework</groupId>
 		<artifactId>dynamo-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-RC2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

dynamo-rest/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.dynamoframework</groupId>
 		<artifactId>dynamo-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-RC2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

dynamo-test/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.dynamoframework</groupId>
 		<artifactId>dynamo-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-RC2-SNAPSHOT</version>
 	</parent>
 	<artifactId>dynamo-test</artifactId>
 	<packaging>jar</packaging>

pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dynamoframework</groupId>
     <artifactId>dynamo-parent</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0-RC2-SNAPSHOT</version>
     <name>Dynamo Framework</name>
     <description>Dynamo Web Application Accelerator is a development framework that aims to increase productivity.</description>
     <url>https://www.dynamoframework.org</url>
@@ -107,7 +106,7 @@
         <junit.version>5.10.3</junit.version>
         <lombok.version>1.18.34</lombok.version>
         <opencsv.version>5.9</opencsv.version>
-        <org.apache.maven.plugins.gpg.version>3.1.0</org.apache.maven.plugins.gpg.version>
+        <org.apache.maven.plugins.gpg.version>3.2.7</org.apache.maven.plugins.gpg.version>
         <org.sonatype.plugins.version>1.6.13</org.sonatype.plugins.version>
         <poi.version>5.3.0</poi.version>
         <querydsl.version>5.1.0</querydsl.version>
@@ -126,6 +125,7 @@
         <asciidoc.organization.name>${project.organization.name}</asciidoc.organization.name>
         <asciidoc.organization.url>${project.organization.url}</asciidoc.organization.url>
         <asciidoc.github.url>${project.scm.url}</asciidoc.github.url>
+        <gpg.keyname>1F134B2687255F8C</gpg.keyname>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -291,6 +291,7 @@
                         <arguments>-Prelease</arguments>
                         <!-- Release to the Central Repository. -->
                         <goals>deploy nexus-staging:release</goals>
+                        <tagNameFormat>dynamoframework-@{project.version}</tagNameFormat>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -537,7 +538,7 @@
                 <artifactId>maven-scm-publish-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
-                    <scmBranch>gh-pages-tommy</scmBranch>
+                    <scmBranch>gh-pages</scmBranch>
                     <content>${project.build.directory}/staging</content>
                     <addUniqueDirectory>true</addUniqueDirectory>
                     <excludes>.git</excludes>

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;
 }

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)

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,15 +1111,15 @@ 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")
 @Attribute(visibleInForm = VisibilityType.SHOW, visibleInGrid = VisibilityType.HIDE,
         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
   ></app-pdf-viewer>
 --
 
-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: