Fix multi-module directory generation

Author: tvallin

archetypes/archetypes/src/main/archetype/features/multi-module/inputs.xml

@@ -25,10 +25,6 @@
                  name="Multi-module Project"
                  description="Generate a multi-module project with one submodule"
                  optional="true"
-                 default="false">
-            <inputs>
-                <text id="module-name" name="Module name" optional="true" default="module1" global="true"/>
-            </inputs>
-        </boolean>
+                 default="false"/>
     </inputs>
 </archetype-script>

archetypes/archetypes/src/main/archetype/features/multi-module/output.xml

@@ -21,14 +21,15 @@
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
 
     <variables>
-        <text path="basedir">${module-name}</text>
+        <text path="basedir">module1</text>
     </variables>
     <output>
         <template source="files/pom.xml.hbs" target="../pom.xml" engine="mustache"/>
         <model>
-            <value key="module-name">${module-name}</value>
             <list key="module-names">
-                <value>${module-name}</value>
+                <map>
+                    <value key="module-name">module1</value>
+                </map>
             </list>
         </model>
     </output>

archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/inputs.xml

@@ -36,6 +36,6 @@
         <boolean path="docker.jlink-image">false</boolean>
         <boolean path="k8s">true</boolean>
         <boolean path="jpms">false</boolean>
-        <boolean path="multi-module">true</boolean>
+        <boolean path="multi-module">false</boolean>
     </presets>
 </archetype-script>

archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/output.xml

@@ -32,7 +32,7 @@
         </method>
         <method name="parent">
             <output>
-                <templates engine="mustache" transformations="basedir,hbs">
+                <templates engine="mustache" transformations="hbs">
                     <directory>/nodes/mp/files</directory>
                     <includes>
                         <include>.helidon.hbs</include>
@@ -48,31 +48,18 @@
         </method>
         <method name="client">
             <output>
-                <transformation id="basedir-client">
-                    <replace regex="^(?![^}]+(?:[\\/]|$))(.*)$" replacement="client/$1"/>
-                </transformation>
-                <templates engine="mustache" transformations="basedir-client,hbs">
+                <templates engine="mustache" transformations="hbs">
                     <directory>files</directory>
                     <includes>
                         <include>client/pom.xml.hbs</include>
                         <include>client/README.md.hbs</include>
                     </includes>
                 </templates>
-                <model>
-                    <list key="module-names">
-                        <map>
-                            <value key="module-names">client</value>
-                        </map>
-                    </list>
-                </model>
             </output>
         </method>
         <method name="server">
             <output>
-                <transformation id="basedir-server">
-                    <replace regex="^(?![^}]+(?:[\\/]|$))(.*)$" replacement="server/$1"/>
-                </transformation>
-                <templates engine="mustache" transformations="basedir-server,hbs,packaged">
+                <templates engine="mustache" transformations="hbs,packaged">
                     <directory>files</directory>
                     <includes>
                         <include>server/src/main/resources/application.yaml</include>
@@ -87,11 +74,6 @@
                     </includes>
                 </templates>
                 <model>
-                    <list key="module-names">
-                        <map>
-                            <value key="module-names">server</value>
-                        </map>
-                    </list>
                     <list key="pom-properties">
                         <map>
                             <value key="key">mainClass</value>
@@ -210,10 +192,7 @@
         </method>
         <method name="spec">
             <output>
-                <transformation id="basedir-spec">
-                    <replace regex="^(?![^}]+(?:[\\/]|$))(.*)$" replacement="spec/$1"/>
-                </transformation>
-                <files transformations="basedir-spec">
+                <files>
                     <directory>files</directory>
                     <includes>
                         <include>spec/api.yaml</include>

archetypes/archetypes/src/main/archetype/output.xml

@@ -35,7 +35,7 @@
                     <replace regex="version" replacement="${version}"/>
                 </transformation>
                 <transformation id="basedir">
-                    <replace regex="^(?![^}]+(?:[\\/]|$))(.*)$" replacement="${basedir}/$1"/>
+                    <replace regex="^(?!\Qmodule1\E)(.*)$" replacement="${basedir}/$1"/>
                 </transformation>
             </output>
         </method>