From 5d887ffc1081cdf81f262f83f3af8f56c3d779cb Mon Sep 17 00:00:00 2001
From: Thibault Vallin <thibault.vallin@oracle.com>
Date: Tue, 26 Mar 2024 19:34:55 +0100
Subject: [PATCH] 3.x: Archetype - Backport several issues from 4.x to 3.x 
 (#8564)

* Fix Json code duplication

Signed-off-by: tvallin <thibault.vallin@oracle.com>

* Fix archetypes module

Signed-off-by: tvallin <thibault.vallin@oracle.com>

* Add opens WEB to module info for multipart

Signed-off-by: tvallin <thibault.vallin@oracle.com>

* Kubernetes uses ClusterIP instead of NodePort

Signed-off-by: tvallin <thibault.vallin@oracle.com>

* fix sql script for oracle database

Signed-off-by: tvallin <thibault.vallin@oracle.com>

* Archetype generates .gitignore

Signed-off-by: tvallin <thibault.vallin@oracle.com>

* update index.html to match backend endpoint

Signed-off-by: tvallin <thibault.vallin@oracle.com>

---------

Signed-off-by: tvallin <thibault.vallin@oracle.com>
---
 .../src/main/archetype/common/common.xml      |  1 +
 .../src/main/archetype/common/extra.xml       |  6 +--
 .../common/files/.gitignore.mustache          | 38 ++++++++++++++++
 .../archetype/common/files/app.yaml.mustache  |  9 ++--
 .../src/main/java/module-info.java.mustache   | 13 +++++-
 .../src/main/archetype/common/media.xml       | 44 +++++++++++--------
 .../main/archetype/common/observability.xml   |  8 ++--
 .../src/main/archetype/common/packaging.xml   | 25 +++++------
 .../src/main/archetype/common/security.xml    |  4 +-
 .../main/archetype/mp/custom/custom-mp.xml    |  3 +-
 .../src/main/archetype/mp/custom/database.xml | 18 +++++---
 .../archetype/mp/database/database-mp.xml     |  2 +-
 ...nit_script.sql => init_script.sql.default} |  0
 .../resources/META-INF/init_script.sql.oracle | 25 +++++++++++
 .../archetype/mp/quickstart/quickstart-mp.xml |  2 +-
 .../main/archetype/se/common/common-se.xml    |  2 +-
 .../main/archetype/se/custom/custom-se.xml    |  3 +-
 .../src/main/archetype/se/custom/database.xml |  6 ++-
 .../FileService.java.multipart.mustache       | 14 +++---
 .../FileStorage.java.multipart.mustache       |  6 +--
 .../files/src/main/resources/WEB/index.html   | 42 ++++++++++++++++++
 .../FileServiceTest.java.multipart.mustache   |  4 +-
 22 files changed, 204 insertions(+), 71 deletions(-)
 create mode 100644 archetypes/helidon/src/main/archetype/common/files/.gitignore.mustache
 rename archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/{init_script.sql => init_script.sql.default} (100%)
 create mode 100644 archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.oracle
 create mode 100644 archetypes/helidon/src/main/archetype/se/custom/files/src/main/resources/WEB/index.html

diff --git a/archetypes/helidon/src/main/archetype/common/common.xml b/archetypes/helidon/src/main/archetype/common/common.xml
index c68513c077d..7f3fa8cb83c 100644
--- a/archetypes/helidon/src/main/archetype/common/common.xml
+++ b/archetypes/helidon/src/main/archetype/common/common.xml
@@ -42,6 +42,7 @@
             <includes>
                 <include>.helidon.mustache</include>
                 <include>README.md.mustache</include>
+                <include>.gitignore.mustache</include>
             </includes>
         </templates>
         <model>
diff --git a/archetypes/helidon/src/main/archetype/common/extra.xml b/archetypes/helidon/src/main/archetype/common/extra.xml
index 4305e0dce91..af7ccd34bb3 100644
--- a/archetypes/helidon/src/main/archetype/common/extra.xml
+++ b/archetypes/helidon/src/main/archetype/common/extra.xml
@@ -33,7 +33,7 @@
                             </includes>
                         </templates>
                         <model>
-                            <list key="modules">
+                            <list key="module-requires">
                                 <value>io.helidon.webclient</value>
                             </list>
                         </model>
@@ -67,7 +67,7 @@
                                     <value key="artifactId">helidon-webclient</value>
                                 </map>
                             </list>
-                            <list key="modules">
+                            <list key="module-requires">
                                 <value if="${flavor} == 'mp'">io.helidon.microprofile.faulttolerance</value>
                                 <value if="${flavor} == 'mp'">io.helidon.common.reactive</value>
                                 <value if="${flavor} == 'se'">io.helidon.faulttolerance</value>
@@ -154,7 +154,7 @@
                 .addCrossOrigin(CrossOriginConfig.create())
                 .build();]]></value>
                             </list>
-                            <list key="modules">
+                            <list key="module-requires">
                                 <value if="${flavor} == 'mp'">io.helidon.microprofile.cors</value>
                                 <value if="${flavor} == 'se'">io.helidon.webserver.cors</value>
                             </list>
diff --git a/archetypes/helidon/src/main/archetype/common/files/.gitignore.mustache b/archetypes/helidon/src/main/archetype/common/files/.gitignore.mustache
new file mode 100644
index 00000000000..2a9fe873a8d
--- /dev/null
+++ b/archetypes/helidon/src/main/archetype/common/files/.gitignore.mustache
@@ -0,0 +1,38 @@
+# Compiled class file
+*.class
+
+# Maven
+target/
+.m2/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# IntelliJ Idea
+.idea/
+*.iws
+*.ipr
+*.iml
+*.releaseBackup
+atlassian-ide-plugin.xml
+
+# Netbeans
+nbactions.xml
+nb-configuration.xml
+
+# Eclipse
+.settings
+.settings/
+.project
+.classpath
+.factorypath
+
+{{#gitignore}}
+{{.}}
+{{/gitignore}}
diff --git a/archetypes/helidon/src/main/archetype/common/files/app.yaml.mustache b/archetypes/helidon/src/main/archetype/common/files/app.yaml.mustache
index 9a51f58cd6b..4178b288e06 100644
--- a/archetypes/helidon/src/main/archetype/common/files/app.yaml.mustache
+++ b/archetypes/helidon/src/main/archetype/common/files/app.yaml.mustache
@@ -5,13 +5,14 @@ metadata:
   labels:
     app: {{artifactId}}
 spec:
-  type: NodePort
+  type: ClusterIP
   selector:
     app: {{artifactId}}
   ports:
-  - port: 8080
-    targetPort: 8080
-    name: http
+    - name: tcp
+      port: 8080
+      protocol: TCP
+      targetPort: 8080
 ---
 kind: Deployment
 apiVersion: apps/v1
diff --git a/archetypes/helidon/src/main/archetype/common/files/src/main/java/module-info.java.mustache b/archetypes/helidon/src/main/archetype/common/files/src/main/java/module-info.java.mustache
index 90323eb4445..4e520db9fc8 100644
--- a/archetypes/helidon/src/main/archetype/common/files/src/main/java/module-info.java.mustache
+++ b/archetypes/helidon/src/main/archetype/common/files/src/main/java/module-info.java.mustache
@@ -1,6 +1,15 @@
 
 module {{package}} {
-{{#modules}}
+{{#module-requires}}
     requires {{.}};
-{{/modules}}
+{{/module-requires}}
+
+    exports {{package}};
+
+{{#module-opens}}
+    opens {{.}};
+{{/module-opens}}
+{{#module-opens-package}}
+    opens {{package}};
+{{/module-opens-package}}
 }
\ No newline at end of file
diff --git a/archetypes/helidon/src/main/archetype/common/media.xml b/archetypes/helidon/src/main/archetype/common/media.xml
index 6ae68576b29..3ec1ab32211 100644
--- a/archetypes/helidon/src/main/archetype/common/media.xml
+++ b/archetypes/helidon/src/main/archetype/common/media.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -34,12 +34,6 @@
                             <option value="jsonp" name="JSON-P" description="Jakarta JSON Processing" if="${flavor} == 'se'">
                                 <output>
                                     <model>
-                                        <list key="dependencies">
-                                            <map order="500">
-                                                <value key="groupId">io.helidon.media</value>
-                                                <value key="artifactId">helidon-media-jsonp</value>
-                                            </map>
-                                        </list>
                                         <list key="Main-helidon-imports">
                                             <value>io.helidon.media.jsonp.JsonpSupport</value>
                                         </list>
@@ -58,8 +52,7 @@
                                         <list key="WebClient-builder">
                                             <value><![CDATA[                .addMediaSupport(JsonpSupport.create())]]></value>
                                         </list>
-                                        <list key="modules">
-                                            <value>jakarta.json</value>
+                                        <list key="module-requires">
                                             <value>io.helidon.media.jsonp</value>
                                         </list>
                                     </model>
@@ -101,7 +94,7 @@
                                         <list key="WebClient-builder" if="${flavor} == 'se'">
                                             <value><![CDATA[                .addMediaSupport(JacksonSupport.create())]]></value>
                                         </list>
-                                        <list key="modules">
+                                        <list key="module-requires">
                                             <value>com.fasterxml.jackson.annotation</value>
                                             <value if="${flavor} == 'se'">io.helidon.media.jackson</value>
                                         </list>
@@ -144,8 +137,7 @@
                                         <list key="WebClient-builder" if="${flavor} == 'se'">
                                             <value><![CDATA[                .addMediaSupport(JsonbSupport.create())]]></value>
                                         </list>
-                                        <list key="modules">
-                                            <value>jakarta.json</value>
+                                        <list key="module-requires">
                                             <value if="${flavor} == 'se'">io.helidon.media.jsonb</value>
                                         </list>
                                     </model>
@@ -167,14 +159,14 @@
                                     <value key="artifactId">helidon-media-multipart</value>
                                 </map>
                                 <map order="500" if="${flavor} == 'se'">
-                                    <value key="groupId">io.helidon.media</value>
-                                    <value key="artifactId">helidon-media-jsonp</value>
+                                    <value key="groupId">io.helidon.webserver</value>
+                                    <value key="artifactId">helidon-webserver-static-content</value>
                                 </map>
                             </list>
-                            <list key="modules">
-                                <value>jakarta.json</value>
+                            <list key="module-requires">
                                 <value if="${flavor} == 'se'">io.helidon.media.multipart</value>
                                 <value if="${flavor} == 'se'">io.helidon.media.jsonp</value>
+                                <value if="${flavor} == 'se'">io.helidon.webserver.staticcontent</value>
                                 <value if="${flavor} == 'mp'">jersey.media.multipart</value>
                             </list>
                             <list key="MainTest-helidon-imports" if="${flavor} == 'se'">
@@ -182,9 +174,8 @@
                             </list>
                             <list key="Main-helidon-imports" if="${flavor} == 'se'">
                                 <value>io.helidon.media.jsonp.JsonpSupport</value>
-                            </list>
-                            <list key="Main-helidon-imports" if="${flavor} == 'se'">
                                 <value>io.helidon.media.multipart.MultiPartSupport</value>
+                                <value>io.helidon.webserver.staticcontent.StaticContentSupport</value>
                             </list>
                             <list key="Main-serverBuilder" if="${flavor} == 'se'">
                                 <value><![CDATA[                .addMediaSupport(JsonpSupport.create())]]></value>
@@ -196,7 +187,13 @@
                                 <value><![CDATA[                .addMediaSupport(MultiPartSupport.create())]]></value>
                             </list>
                             <list key="Main-routingBuilder" if="${flavor} == 'se'">
-                                <value><![CDATA[                .register("/multipart", new FileService())]]></value>
+                                <value order="1"><![CDATA[                .register("/ui", StaticContentSupport.builder("WEB")
+                        .welcomeFileName("index.html")
+                        .build())
+                .register("/multipart", new FileService())]]></value>
+                            </list>
+                            <list key="module-opens" if="${flavor} == 'se'">
+                                <value>WEB</value>
                             </list>
                         </model>
                     </output>
@@ -215,6 +212,15 @@
                 <value key="media-json-jackson" if="!(${media} contains 'json' &amp;&amp; ${media.json-lib} == 'jackson')">false</value>
                 <value key="json-lib" if="${media} contains 'json'">${media.json-lib}</value>
                 <value key="multipart" if="${media} contains 'multipart'">true</value>
+                <list key="dependencies" if="${media} contains 'multipart' || ${media.json-lib} == 'jsonp'">
+                    <map order="500" if="${flavor} == 'se'">
+                        <value key="groupId">io.helidon.media</value>
+                        <value key="artifactId">helidon-media-jsonp</value>
+                    </map>
+                </list>
+                <list key="module-requires" if="${media} contains 'multipart' || ['jsonp', 'jsonb'] contains ${media.json-lib}">
+                    <value>jakarta.json</value>
+                </list>
             </model>
         </output>
     </step>
diff --git a/archetypes/helidon/src/main/archetype/common/observability.xml b/archetypes/helidon/src/main/archetype/common/observability.xml
index 5337481cff8..2f87a8b3443 100644
--- a/archetypes/helidon/src/main/archetype/common/observability.xml
+++ b/archetypes/helidon/src/main/archetype/common/observability.xml
@@ -128,7 +128,7 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
     @Inject
     private MetricRegistry registry;]]></value>
                                     </list>
-                                    <list key="modules">
+                                    <list key="module-requires">
                                         <value>io.helidon.microprofile.metrics</value>
                                     </list>
                                 </model>
@@ -211,7 +211,7 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                     <list key="MainTest-static-imports">
                                         <value>static org.junit.jupiter.api.Assertions.assertEquals</value>
                                     </list>
-                                    <list key="modules">
+                                    <list key="module-requires">
                                         <value>io.helidon.integrations.micrometer</value>
                                     </list>
                                     <list key="readme-sections">
@@ -278,7 +278,7 @@ allRequests_total 0.0
         assertThat(response.status().code(), is(200));
     }]]></value>
                                 </list>
-                                <list key="modules" if="${flavor} == 'se'">
+                                <list key="module-requires" if="${flavor} == 'se'">
                                     <value>io.helidon.metrics</value>
                                 </list>
                                 <list key="readme-sections" if="${flavor} == 'se'">
@@ -345,7 +345,7 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                         <value key="artifactId">helidon-health-checks</value>
                                     </map>
                                 </list>
-                                <list key="modules">
+                                <list key="module-requires">
                                     <value>io.helidon.health</value>
                                     <value if="${flavor} == 'se'">io.helidon.health.checks</value>
                                 </list>
diff --git a/archetypes/helidon/src/main/archetype/common/packaging.xml b/archetypes/helidon/src/main/archetype/common/packaging.xml
index cb67faff227..02a3892c97f 100644
--- a/archetypes/helidon/src/main/archetype/common/packaging.xml
+++ b/archetypes/helidon/src/main/archetype/common/packaging.xml
@@ -37,9 +37,8 @@
                         </includes>
                     </templates>
                     <model>
-                    <list key="readme-sections">
-                    <value order="50" template="mustache">
-                        <![CDATA[
+                        <list key="readme-sections">
+                            <value order="50" template="mustache"><![CDATA[
 ## Run the application in Kubernetes
 
 If you don’t have access to a Kubernetes cluster, you can [install one](https://helidon.io/docs/latest/#/about/kubernetes) on your desktop.
@@ -60,22 +59,22 @@ kubectl get pods                            # Verify connectivity to cluster
 ### Deploy the application to Kubernetes
 
 ```
-kubectl create -f app.yaml                  # Deploy application
-kubectl get pods                            # Wait for quickstart pod to be RUNNING
-kubectl get service  {{artifactId}}         # Get service info
+kubectl create -f app.yaml                              # Deploy application
+kubectl get pods                                        # Wait for quickstart pod to be RUNNING
+kubectl get service  {{artifactId}}                     # Get service info
+kubectl port-forward service/{{artifactId}} 8081:8080   # Forward service port to 8081
 ```
 
-Note the PORTs. You can now exercise the application as you did before but use the second
-port number (the NodePort) instead of 8080.
+You can now exercise the application as you did before but use the port number 8081.
 
 After you’re done, cleanup.
 
 ```
 kubectl delete -f app.yaml
 ```
-                                ]]>
-                    </value>
-                    </list>
+]]>
+                            </value>
+                        </list>
                     </model>
                 </output>
             </boolean>
@@ -115,7 +114,7 @@ kubectl delete -f app.yaml
  * Note that this class is required when using modules as the module main class must be in a package that is either exported
  * or opened by the module, see {@link java.lang.module.ModuleDescriptor#read(java.io.InputStream, java.util.function.Supplier)}.
  * <p>
- * This class provides a proper module main class and calls the {@link io.helidon.Main#main(String[]) built-in main class}.
+ * This class provides a proper module main class and calls the {@link io.helidon.microprofile.cdi.Main#main(String[]) built-in main class}.
  */]]>
                         </value>
                         <value key="Main-method-javadoc"><![CDATA[
@@ -138,7 +137,7 @@ kubectl delete -f app.yaml
                         <list key="Main-method-content">
                             <value><![CDATA[io.helidon.microprofile.cdi.Main.main(args);]]></value>
                         </list>
-                        <list key="modules">
+                        <list key="module-requires">
                             <value>io.helidon.microprofile.cdi</value>
                         </list>
                     </model>
diff --git a/archetypes/helidon/src/main/archetype/common/security.xml b/archetypes/helidon/src/main/archetype/common/security.xml
index 6c07360008b..f3aae7da55d 100644
--- a/archetypes/helidon/src/main/archetype/common/security.xml
+++ b/archetypes/helidon/src/main/archetype/common/security.xml
@@ -47,7 +47,7 @@
                                             <value key="artifactId">helidon-microprofile-oidc</value>
                                         </map>
                                     </list>
-                                    <list key="modules" if="${flavor} == 'se'">
+                                    <list key="module-requires" if="${flavor} == 'se'">
                                         <value>io.helidon.security.providers.oidc</value>
                                     </list>
                                     <list key="Main-helidon-imports" if="${flavor} == 'se'">
@@ -191,7 +191,7 @@
                                 <value key="artifactId">helidon-security-integration-webserver</value>
                             </map>
                         </list>
-                        <list key="modules">
+                        <list key="module-requires">
                             <value if="${flavor} == 'se'">io.helidon.security</value>
                             <value if="${flavor} == 'se'">io.helidon.security.integration.webserver</value>
                         </list>
diff --git a/archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml b/archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml
index f3a75d32bb5..422da1255b6 100644
--- a/archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml
+++ b/archetypes/helidon/src/main/archetype/mp/custom/custom-mp.xml
@@ -78,12 +78,13 @@
                     <value key="artifactId">helidon-microprofile-core</value>
                 </map>
             </list>
-            <list key="modules">
+            <list key="module-requires">
                 <value>jakarta.cdi</value>
                 <value>jakarta.inject</value>
                 <value>jakarta.ws.rs</value>
                 <value>io.helidon.microprofile.config</value>
             </list>
+            <value key="module-opens-package">true</value>
         </model>
     </output>
 </archetype-script>
diff --git a/archetypes/helidon/src/main/archetype/mp/custom/database.xml b/archetypes/helidon/src/main/archetype/mp/custom/database.xml
index 93bf6814ad0..065db7d847a 100644
--- a/archetypes/helidon/src/main/archetype/mp/custom/database.xml
+++ b/archetypes/helidon/src/main/archetype/mp/custom/database.xml
@@ -173,6 +173,8 @@
                     <enum id="server" name="Select a Database Server" default="h2" optional="true">
                         <option value="h2" name="H2" description="In-memory relational database">
                             <output>
+                                <file source="../database/files/src/main/resources/META-INF/init_script.sql.default"
+                                      target="src/main/resources/META-INF/init_script.sql"/>
                                 <model>
                                     <value key="readme-description">Helidon MP application that uses the dbclient API with an in-memory H2 database.</value>
                                     <value key="readme-native-docker">docker run -d -p 1521:1521 -p 81:81 -e H2_OPTIONS='-ifNotExists' --name=h2 oscarfonts/h2</value>
@@ -275,6 +277,8 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee
                         </option>
                         <option value="mysql" name="MySQL" description="Relational database">
                             <output>
+                                <file source="../database/files/src/main/resources/META-INF/init_script.sql.default"
+                                      target="src/main/resources/META-INF/init_script.sql"/>
                                 <model>
                                     <value key="helidon-test">false</value>
                                     <value key="readme-description">Helidon MP application that uses the dbclient API with MySQL database.</value>
@@ -317,6 +321,8 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D
                         </option>
                         <option value="oracledb" name="Oracle DB" description="Multi-model database">
                             <output>
+                                <file source="../database/files/src/main/resources/META-INF/init_script.sql.oracle"
+                                      target="src/main/resources/META-INF/init_script.sql"/>
                                 <model>
                                     <value key="helidon-test">false</value>
                                     <value key="readme-description">Helidon MP application that uses the dbclient API with OracleDB database.</value>
@@ -383,12 +389,6 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
                     <text id="ds-name" name="Datasource Name" default="ds1" optional="true"/>
                 </inputs>
                 <output>
-                    <files>
-                        <directory>../database/files</directory>
-                        <includes>
-                            <include>src/*/resources/*/init_script.sql</include>
-                        </includes>
-                    </files>
                     <templates engine="mustache" transformations="mustache,packaged">
                         <directory>../database/files</directory>
                         <includes>
@@ -463,7 +463,7 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
                                 <value key="scope">runtime</value>
                             </map>
                         </list>
-                        <list key="modules">
+                        <list key="module-requires">
                             <value>jakarta.xml.bind</value>
                         </list>
                         <list key="maven-plugins">
@@ -495,6 +495,10 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
                 </executions>
             </plugin>]]></value>
                         </list>
+                        <list key="gitignore">
+                            <value>ObjectStore/</value>
+                            <value>PutObjectStoreDirHere/</value>
+                        </list>
                     </model>
                 </output>
             </boolean>
diff --git a/archetypes/helidon/src/main/archetype/mp/database/database-mp.xml b/archetypes/helidon/src/main/archetype/mp/database/database-mp.xml
index f8c576f1814..02390694411 100644
--- a/archetypes/helidon/src/main/archetype/mp/database/database-mp.xml
+++ b/archetypes/helidon/src/main/archetype/mp/database/database-mp.xml
@@ -32,7 +32,7 @@
             <list key="readme-exercise-the-application">
                 <value file="files/README.md"/>
             </list>
-            <list key="modules">
+            <list key="module-requires">
                 <value>jakarta.annotation</value>
                 <value>jakarta.persistence</value>
                 <value>jakarta.transaction</value>
diff --git a/archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql b/archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.default
similarity index 100%
rename from archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql
rename to archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.default
diff --git a/archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.oracle b/archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.oracle
new file mode 100644
index 00000000000..a0fa2f18a12
--- /dev/null
+++ b/archetypes/helidon/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.oracle
@@ -0,0 +1,25 @@
+INSERT INTO POKEMONTYPE VALUES (1, 'Normal')
+INSERT INTO POKEMONTYPE VALUES (2, 'Fighting')
+INSERT INTO POKEMONTYPE VALUES (3, 'Flying')
+INSERT INTO POKEMONTYPE VALUES (4, 'Poison')
+INSERT INTO POKEMONTYPE VALUES (5, 'Ground')
+INSERT INTO POKEMONTYPE VALUES (6, 'Rock')
+INSERT INTO POKEMONTYPE VALUES (7, 'Bug')
+INSERT INTO POKEMONTYPE VALUES (8, 'Ghost')
+INSERT INTO POKEMONTYPE VALUES (9, 'Steel')
+INSERT INTO POKEMONTYPE VALUES (10, 'Fire')
+INSERT INTO POKEMONTYPE VALUES (11, 'Water')
+INSERT INTO POKEMONTYPE VALUES (12, 'Grass')
+INSERT INTO POKEMONTYPE VALUES (13, 'Electric')
+INSERT INTO POKEMONTYPE VALUES (14, 'Psychic')
+INSERT INTO POKEMONTYPE VALUES (15, 'Ice')
+INSERT INTO POKEMONTYPE VALUES (16, 'Dragon')
+INSERT INTO POKEMONTYPE VALUES (17, 'Dark')
+INSERT INTO POKEMONTYPE VALUES (18, 'Fairy')
+
+INSERT INTO POKEMON VALUES (1, 'Bulbasaur', 12)
+INSERT INTO POKEMON VALUES (2, 'Charmander', 10)
+INSERT INTO POKEMON VALUES (3, 'Squirtle', 11)
+INSERT INTO POKEMON VALUES (4, 'Caterpie', 7)
+INSERT INTO POKEMON VALUES (5, 'Weedle', 7)
+INSERT INTO POKEMON VALUES (6, 'Pidgey', 3)
diff --git a/archetypes/helidon/src/main/archetype/mp/quickstart/quickstart-mp.xml b/archetypes/helidon/src/main/archetype/mp/quickstart/quickstart-mp.xml
index 0ccf1f7b2cf..5999287c19e 100644
--- a/archetypes/helidon/src/main/archetype/mp/quickstart/quickstart-mp.xml
+++ b/archetypes/helidon/src/main/archetype/mp/quickstart/quickstart-mp.xml
@@ -96,7 +96,7 @@
                     <value key="artifactId">helidon-microprofile-openapi</value>
                 </map>
             </list>
-            <list key="modules">
+            <list key="module-requires">
                 <value>io.helidon.microprofile.openapi</value>
             </list>
         </model>
diff --git a/archetypes/helidon/src/main/archetype/se/common/common-se.xml b/archetypes/helidon/src/main/archetype/se/common/common-se.xml
index 23519bad78c..f2964289aa9 100644
--- a/archetypes/helidon/src/main/archetype/se/common/common-se.xml
+++ b/archetypes/helidon/src/main/archetype/se/common/common-se.xml
@@ -89,7 +89,7 @@
                 <value>static org.hamcrest.MatcherAssert.assertThat</value>
                 <value>static org.hamcrest.Matchers.is</value>
             </list>
-            <list key="modules">
+            <list key="module-requires">
                 <value>io.helidon.webserver</value>
                 <value>io.helidon.common.http</value>
                 <value>io.helidon.config</value>
diff --git a/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml b/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml
index a9fde565518..77bd69a0003 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml
+++ b/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml
@@ -31,6 +31,7 @@
     <source src="/se/custom/observability.xml"/>
     <exec src="/se/common/common-se.xml"/>
     <output>
+        <file source="files/src/main/resources/WEB/index.html" target="src/main/resources/WEB/index.html" if="${media} contains 'multipart'"/>
         <model>
             <value order="0" key="readme-description">Minimal Helidon SE project suitable to start from scratch.</value>
             <list key="readme-exercise-the-application">
@@ -51,7 +52,7 @@
             <list key="application-yaml-entries">
                 <value file="files/src/main/resources/application.config.yaml"/>
             </list>
-            <list key="modules">
+            <list key="module-requires">
                 <value>java.logging</value>
             </list>
         </model>
diff --git a/archetypes/helidon/src/main/archetype/se/custom/database.xml b/archetypes/helidon/src/main/archetype/se/custom/database.xml
index 27e8dadaab1..12183359cad 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/database.xml
+++ b/archetypes/helidon/src/main/archetype/se/custom/database.xml
@@ -313,7 +313,7 @@ docker run --rm --name mongo -p 27017:27017 mongo
                                 <value key="artifactId">slf4j-jdk14</value>
                             </map>
                         </list>
-                        <list key="modules">
+                        <list key="module-requires">
                             <value>io.helidon.dbclient</value>
                             <value if="${flavor} == 'mp'">io.helidon.dbclient.spi</value>
                             <value if="${media.json-lib} != 'jsonb'">io.helidon.media.jsonb</value>
@@ -352,6 +352,10 @@ docker run --rm --name mongo -p 27017:27017 mongo
                     return null;
                 });]]></value>
                         </list>
+                        <list key="gitignore">
+                            <value>ObjectStore/</value>
+                            <value>PutObjectStoreDirHere/</value>
+                        </list>
                     </model>
                 </output>
             </boolean>
diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileService.java.multipart.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileService.java.multipart.mustache
index 42d796c9fc4..1ba0476ca8c 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileService.java.multipart.mustache
+++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileService.java.multipart.mustache
@@ -1,6 +1,11 @@
 
 package {{package}};
 
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
 import io.helidon.common.configurable.ThreadPoolSupplier;
 import io.helidon.common.http.DataChunk;
 import io.helidon.common.http.Http;
@@ -13,15 +18,11 @@ import io.helidon.webserver.Routing;
 import io.helidon.webserver.ServerRequest;
 import io.helidon.webserver.ServerResponse;
 import io.helidon.webserver.Service;
+
 import jakarta.json.Json;
 import jakarta.json.JsonArrayBuilder;
 import jakarta.json.JsonBuilderFactory;
 
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-
 /**
  * File service.
  */
@@ -79,7 +80,8 @@ public final class FileService implements Service {
            })
            .onError(res::send)
            .onComplete(() -> {
-               res.status(Http.Status.OK_200);
+               res.status(Http.Status.MOVED_PERMANENTLY_301);
+               res.headers().put(Http.Header.LOCATION, "/ui");
                res.send();
            }).ignoreElement();
     }
diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileStorage.java.multipart.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileStorage.java.multipart.mustache
index b714b87707a..c2e23b2dfac 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileStorage.java.multipart.mustache
+++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileStorage.java.multipart.mustache
@@ -1,15 +1,15 @@
 
 package {{package}};
 
-import io.helidon.webserver.BadRequestException;
-import io.helidon.webserver.NotFoundException;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.stream.Stream;
 
+import io.helidon.webserver.BadRequestException;
+import io.helidon.webserver.NotFoundException;
+
 /**
  * Simple bean to managed a directory based storage.
  */
diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/resources/WEB/index.html b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/resources/WEB/index.html
new file mode 100644
index 00000000000..09d8f8226c5
--- /dev/null
+++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/resources/WEB/index.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8" />
+<head>
+    <title>Helidon Examples Media Multipart</title>
+    <script src="https://code.jquery.com/jquery-2.2.4.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.0/mustache.js"></script>
+    <script id="repository_tpl" type="x-tmpl-mustache">
+        <ul>
+        {{#files}}
+          <li>
+            <a href="/multipart/{{.}}">{{.}}</a>
+          </li>
+        {{/files}}
+        </ul>
+    </script>
+</head>
+<body>
+<h1>Uploaded files</h1>
+<div id="repository"></div>
+
+<h1>Upload</h1>
+<form action="/multipart" method="post" enctype="multipart/form-data">
+    Select a file to upload:
+    <input id="files" type="file" name="file[]" multiple />
+    <input type="submit" value="Upload!" name="submit">
+</form>
+
+<script type="text/javascript">
+    $(document).ready(function() {
+        $.ajax({
+            url: "/multipart",
+            method: "GET"
+        }).done(function(data) {
+            var template = $('#repository_tpl').html()
+            Mustache.parse(template);
+            $("#repository").append(Mustache.render(template, data))
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache
index 9061b17fe8e..f4e278b6a6c 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache
+++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache
@@ -71,7 +71,7 @@ class FileServiceTest {
                                       .addFile("file[]", "foo.txt", file)
                                       .build())
                 .await(Duration.ofSeconds(5));
-        assertThat(response.status().code(), is(200));
+        assertThat(response.status().code(), is(301));
     }
 
     @Test
@@ -88,7 +88,7 @@ class FileServiceTest {
                                       .addFile("otherPart", "streamed-foo2.txt", file2)
                                       .build())
                 .await(2, TimeUnit.SECONDS);
-        assertThat(response.status().code(), is(200));
+        assertThat(response.status().code(), is(301));
     }
 
     @Test