Latest sitegen and functional docs improvements

.gitignore

@@ -74,3 +74,4 @@ ObjectStore/
 PutObjectStoreDirHere/
 package-lock.json
 RUNTIMEDB/
+docs/se/config/images

archetypes/helidon/pom.xml

@@ -48,9 +48,9 @@
                 <artifactId>helidon-archetype-maven-plugin</artifactId>
                 <configuration>
                     <entrypoint>
-                        <presets>
-                            <text path="helidon-version" resolvable="false">${project.version}</text>
-                        </presets>
+                        <variables>
+                            <text path="helidon-version" transient="true">${project.version}</text>
+                        </variables>
                         <exec src="flavor.xml"/>
                     </entrypoint>
                 </configuration>

archetypes/helidon/src/main/archetype/common/customize-project.xml

@@ -20,10 +20,10 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
 
-    <step label="Customize Project">
+    <step name="Customize Project" optional="true">
         <inputs>
-            <enum name="build-system" label="Select a build system" default="maven">
-                <option value="maven" label="Apache Maven">
+            <enum id="build-system" name="Select a Build System" default="maven" optional="true">
+                <option value="maven" name="Apache Maven">
                     <output>
                         <templates engine="mustache" transformations="mustache">
                             <directory>files</directory>
@@ -34,10 +34,10 @@
                     </output>
                 </option>
             </enum>
-            <text name="groupId" label="Project groupId" optional="true" default="com.examples"/>
-            <text name="artifactId" label="Project artifactId" optional="true" default="myproject"/>
-            <text name="version" label="Project version" optional="true" default="1.0-SNAPSHOT"/>
-            <text name="package" label="Java package name" optional="true" default="com.example.myproject"/>
+            <text id="groupId" name="Project groupId" optional="true" default="com.examples"/>
+            <text id="artifactId" name="Project artifactId" optional="true" default="myproject"/>
+            <text id="version" name="Project version" optional="true" default="1.0-SNAPSHOT"/>
+            <text id="package" name="Java package name" optional="true" default="com.example.myproject"/>
         </inputs>
         <output>
             <model>

archetypes/helidon/src/main/archetype/common/docker.xml

@@ -20,48 +20,51 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
 
-    <step label="Docker">
-        <inputs>
-            <boolean name="docker" label="Docker support" prompt="Do you want a Dockerfile ?">
-                <inputs>
-                    <boolean name="native-image" label="Do you want a native-image Dockerfile ?"/>
-                    <boolean name="jlink" label="Do you want a jlink Dockerfile ?"/>
-                </inputs>
-                <output>
-                    <templates>
-                        <directory>files</directory>
-                        <includes>
-                            <include>Dockerfile.mustache</include>
-                            <include>.dockerignore</include>
-                        </includes>
-                    </templates>
-                    <templates if="${native-image}">
-                        <directory>files</directory>
-                        <includes>
-                            <include>Dockerfile.native.mustache</include>
-                        </includes>
-                    </templates>
-                    <templates if="${jlink}">
-                        <directory>files</directory>
-                        <includes>
-                            <include>Dockerfile.jlink.mustache</include>
-                        </includes>
-                    </templates>
-                    <model>
-                        <list key="readme-section">
-                            <value order="50" template="mustache">
-                                <![CDATA[
+    <inputs>
+        <boolean id="docker"
+                 name="Docker support"
+                 description="Add a Dockerfile to your project"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <boolean id="native-image"
+                         name="GraalVM Native Image Support"
+                         description="Add a native-image capable Dockerfile to your project"
+                         default="false"
+                         optional="true"/>
+                <boolean id="jlink-image" name="JLink Support"
+                         description="Add a JLink capable Dockerfile to your project"
+                         default="false"
+                         optional="true"/>
+            </inputs>
+            <output>
+                <files>
+                    <directory>files</directory>
+                    <includes>
+                        <include>.dockerignore</include>
+                    </includes>
+                </files>
+                <templates engine="mustache" transformations="mustache">
+                    <directory>files</directory>
+                    <includes>
+                        <include>Dockerfile.mustache</include>
+                        <include if="${native-image}">Dockerfile.native.mustache</include>
+                        <include if="${jlink-image}">Dockerfile.jlink.mustache</include>
+                    </includes>
+                </templates>
+                <model>
+                    <list key="readme-section">
+                        <value order="50" template="mustache">
+                            <![CDATA[
                                 ## Build the Docker Image
-
                                 ```
                                 docker build -t {{artifactId}} .
                                 ```
                                 ]]>
-                            </value>
-                        </list>
-                    </model>
-                </output>
-            </boolean>
-        </inputs>
-    </step>
+                        </value>
+                    </list>
+                </model>
+            </output>
+        </boolean>
+    </inputs>
 </archetype-script>

archetypes/helidon/src/main/archetype/flavor.xml

@@ -20,13 +20,21 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
 
-    <step label="Helidon Flavor">
+    <step name="Helidon Flavor" optional="true">
         <inputs>
-            <enum name="flavor" label="Select a flavor" default="SE" global="true">
-                <option value="SE" label="Helidon SE">
+            <enum id="flavor"
+                  name="Select a Flavor"
+                  default="se"
+                  global="true"
+                  optional="true">
+                <option value="se"
+                        name="Helidon SE"
+                        description="Programmatic, reactive &amp; non blocking">
                     <exec src="se/se.xml"/>
                 </option>
-                <option value="MP" label="Helidon MP">
+                <option value="mp"
+                        name="Helidon MP"
+                        description="Declarative, MicroProfile compliant">
                     <exec src="mp/mp.xml"/>
                 </option>
             </enum>
@@ -39,4 +47,4 @@
             <value key="flavor">${flavor}</value>
         </model>
     </output>
-</archetype-script>
+</archetype-script>

archetypes/helidon/src/main/archetype/mp/mp.xml

@@ -20,24 +20,30 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
 
-    <step label="Application Type">
+    <step name="Application Type" optional="true">
         <inputs>
-            <enum name="base" label="Select archetype" default="bare" global="true">
-                <option value="bare" label="Bare Helidon MP project suitable to start from scratch">
+            <enum id="app-type" name="Select archetype" default="bare" global="true" optional="true">
+                <option value="bare"
+                        name="Bare"
+                        description="Bare Helidon MP project suitable to start from scratch">
                     <exec src="bare/bare-mp.xml"/>
                 </option>
-                <option value="quickstart" label="Sample Helidon MP project that includes multiple REST operations">
+                <option value="quickstart"
+                        name="Quickstart"
+                        description="Sample Helidon MP project that includes multiple REST operations">
                     <exec src="quickstart/quickstart-mp.xml"/>
                 </option>
-                <option value="database" label="Helidon MP application that uses JPA with an in-memory H2 database">
+                <option value="database"
+                        name="Database"
+                        description="Helidon MP application that uses a database with JPA">
                     <exec src="database/database-mp.xml"/>
                 </option>
             </enum>
         </inputs>
     </step>
     <output>
         <model>
-            <value key="base">${base}</value>
+            <value key="app-type">${app-type}</value>
         </model>
     </output>
 </archetype-script>

archetypes/helidon/src/main/archetype/se/se.xml

@@ -20,25 +20,28 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
 
-    <step label="Application Type">
+    <step name="Application Type" optional="true">
         <inputs>
-            <enum name="base" label="Select archetype" default="bare" global="true">
-                <option value="bare" label="Bare Helidon SE project suitable to start from scratch">
+            <enum id="app-type" name="Select archetype" default="bare" global="true" optional="true">
+                <option value="bare" name="Bare" description="Bare Helidon SE project suitable to start from scratch">
                     <exec src="bare/bare-se.xml"/>
                 </option>
-                <option value="quickstart" label="Sample Helidon SE project that includes multiple REST operations">
+                <option value="quickstart"
+                        name="Quickstart"
+                        description="Sample Helidon SE project that includes multiple REST operations">
                     <exec src="quickstart/quickstart-se.xml"/>
                 </option>
                 <option value="database"
-                        label="Helidon SE application that uses the dbclient API with an in-memory H2 database">
+                        name="Database"
+                        description="Helidon SE application that uses a database with the DB Client API">
                     <exec src="database/database-se.xml"/>
                 </option>
             </enum>
         </inputs>
     </step>
     <output>
         <model>
-            <value key="base">${base}</value>
+            <value key="app-type">${app-type}</value>
         </model>
     </output>
-</archetype-script>
+</archetype-script>

docs/about/05_cli.adoc → docs/about/cli.adoc

@@ -19,6 +19,9 @@
 = Helidon CLI
 :description: Helidon CLI
 :keywords: helidon cli
+:rootdir: {docdir}/..
+
+include::{rootdir}/includes/attributes.adoc[]
 
 == Introduction
 
@@ -78,7 +81,7 @@ sudo mv ./helidon /usr/local/bin/
 PowerShell -Command Invoke-WebRequest -Uri "https://helidon.io/cli/latest/windows/helidon.exe" -OutFile "C:\Windows\system32\helidon.exe"
 ----
 
-For Windows you will also need the Visual C++ Redistributable Runtime. See <<about/04_windows.adoc,Helidon on Windows>>
+For Windows you will also need the Visual C++ Redistributable Runtime. See xref:windows.adoc[Helidon on Windows]
 for more information.
 
 == Create a New Project
@@ -105,4 +108,3 @@ application.
 == Demo
 
 image::cli/Helidon_cli.gif[CLI Demo, align="center"]
-