From f6f959ff8fac775afb109bfecad7e9f8f1673fb0 Mon Sep 17 00:00:00 2001
From: Andy Damevin <ia3andy@gmail.com>
Date: Tue, 25 Aug 2020 07:57:20 +0200
Subject: [PATCH] Codestart customized package and class and more

Fixes #11154
---
 .../buildtool/gradle-kotlin-dsl/codestart.yml |   6 +-
 .../buildtool/gradle/codestart.yml            |   6 +-
 .../commandmode-example/base/README.md        |   0
 .../commandmode-example/codestart.yml         |   7 +-
 .../{main.class-name}.tpl.qute.java           |  19 ++
 .../{main.class-name}.tpl.qute.kt             |  17 ++
 .../code}/resteasy-example/base/README.md     |   0
 .../META-INF/resources/index.tpl.qute.html    |   2 +-
 .../code}/resteasy-example/codestart.yml      |   9 +-
 .../{resource.class-name}.tpl.qute.java}      |   8 +-
 ...tive{resource.class-name}IT.tpl.qute.java} |   4 +-
 .../{resource.class-name}Test.tpl.qute.java}  |   8 +-
 .../{resource.class-name}.tpl.qute.kt}        |   8 +-
 .../Native{resource.class-name}IT.tpl.qute.kt |   6 +
 .../{resource.class-name}Test.tpl.qute.kt}    |   8 +-
 .../{resource.class-name}.tpl.qute.scala}     |   8 +-
 ...tive{resource.class-name}IT.tpl.qute.scala |   6 +
 .../{resource.class-name}Test.tpl.qute.scala} |   8 +-
 .../commandmode/GreetingMain.tpl.qute.java    |  27 ---
 .../commandmode/GreetingService.tpl.qute.java |  12 -
 .../acme/commandmode/GreetingMain.tpl.qute.kt |  22 --
 .../commandmode/GreetingService.tpl.qute.kt   |   8 -
 .../main/docker/Dockerfile.tpl.qute.fast-jar  |   6 +-
 .../amazon-lambda-example/codestart.yml       |   6 +-
 .../codestart.yml                             |   7 +-
 .../config-yaml-example/codestart.yml         |   4 +-
 .../funqy-amazon-lambda-example/codestart.yml |   6 +-
 .../funqy-http-example/codestart.yml          |   4 +-
 .../codestart.yml                             |   6 +-
 .../codestarts/qute-example/codestart.yml     |   3 +-
 .../org/acme/qute/NativeHelloResourceIT.kt    |   2 +-
 .../acme/resteasy/NativeExampleResourceIT.kt  |   6 -
 .../resteasy/NativeExampleResourceIT.scala    |   6 -
 .../tools/codestarts/codestarts.adoc          |  10 +-
 .../devtools/codestarts/Codestart.java        |   4 +
 .../devtools/codestarts/CodestartData.java    |   7 +-
 .../devtools/codestarts/CodestartInput.java   |  31 +--
 .../codestarts/CodestartInputBuilder.java     |  42 +---
 .../devtools/codestarts/CodestartLoader.java  |  17 +-
 .../codestarts/CodestartPathProcessor.java    |  36 +++
 .../codestarts/CodestartProcessor.java        |  11 +-
 .../devtools/codestarts/CodestartProject.java |   2 +-
 .../devtools/codestarts/CodestartSpec.java    |  16 +-
 .../devtools/codestarts/Codestarts.java       |  18 --
 ...DuplicateCodestartFileStrategyHandler.java |   2 +-
 .../codestarts/CodestartLoaderTest.java       |   8 +-
 .../CodestartPathProcessorTest.java           |  41 ++++
 .../devtools/codestarts/CodestartsTest.java   |   8 +-
 .../buildtool-maven/b/pom.tpl.qute.xml        |   1 +
 .../buildtool-maven/base/pom.tpl.qute.xml     |   2 +-
 .../buildtool-maven/codestart.yml             |   5 +-
 .../{my-file-name}.tpl.qute.test              |   1 +
 .../example-with-b/codestart.yml              |   8 +-
 .../example-forbidden/codestart.yml           |   3 +-
 .../codestarts/example1/codestart.yml         |   3 +-
 .../codestarts/example2/codestart.yml         |   3 +-
 .../example-fallback/a/.gitkeep               |   0
 .../example-fallback/codestart.yml            |   2 -
 .../resources/expected-pom-maven-merge.xml    |   3 +-
 .../codestarts/QuarkusCodestartData.java      |  62 ++++-
 .../codestarts/QuarkusCodestartInput.java     |  37 +++
 .../QuarkusCodestartInputBuilder.java         | 132 +++++++++++
 .../codestarts/QuarkusCodestarts.java         |  82 +++----
 .../handlers/CreateProjectCommandHandler.java |  25 +-
 .../codestarts/CodestartProjectRunIT.java     | 117 ----------
 ...java => QuarkusCodestartGenerationIT.java} | 220 ++++++++++++++----
 .../codestarts/QuarkusCodestartRunIT.java     | 158 +++++++++++++
 ...startsIT.java => QuarkusCodestartsIT.java} |  46 ++--
 ...jectTestRunner.java => WrapperRunner.java} |   2 +-
 .../it/CreateProjectCodestartMojoIT.java      |  69 ++++--
 70 files changed, 979 insertions(+), 510 deletions(-)
 rename devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/{example => code}/commandmode-example/base/README.md (100%)
 rename devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/{example => code}/commandmode-example/codestart.yml (63%)
 create mode 100644 devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/java/src/main/java/{package-name.dir}/{main.class-name}.tpl.qute.java
 create mode 100644 devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/kotlin/src/main/kotlin/{package-name.dir}/{main.class-name}.tpl.qute.kt
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts => bundled-codestarts/code}/resteasy-example/base/README.md (100%)
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts => bundled-codestarts/code}/resteasy-example/base/src/main/resources/META-INF/resources/index.tpl.qute.html (97%)
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts => bundled-codestarts/code}/resteasy-example/codestart.yml (51%)
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts/resteasy-example/java/src/main/java/org/acme/resteasy/ExampleResource.tpl.qute.java => bundled-codestarts/code/resteasy-example/java/src/main/java/{package-name.dir}/{resource.class-name}.tpl.qute.java} (61%)
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts/resteasy-example/java/src/native-test/java/org/acme/resteasy/NativeExampleResourceIT.java => bundled-codestarts/code/resteasy-example/java/src/native-test/java/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.java} (53%)
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts/resteasy-example/java/src/test/java/org/acme/resteasy/ExampleResourceTest.tpl.qute.java => bundled-codestarts/code/resteasy-example/java/src/test/java/{package-name.dir}/{resource.class-name}Test.tpl.qute.java} (66%)
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts/resteasy-example/kotlin/src/main/kotlin/org/acme/resteasy/ExampleResource.tpl.qute.kt => bundled-codestarts/code/resteasy-example/kotlin/src/main/kotlin/{package-name.dir}/{resource.class-name}.tpl.qute.kt} (57%)
 create mode 100644 devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/native-test/kotlin/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.kt
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts/resteasy-example/kotlin/src/test/kotlin/org/acme/resteasy/ExampleResourceTest.tpl.qute.kt => bundled-codestarts/code/resteasy-example/kotlin/src/test/kotlin/{package-name.dir}/{resource.class-name}Test.tpl.qute.kt} (65%)
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts/resteasy-example/scala/src/main/scala/org/acme/resteasy/ExampleResource.tpl.qute.scala => bundled-codestarts/code/resteasy-example/scala/src/main/scala/{package-name.dir}/{resource.class-name}.tpl.qute.scala} (54%)
 create mode 100644 devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/native-test/scala/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.scala
 rename devtools/platform-descriptor-json/src/main/resources/{codestarts/resteasy-example/scala/src/test/scala/org/acme/resteasy/ExampleResourceTest.tpl.qute.scala => bundled-codestarts/code/resteasy-example/scala/src/test/scala/{package-name.dir}/{resource.class-name}Test.tpl.qute.scala} (65%)
 delete mode 100644 devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingMain.tpl.qute.java
 delete mode 100644 devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingService.tpl.qute.java
 delete mode 100644 devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingMain.tpl.qute.kt
 delete mode 100644 devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingService.tpl.qute.kt
 delete mode 100644 devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/native-test/kotlin/org/acme/resteasy/NativeExampleResourceIT.kt
 delete mode 100644 devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/native-test/scala/org/acme/resteasy/NativeExampleResourceIT.scala
 create mode 100644 independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartPathProcessor.java
 create mode 100644 independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartPathProcessorTest.java
 create mode 100644 independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/example-with-b/b/{my-dir-name}/{my-file-name}.tpl.qute.test
 delete mode 100644 independent-projects/tools/codestarts/src/test/resources/example-fallback/example-fallback/a/.gitkeep
 delete mode 100644 independent-projects/tools/codestarts/src/test/resources/example-fallback/example-fallback/codestart.yml
 create mode 100644 independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartInput.java
 create mode 100644 independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartInputBuilder.java
 delete mode 100644 integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectRunIT.java
 rename integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/{CodestartProjectGenerationIT.java => QuarkusCodestartGenerationIT.java} (57%)
 create mode 100644 integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartRunIT.java
 rename integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/{CodestartsIT.java => QuarkusCodestartsIT.java} (73%)
 rename integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/{CodestartProjectTestRunner.java => WrapperRunner.java} (98%)

diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/codestart.yml
index 3534bca41ad405..2f4a15c3a0c5f4 100644
--- a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/codestart.yml
@@ -6,12 +6,12 @@ output-strategy:
 language:
   base:
     data:
-      quarkus:
-        gradle-plugin:
-          id: io.quarkus
       kotlin:
         version: 1.3.72
     shared-data:
+      quarkus:
+        gradle-plugin:
+          id: io.quarkus
       buildtool:
         build-dir: build
         guide: https://quarkus.io/guides/gradle-tooling
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle/codestart.yml
index f40897a830928b..cc6d670ac58866 100644
--- a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle/codestart.yml
@@ -6,12 +6,12 @@ output-strategy:
 language:
   base:
     data:
-      quarkus:
-        gradle-plugin:
-          id: io.quarkus
       kotlin:
         version: 1.3.72
     shared-data:
+      quarkus:
+        gradle-plugin:
+          id: io.quarkus
       buildtool:
         build-dir: build
         guide: https://quarkus.io/guides/gradle-tooling
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/base/README.md b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/base/README.md
similarity index 100%
rename from devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/base/README.md
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/base/README.md
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/codestart.yml
similarity index 63%
rename from devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/codestart.yml
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/codestart.yml
index 077c82077d2857..5915a3c722b9da 100644
--- a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/codestart.yml
@@ -1,10 +1,13 @@
 name: commandmode-example
 ref: commandmode
-type: example
-fallback: true
+type: code
+tags: example
 language:
   base:
     data:
+      main:
+        class-name: HelloCommando
+      package-name: org.acme.commandmode
       greeting:
         message: "hello"
         default-name: "commando"
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/java/src/main/java/{package-name.dir}/{main.class-name}.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/java/src/main/java/{package-name.dir}/{main.class-name}.tpl.qute.java
new file mode 100644
index 00000000000000..b7e1dc55d5245f
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/java/src/main/java/{package-name.dir}/{main.class-name}.tpl.qute.java
@@ -0,0 +1,19 @@
+package {package-name};
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+
+import io.quarkus.runtime.Quarkus;
+import io.quarkus.runtime.QuarkusApplication;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class {main.class-name} implements QuarkusApplication {
+
+    @Override
+    public int run(String... args) throws Exception {
+        final String name = args.length > 0 ? String.join(" ", args) : "{greeting.default-name}";
+        System.out.println("{greeting.message} " + name);
+        return 0;
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/kotlin/src/main/kotlin/{package-name.dir}/{main.class-name}.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/kotlin/src/main/kotlin/{package-name.dir}/{main.class-name}.tpl.qute.kt
new file mode 100644
index 00000000000000..e60be12295eba8
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/commandmode-example/kotlin/src/main/kotlin/{package-name.dir}/{main.class-name}.tpl.qute.kt
@@ -0,0 +1,17 @@
+package {package-name}
+
+import javax.inject.Inject
+
+import io.quarkus.runtime.QuarkusApplication
+import io.quarkus.runtime.annotations.QuarkusMain
+
+@QuarkusMain
+class {main.class-name}: QuarkusApplication {
+
+    override fun run(vararg args: String?): Int {
+        val name =  if (args.isNotEmpty()) args.joinToString(",") else "{greeting.default-name}"
+        println(name)
+        return 0
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/base/README.md b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/base/README.md
similarity index 100%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/base/README.md
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/base/README.md
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/base/src/main/resources/META-INF/resources/index.tpl.qute.html b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/base/src/main/resources/META-INF/resources/index.tpl.qute.html
similarity index 97%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/base/src/main/resources/META-INF/resources/index.tpl.qute.html
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/base/src/main/resources/META-INF/resources/index.tpl.qute.html
index 5227dc15c9fe7b..0ec933397bfc2b 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/base/src/main/resources/META-INF/resources/index.tpl.qute.html
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/base/src/main/resources/META-INF/resources/index.tpl.qute.html
@@ -117,7 +117,7 @@ <h2>What can I do from here?</h2>
         <p>If not already done, run the application in <em>dev mode</em> using: <code>{buildtool.cmd.dev}</code>.
         </p>
         <ul>
-            <li>Open the example <a href="{rest.path}" target="_blank">"/hello"</a> endpoint</li>
+            <li>Open the example <a href="{resource.path}" target="_blank">"/hello"</a> endpoint</li>
             <li>Add REST resources, Servlets, functions and other services in <code>{language.dir.code}</code>.</li>
             <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
             <li>Configure your application in <code>src/main/resources/{config.file-name}</code>.
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/codestart.yml
similarity index 51%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/codestart.yml
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/codestart.yml
index 85a7d80b3cb6c4..4de8244d7507d5 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/codestart.yml
@@ -1,11 +1,16 @@
 name: resteasy-example
 ref: resteasy
-type: example
+type: code
+tags: example
 language:
   base:
     data:
-      rest:
+      resource:
+        class-name: ExampleResource
         path: "/resteasy/hello"
         response: "hello"
+      package-name: org.acme.resteasy
+    dependencies:
+      - io.quarkus:quarkus-resteasy
     test-dependencies:
       - io.rest-assured:rest-assured
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/java/src/main/java/org/acme/resteasy/ExampleResource.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/java/src/main/java/{package-name.dir}/{resource.class-name}.tpl.qute.java
similarity index 61%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/java/src/main/java/org/acme/resteasy/ExampleResource.tpl.qute.java
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/java/src/main/java/{package-name.dir}/{resource.class-name}.tpl.qute.java
index a605f5be229766..9f1415d1a35c00 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/java/src/main/java/org/acme/resteasy/ExampleResource.tpl.qute.java
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/java/src/main/java/{package-name.dir}/{resource.class-name}.tpl.qute.java
@@ -1,16 +1,16 @@
-package org.acme.resteasy;
+package {package-name};
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-@Path("{rest.path}")
-public class ExampleResource {
+@Path("{resource.path}")
+public class {resource.class-name} {
 
     @GET
     @Produces(MediaType.TEXT_PLAIN)
     public String hello() {
-        return "{rest.response}";
+        return "{resource.response}";
     }
 }
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/java/src/native-test/java/org/acme/resteasy/NativeExampleResourceIT.java b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/java/src/native-test/java/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.java
similarity index 53%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/java/src/native-test/java/org/acme/resteasy/NativeExampleResourceIT.java
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/java/src/native-test/java/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.java
index 0a94d8d9ce4e66..8c54cc543b42f8 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/java/src/native-test/java/org/acme/resteasy/NativeExampleResourceIT.java
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/java/src/native-test/java/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.java
@@ -1,9 +1,9 @@
-package org.acme.resteasy;
+package {package-name};
 
 import io.quarkus.test.junit.NativeImageTest;
 
 @NativeImageTest
-public class NativeExampleResourceIT extends ExampleResourceTest {
+public class Native{resource.class-name}IT extends {resource.class-name}Test {
 
     // Execute the same tests but in native mode.
 }
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/java/src/test/java/org/acme/resteasy/ExampleResourceTest.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/java/src/test/java/{package-name.dir}/{resource.class-name}Test.tpl.qute.java
similarity index 66%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/java/src/test/java/org/acme/resteasy/ExampleResourceTest.tpl.qute.java
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/java/src/test/java/{package-name.dir}/{resource.class-name}Test.tpl.qute.java
index 2062b430ed275a..0dfcaaf81c3556 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/java/src/test/java/org/acme/resteasy/ExampleResourceTest.tpl.qute.java
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/java/src/test/java/{package-name.dir}/{resource.class-name}Test.tpl.qute.java
@@ -1,4 +1,4 @@
-package org.acme.resteasy;
+package {package-name};
 
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Test;
@@ -7,15 +7,15 @@
 import static org.hamcrest.CoreMatchers.is;
 
 @QuarkusTest
-public class ExampleResourceTest {
+public class {resource.class-name}Test {
 
     @Test
     public void testHelloEndpoint() {
         given()
-          .when().get("{rest.path}")
+          .when().get("{resource.path}")
           .then()
              .statusCode(200)
-             .body(is("{rest.response}"));
+             .body(is("{resource.response}"));
     }
 
 }
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/main/kotlin/org/acme/resteasy/ExampleResource.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/main/kotlin/{package-name.dir}/{resource.class-name}.tpl.qute.kt
similarity index 57%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/main/kotlin/org/acme/resteasy/ExampleResource.tpl.qute.kt
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/main/kotlin/{package-name.dir}/{resource.class-name}.tpl.qute.kt
index 8b60e4e0cf9cb4..3e02aea1804dac 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/main/kotlin/org/acme/resteasy/ExampleResource.tpl.qute.kt
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/main/kotlin/{package-name.dir}/{resource.class-name}.tpl.qute.kt
@@ -1,14 +1,14 @@
-package org.acme.resteasy
+package {package-name}
 
 import javax.ws.rs.GET
 import javax.ws.rs.Path
 import javax.ws.rs.Produces
 import javax.ws.rs.core.MediaType
 
-@Path("{rest.path}")
-class ExampleResource {
+@Path("{resource.path}")
+class {resource.class-name} {
 
     @GET
     @Produces(MediaType.TEXT_PLAIN)
-    fun hello() = "{rest.response}"
+    fun hello() = "{resource.response}"
 }
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/native-test/kotlin/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/native-test/kotlin/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.kt
new file mode 100644
index 00000000000000..e4d92d1565b504
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/native-test/kotlin/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.kt
@@ -0,0 +1,6 @@
+package {package-name}
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT : {resource.class-name}Test()
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/test/kotlin/org/acme/resteasy/ExampleResourceTest.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/test/kotlin/{package-name.dir}/{resource.class-name}Test.tpl.qute.kt
similarity index 65%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/test/kotlin/org/acme/resteasy/ExampleResourceTest.tpl.qute.kt
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/test/kotlin/{package-name.dir}/{resource.class-name}Test.tpl.qute.kt
index c097be9645c3b2..e130d90936ea70 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/test/kotlin/org/acme/resteasy/ExampleResourceTest.tpl.qute.kt
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/kotlin/src/test/kotlin/{package-name.dir}/{resource.class-name}Test.tpl.qute.kt
@@ -1,4 +1,4 @@
-package org.acme.resteasy
+package {package-name}
 
 import io.quarkus.test.junit.QuarkusTest
 import io.restassured.RestAssured.given
@@ -6,15 +6,15 @@ import org.hamcrest.CoreMatchers.`is`
 import org.junit.jupiter.api.Test
 
 @QuarkusTest
-class ExampleResourceTest {
+class {resource.class-name}Test {
 
     @Test
     fun testHelloEndpoint() {
         given()
-          .`when`().get("{rest.path}")
+          .`when`().get("{resource.path}")
           .then()
              .statusCode(200)
-             .body(`is`("{rest.response}"))
+             .body(`is`("{resource.response}"))
     }
 
 }
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/main/scala/org/acme/resteasy/ExampleResource.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/main/scala/{package-name.dir}/{resource.class-name}.tpl.qute.scala
similarity index 54%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/main/scala/org/acme/resteasy/ExampleResource.tpl.qute.scala
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/main/scala/{package-name.dir}/{resource.class-name}.tpl.qute.scala
index d1164266ad7d73..f48e321131f508 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/main/scala/org/acme/resteasy/ExampleResource.tpl.qute.scala
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/main/scala/{package-name.dir}/{resource.class-name}.tpl.qute.scala
@@ -1,12 +1,12 @@
-package org.acme.resteasy
+package {package-name}
 
 import javax.ws.rs.\{GET, Path, Produces}
 import javax.ws.rs.core.MediaType
 
-@Path("{rest.path}")
-class ExampleResource {
+@Path("{resource.path}")
+class {resource.class-name} {
 
     @GET
     @Produces(Array[String](MediaType.TEXT_PLAIN))
-    def hello() = "{rest.response}"
+    def hello() = "{resource.response}"
 }
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/native-test/scala/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/native-test/scala/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.scala
new file mode 100644
index 00000000000000..04622a9647ada8
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/native-test/scala/{package-name.dir}/Native{resource.class-name}IT.tpl.qute.scala
@@ -0,0 +1,6 @@
+package {package-name}
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT extends {resource.class-name}Test
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/test/scala/org/acme/resteasy/ExampleResourceTest.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/test/scala/{package-name.dir}/{resource.class-name}Test.tpl.qute.scala
similarity index 65%
rename from devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/test/scala/org/acme/resteasy/ExampleResourceTest.tpl.qute.scala
rename to devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/test/scala/{package-name.dir}/{resource.class-name}Test.tpl.qute.scala
index fb8524d9d849bb..1ac6d66c15948c 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/test/scala/org/acme/resteasy/ExampleResourceTest.tpl.qute.scala
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/code/resteasy-example/scala/src/test/scala/{package-name.dir}/{resource.class-name}Test.tpl.qute.scala
@@ -1,4 +1,4 @@
-package org.acme.resteasy
+package {package-name}
 
 import io.quarkus.test.junit.QuarkusTest
 import io.restassured.RestAssured.given
@@ -6,15 +6,15 @@ import org.hamcrest.CoreMatchers.`is`
 import org.junit.jupiter.api.Test
 
 @QuarkusTest
-class ExampleResourceTest {
+class {resource.class-name}Test {
 
     @Test
     def testHelloEndpoint() = {
         given()
-          .`when`().get("{rest.path}")
+          .`when`().get("{resource.path}")
           .then()
              .statusCode(200)
-             .body(`is`("{rest.response}"))
+             .body(`is`("{resource.response}"))
     }
 
 }
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingMain.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingMain.tpl.qute.java
deleted file mode 100644
index f1f4b7f4ce7d2c..00000000000000
--- a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingMain.tpl.qute.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.acme.commandmode;
-
-import javax.enterprise.context.control.ActivateRequestContext;
-import javax.inject.Inject;
-
-import io.quarkus.runtime.Quarkus;
-import io.quarkus.runtime.QuarkusApplication;
-import io.quarkus.runtime.annotations.QuarkusMain;
-
-@QuarkusMain
-public class GreetingMain implements QuarkusApplication {
-
-    @Inject
-    GreetingService service;
-
-    @Override
-    public int run(String... args) throws Exception {
-
-        if(args.length>0) {
-            System.out.println(service.greeting(String.join(" ", args)));
-        } else {
-            System.out.println(service.greeting("{greeting.default-name}"));
-        }
-
-        return 0;
-    }
-}
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingService.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingService.tpl.qute.java
deleted file mode 100644
index 08aee0c573065d..00000000000000
--- a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/java/src/main/java/org/acme/commandmode/GreetingService.tpl.qute.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.acme.commandmode;
-
-import javax.enterprise.context.ApplicationScoped;
-
-@ApplicationScoped
-public class GreetingService {
-
-    public String greeting(String name) {
-        return "{greeting.message} " + name;
-    }
-
-}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingMain.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingMain.tpl.qute.kt
deleted file mode 100644
index f3696b05a14451..00000000000000
--- a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingMain.tpl.qute.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.acme.commandmode
-
-import javax.inject.Inject
-
-import io.quarkus.runtime.QuarkusApplication
-import io.quarkus.runtime.annotations.QuarkusMain
-
-@QuarkusMain
-class GreetingMain: QuarkusApplication {
-
-    @Inject
-    lateinit var service: GreetingService
-    override fun run(vararg args: String?): Int {
-        if (args.isNotEmpty()) {
-            System.out.println(service.greeting(args.joinToString(",")))
-        } else {
-            System.out.println(service.greeting("{greeting.default-name}"))
-        }
-        return 0
-    }
-
-}
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingService.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingService.tpl.qute.kt
deleted file mode 100644
index 5a6237d15b6829..00000000000000
--- a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/example/commandmode-example/kotlin/src/main/kotlin/org/acme/commandmode/GreetingService.tpl.qute.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.acme.commandmode
-
-import javax.enterprise.context.ApplicationScoped
-
-@ApplicationScoped
-class GreetingService {
-    fun greeting(name: String) = "{greeting.message} $name"
-}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.fast-jar b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.fast-jar
index 208d90482c1699..fcaba104d72635 100644
--- a/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.fast-jar
+++ b/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.fast-jar
@@ -7,18 +7,18 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/{project.artifact-id}-jvm .
+# docker build -f src/main/docker/Dockerfile.fast-jar -t quarkus/{project.artifact-id}-fast-jar .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}-jvm
+# docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}-fast-jar
 #
 # If you want to include the debug port into your docker image
 # you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
 #
 # Then run the container using :
 #
-# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/{project.artifact-id}-jvm
+# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/{project.artifact-id}-fast-jar
 #
 ###
 FROM {dockerfile.fast-jar.from}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/amazon-lambda-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/amazon-lambda-example/codestart.yml
index f5c43e276f5013..ce73a5b331e4f2 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/amazon-lambda-example/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/amazon-lambda-example/codestart.yml
@@ -1,7 +1,9 @@
----
 name: amazon-lambda-example
 ref: amazon-lambda
-type: example
+type: code
+tags:
+  - example
+  - compatibility-issues
 language:
   base:
     shared-data:
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/azure-functions-http-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/azure-functions-http-example/codestart.yml
index 723e95e028857c..df0e5778977186 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/azure-functions-http-example/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/azure-functions-http-example/codestart.yml
@@ -1,7 +1,10 @@
----
 name: azure-functions-http-example
 ref: azure-functions-http
-type: example
+type: code
+tags:
+  - example
+  - compatibility-issues
+  - maven-only
 language:
   base:
     shared-data:
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/config-yaml-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/config-yaml-example/codestart.yml
index 36f49d25014dec..19dd0451d0f777 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/config-yaml-example/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/config-yaml-example/codestart.yml
@@ -1,7 +1,7 @@
----
 name: config-yaml-example
 ref: config-yaml
-type: example
+type: code
+tags: example
 language:
   base:
     dependencies:
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-amazon-lambda-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-amazon-lambda-example/codestart.yml
index e7470dfa07674a..ce5f7bca076566 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-amazon-lambda-example/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-amazon-lambda-example/codestart.yml
@@ -1,7 +1,9 @@
----
 name: funqy-amazon-lambda-example
 ref: funqy-amazon-lambda
-type: example
+type: code
+tags:
+  - example
+  - compatibility-issues
 language:
   base:
     shared-data:
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-http-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-http-example/codestart.yml
index 1528de53b86b0e..0b134d28aa63c2 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-http-example/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-http-example/codestart.yml
@@ -1,7 +1,7 @@
----
 name: funqy-http-example
 ref: funqy-http
-type: example
+type: code
+tags: example
 language:
   base:
     dependencies:
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-knative-events-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-knative-events-example/codestart.yml
index 06a85fe5213b5a..5931413b4a2e67 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-knative-events-example/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/funqy-knative-events-example/codestart.yml
@@ -1,7 +1,9 @@
----
 name: funqy-knative-events-example
 ref: funqy-knative-events
-type: example
+type: code
+tags:
+  - example
+  - compatibility-issues
 language:
   base:
     data:
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/qute-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/qute-example/codestart.yml
index f4de5208a01cb2..7457fb6dfb1ca5 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/qute-example/codestart.yml
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/qute-example/codestart.yml
@@ -1,6 +1,7 @@
 name: qute-example
 ref: qute
-type: example
+type: code
+tags: example
 language:
   base:
     dependencies:
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/qute-example/kotlin/src/native-test/kotlin/org/acme/qute/NativeHelloResourceIT.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/qute-example/kotlin/src/native-test/kotlin/org/acme/qute/NativeHelloResourceIT.kt
index 3c087749cdffda..4079932de97379 100644
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/qute-example/kotlin/src/native-test/kotlin/org/acme/qute/NativeHelloResourceIT.kt
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/qute-example/kotlin/src/native-test/kotlin/org/acme/qute/NativeHelloResourceIT.kt
@@ -1,4 +1,4 @@
-package codestarts.qute - example.kotlin.src.native - test.kotlin.org.acme.qute
+package org.acme.qute
 
 import io.quarkus.test.junit.NativeImageTest
 
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/native-test/kotlin/org/acme/resteasy/NativeExampleResourceIT.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/native-test/kotlin/org/acme/resteasy/NativeExampleResourceIT.kt
deleted file mode 100644
index edf12f47ef27e9..00000000000000
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/kotlin/src/native-test/kotlin/org/acme/resteasy/NativeExampleResourceIT.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.acme.resteasy
-
-import io.quarkus.test.junit.NativeImageTest
-
-@NativeImageTest
-class NativeExampleResourceIT : ExampleResourceTest()
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/native-test/scala/org/acme/resteasy/NativeExampleResourceIT.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/native-test/scala/org/acme/resteasy/NativeExampleResourceIT.scala
deleted file mode 100644
index 5227f9fe33c382..00000000000000
--- a/devtools/platform-descriptor-json/src/main/resources/codestarts/resteasy-example/scala/src/native-test/scala/org/acme/resteasy/NativeExampleResourceIT.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.acme.resteasy
-
-import io.quarkus.test.junit.NativeImageTest
-
-@NativeImageTest
-class NativeExampleResourceIT extends ExampleResourceTest
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/codestarts.adoc b/independent-projects/tools/codestarts/codestarts.adoc
index d0caef85605ca0..9cf9932c4aa8cd 100644
--- a/independent-projects/tools/codestarts/codestarts.adoc
+++ b/independent-projects/tools/codestarts/codestarts.adoc
@@ -22,7 +22,7 @@ Base:
 Extra:
 
 * tooling: Anything that can be added to improve the project (e.g. dockerfiles)
-* example: Any Quarkus extension can provide example code. The user can decide to activate it or not.
+* code: Any Quarkus extension can provide example code. The user can decide to activate it or not.
 
 Each codestart consists of:
 
@@ -50,7 +50,7 @@ When generating a Quarkus project:
 . buildtool
 . config
 . tooling
-. example
+. code
 
 
 The data used to generate a specific codestart is a merge of:
@@ -77,7 +77,8 @@ codestart.yml:
 ----
 name: the unique name - REQUIRED
 ref: the reference name (not unique) to use for extension matching (else the name is used)
-type: the type [example (default), project, buildtool, language, config] or any custom type
+type: the type [code (default), project, buildtool, language, config] or any custom type
+tags: an array of tags (add `example` for example codestarts)
 fallback: flag to indicate that it should be selected as fallback when no codestart has been selected with type - Only for base types
 preselected: flag to indicate that it should be pre-selected - Only for extra types.
 spec:
@@ -137,7 +138,8 @@ codestart.yml:
 ---
 name: foo-example
 ref: foo
-type: example
+type: code
+tags: example
 spec:
   base:
     data:
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java
index 4deda936470bdc..c79922e851f262 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java
@@ -48,6 +48,10 @@ public boolean implementsLanguage(String languageName) {
         return implementedLanguages.isEmpty() || implementedLanguages.contains(languageName);
     }
 
+    public boolean containsTag(String tag) {
+        return getSpec().getTags().contains(tag);
+    }
+
     public Map<String, Object> getLocalData(String languageName) {
         return NestedMaps.deepMerge(Stream.of(getBaseLanguageSpec().getData(), getLanguageSpec(languageName).getData()));
     }
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartData.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartData.java
index b5900109299e10..4d324b7abb0532 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartData.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartData.java
@@ -23,7 +23,12 @@ public static Optional<String> getBuildtool(final Map<String, Object> data) {
 
     static Map<String, Object> buildCodestartData(final Codestart codestart, final String languageName,
             final Map<String, Object> data) {
-        return NestedMaps.deepMerge(Stream.of(codestart.getLocalData(languageName), data));
+        final Optional<Map<String, Object>> value = NestedMaps.getValue(data, codestart.getName());
+        Map<String, Object> codestartData = new HashMap<>();
+        codestartData.putAll(data);
+        NestedMaps.deepMerge(codestartData, codestart.getLocalData(languageName));
+        value.ifPresent(map -> NestedMaps.deepMerge(codestartData, map));
+        return codestartData;
     }
 
     public static Map<String, Object> buildCodestartProjectData(Collection<Codestart> baseCodestarts,
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInput.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInput.java
index 42f85856f0cbe1..f877964f1ec45c 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInput.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInput.java
@@ -4,32 +4,23 @@
 
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
 
 public class CodestartInput {
     private final CodestartResourceLoader resourceLoader;
-    private final Collection<AppArtifactKey> extensions;
-    private final boolean includeExamples;
+    private final Collection<AppArtifactKey> dependencies;
     private final Map<String, Object> data;
     private final Collection<String> codestarts;
 
-    CodestartInput(CodestartResourceLoader resourceLoader, Collection<AppArtifactKey> extensions,
-            Collection<String> codestarts, boolean includeExamples, Map<String, Object> data) {
-        this.resourceLoader = requireNonNull(resourceLoader, "resourceLoader is required");
-        this.extensions = requireNonNull(extensions, "extensions is required");
-        this.codestarts = requireNonNull(codestarts, "codestarts is required");
-        this.includeExamples = requireNonNull(includeExamples, "includeExamples is required");
-        this.data = requireNonNull(data, "data is required");
+    CodestartInput(final CodestartInputBuilder builder) {
+        this.resourceLoader = requireNonNull(builder.resourceLoader, "resourceLoader is required");
+        this.dependencies = requireNonNull(builder.dependencies, "dependencies is required");
+        this.codestarts = requireNonNull(builder.codestarts, "codestarts is required");
+        this.data = NestedMaps.unflatten(requireNonNull(builder.data, "data is required"));
     }
 
     public static CodestartInputBuilder builder(CodestartResourceLoader resourceLoader) {
-        return new CodestartInputBuilder(resourceLoader, Collections.emptyMap());
-    }
-
-    public static CodestartInputBuilder builder(CodestartResourceLoader resourceLoader,
-            Map<AppArtifactKey, String> extensionCodestartMapping) {
-        return new CodestartInputBuilder(resourceLoader, extensionCodestartMapping);
+        return new CodestartInputBuilder(resourceLoader);
     }
 
     public CodestartResourceLoader getResourceLoader() {
@@ -40,12 +31,8 @@ public Collection<String> getCodestarts() {
         return codestarts;
     }
 
-    public Collection<AppArtifactKey> getExtensions() {
-        return extensions;
-    }
-
-    public boolean includeExamples() {
-        return includeExamples;
+    public Collection<AppArtifactKey> getDependencies() {
+        return dependencies;
     }
 
     public Map<String, Object> getData() {
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInputBuilder.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInputBuilder.java
index 6e723fa8b7d936..492f04a6e1ba98 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInputBuilder.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInputBuilder.java
@@ -1,41 +1,30 @@
 package io.quarkus.devtools.codestarts;
 
-import static java.util.Objects.requireNonNull;
-
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 public class CodestartInputBuilder {
-    private CodestartResourceLoader resourceLoader;
-    private Map<AppArtifactKey, String> extensionCodestartMapping;
-    private Collection<AppArtifactKey> extensions = new ArrayList<>();
-    private Collection<String> codestarts = new ArrayList<>();
-    private boolean includeExamples = false;
-    private Map<String, Object> data = new HashMap<>();
+    CodestartResourceLoader resourceLoader;
+    Map<AppArtifactKey, String> extensionCodestartMapping;
+    Collection<AppArtifactKey> dependencies = new ArrayList<>();
+    Collection<String> codestarts = new ArrayList<>();
+    Map<String, Object> data = new HashMap<>();
 
-    CodestartInputBuilder(CodestartResourceLoader resourceLoader, Map<AppArtifactKey, String> extensionCodestartMapping) {
+    CodestartInputBuilder(CodestartResourceLoader resourceLoader) {
         this.resourceLoader = resourceLoader;
-        this.extensionCodestartMapping = requireNonNull(extensionCodestartMapping, "extensionCodestartMapping is required");
     }
 
-    public CodestartInputBuilder addExtensions(Collection<AppArtifactKey> extensions) {
-        this.extensions.addAll(extensions);
-        final Set<String> codestarts = extensions.stream()
-                .filter(extensionCodestartMapping::containsKey)
-                .map(extensionCodestartMapping::get)
-                .collect(Collectors.toSet());
-        this.addCodestarts(codestarts);
+    public CodestartInputBuilder addDependencies(Collection<AppArtifactKey> dependencies) {
+        this.dependencies.addAll(dependencies);
         return this;
     }
 
-    public CodestartInputBuilder addExtension(AppArtifactKey extension) {
-        return this.addExtensions(Collections.singletonList(extension));
+    public CodestartInputBuilder addDependency(AppArtifactKey dependency) {
+        return this.addDependencies(Collections.singletonList(dependency));
     }
 
     public CodestartInputBuilder addCodestarts(Collection<String> codestarts) {
@@ -43,15 +32,6 @@ public CodestartInputBuilder addCodestarts(Collection<String> codestarts) {
         return this;
     }
 
-    public CodestartInputBuilder includeExamples() {
-        return includeExamples(true);
-    }
-
-    public CodestartInputBuilder includeExamples(boolean includeExamples) {
-        this.includeExamples = includeExamples;
-        return this;
-    }
-
     public CodestartInputBuilder addData(Map<String, Object> data) {
         this.data.putAll(data);
         return this;
@@ -68,6 +48,6 @@ public CodestartInputBuilder putData(String key, Object value) {
     }
 
     public CodestartInput build() {
-        return new CodestartInput(resourceLoader, extensions, codestarts, includeExamples, NestedMaps.unflatten(data));
+        return new CodestartInput(this);
     }
 }
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartLoader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartLoader.java
index 1e0a743f7c493d..049f7c2166762c 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartLoader.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartLoader.java
@@ -19,7 +19,8 @@
 
 final class CodestartLoader {
     private static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory())
-            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
             .enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING)
             .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
 
@@ -30,12 +31,20 @@ private CodestartLoader() {
     }
 
     public static List<Codestart> loadAllCodestarts(CodestartInput input) throws IOException {
-        return Stream.concat(loadBundledCodestarts(input).stream(),
-                loadCodestartsFromExtensions(input).stream()).collect(Collectors.toList());
+        return loadAllCodestarts(input.getResourceLoader());
+    }
+
+    public static List<Codestart> loadAllCodestarts(CodestartResourceLoader resourceLoader) throws IOException {
+        return Stream.concat(loadBundledCodestarts(resourceLoader).stream(),
+                loadCodestartsFromExtensions(resourceLoader).stream()).collect(Collectors.toList());
     }
 
     public static Collection<Codestart> loadBundledCodestarts(CodestartInput input) throws IOException {
-        return loadCodestarts(input.getResourceLoader(), CODESTARTS_DIR_BUNDLED);
+        return loadBundledCodestarts(input.getResourceLoader());
+    }
+
+    public static Collection<Codestart> loadBundledCodestarts(CodestartResourceLoader resourceLoader) throws IOException {
+        return loadCodestarts(resourceLoader, CODESTARTS_DIR_BUNDLED);
     }
 
     public static Collection<Codestart> loadCodestartsFromExtensions(CodestartInput input)
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartPathProcessor.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartPathProcessor.java
new file mode 100644
index 00000000000000..8792e2be1a6850
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartPathProcessor.java
@@ -0,0 +1,36 @@
+package io.quarkus.devtools.codestarts;
+
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+final class CodestartPathProcessor {
+
+    private static final String PACKAGE_NAME_KEY = "package-name";
+    private static final String PACKAGE_NAME_DIR_EXPRESSION = "package-name.dir";
+    private static Pattern EXPRESSION_PATTERN = Pattern.compile("\\{([^}]+)}");
+
+    private CodestartPathProcessor() {
+    }
+
+    static String process(String relativePath, Map<String, Object> data) {
+        if (!relativePath.contains("{")) {
+            return relativePath;
+        }
+        Matcher m = EXPRESSION_PATTERN.matcher(relativePath);
+        StringBuffer result = new StringBuffer();
+        while (m.find()) {
+            String found = m.group(1);
+            String key = found.replace(PACKAGE_NAME_DIR_EXPRESSION, PACKAGE_NAME_KEY);
+            String value = NestedMaps.<String> getValue(data, key)
+                    .orElseThrow(() -> new CodestartDefinitionException("Missing required data for PathGen: {" + key + "}"));
+            if (found.contains(PACKAGE_NAME_DIR_EXPRESSION) && value.contains(".")) {
+                value = value.replace(".", "/");
+            }
+            m.appendReplacement(result, value);
+        }
+        m.appendTail(result);
+        return result.toString();
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProcessor.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProcessor.java
index 806a1cc26a4ffb..534fb11a0861a5 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProcessor.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProcessor.java
@@ -82,17 +82,20 @@ void processCodestartDir(final Path sourceDirectory, final Map<String, Object> f
 
                 final boolean hasFileStrategyHandler = getStrategy(relativeTargetPath.toString()).isPresent();
                 try {
+                    final String processedRelativeTargetPath = CodestartPathProcessor.process(relativeTargetPath.toString(),
+                            finalData);
                     if (!possibleReader.isPresent() && !hasFileStrategyHandler) {
-                        final Path targetPath = targetDirectory.resolve(relativeTargetPath.toString());
+                        final Path targetPath = targetDirectory.resolve(processedRelativeTargetPath);
                         getSelectedDefaultStrategy().copyStaticFile(sourcePath, targetPath);
                         continue;
                     }
                     final Optional<String> content = reader.read(sourceDirectory, relativeSourcePath,
                             languageName, finalData);
                     if (content.isPresent()) {
-                        final String key = relativeTargetPath.toString();
-                        this.files.putIfAbsent(key, new ArrayList<>());
-                        this.files.get(key).add(new CodestartFile(relativeSourcePath.toString(), content.get()));
+
+                        this.files.putIfAbsent(processedRelativeTargetPath, new ArrayList<>());
+                        this.files.get(processedRelativeTargetPath)
+                                .add(new CodestartFile(processedRelativeTargetPath, content.get()));
                     }
                 } catch (IOException e) {
                     throw new UncheckedIOException(e);
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProject.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProject.java
index 7126132c8c72b6..f479914a30f41e 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProject.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProject.java
@@ -50,7 +50,7 @@ public Map<String, Object> getSharedData() {
     }
 
     public Map<String, Object> getDepsData() {
-        return buildDependenciesData(getCodestarts().stream(), getLanguageName(), getCodestartInput().getExtensions());
+        return buildDependenciesData(getCodestarts().stream(), getLanguageName(), getCodestartInput().getDependencies());
     }
 
     public Map<String, Object> getCodestartProjectData() {
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartSpec.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartSpec.java
index 0de3d4e28e3637..f2ed91b1c2ed7b 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartSpec.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartSpec.java
@@ -10,6 +10,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 
 public final class CodestartSpec {
 
@@ -18,7 +19,7 @@ enum Type {
         LANGUAGE(true),
         BUILDTOOL(true),
         CONFIG(true),
-        EXAMPLE(false),
+        CODE(false),
         TOOLING(false);
 
         private final boolean base;
@@ -37,6 +38,7 @@ public boolean isBase() {
     private final String ref;
     private final Type type;
     private final boolean isFallback;
+    private final Set<String> tags;
     private final Map<String, String> outputStrategy;
     private final Map<String, LanguageSpec> languagesSpec;
 
@@ -46,11 +48,13 @@ public CodestartSpec(@JsonProperty(value = "name", required = true) String name,
             @JsonProperty(value = "type") Type type,
             @JsonProperty("fallback") boolean isFallback,
             @JsonProperty("preselected") boolean isPreselected,
+            @JsonProperty("tags") Set<String> tags,
             @JsonProperty("output-strategy") Map<String, String> outputStrategy,
             @JsonProperty("language") Map<String, LanguageSpec> languagesSpec) {
         this.name = requireNonNull(name, "name is required");
+        this.tags = tags != null ? tags : Collections.emptySet();
         this.ref = ref != null ? ref : name;
-        this.type = type != null ? type : Type.EXAMPLE;
+        this.type = type != null ? type : Type.CODE;
         this.isFallback = isFallback;
         this.isPreselected = isPreselected;
         this.outputStrategy = outputStrategy != null ? outputStrategy : Collections.emptyMap();
@@ -65,6 +69,10 @@ public String getRef() {
         return ref;
     }
 
+    public Set<String> getTags() {
+        return tags;
+    }
+
     public Type getType() {
         return type;
     }
@@ -77,10 +85,6 @@ public boolean isPreselected() {
         return isPreselected;
     }
 
-    public boolean isExample() {
-        return getType() == Type.EXAMPLE;
-    }
-
     public Map<String, String> getOutputStrategy() {
         return outputStrategy;
     }
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestarts.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestarts.java
index 8ae671904ac204..d87401db134fa9 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestarts.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestarts.java
@@ -34,14 +34,6 @@ public static CodestartProject prepareProject(final CodestartInput input, final
         selectedCodestarts.addAll(baseCodestarts);
         selectedCodestarts.addAll(extraCodestarts);
 
-        // include fallback example codestarts if none selected
-        if (input.includeExamples()
-                && extraCodestarts.stream().noneMatch(c -> c.getSpec().isExample() && !c.getSpec().isPreselected())) {
-            final List<Codestart> fallbackExampleCodestarts = resolveFallbackExampleCodestarts(allCodestarts,
-                    languageName);
-            selectedCodestarts.addAll(fallbackExampleCodestarts);
-        }
-
         return new CodestartProject(input, selectedCodestarts);
     }
 
@@ -79,7 +71,6 @@ private static Collection<Codestart> resolveSelectedExtraCodestarts(CodestartInp
         return allCodestarts.stream()
                 .filter(c -> !c.getSpec().getType().isBase())
                 .filter(c -> c.getSpec().isPreselected() || c.isSelected(selectedCodestartNames))
-                .filter(c -> !c.getSpec().isExample() || input.includeExamples())
                 .filter(c -> c.implementsLanguage(languageName))
                 .collect(Collectors.toList());
     }
@@ -108,13 +99,4 @@ private static Collection<Codestart> resolveSelectedBaseCodestarts(Collection<Co
                 })).values();
     }
 
-    private static List<Codestart> resolveFallbackExampleCodestarts(List<Codestart> allCodestarts,
-            String languageName) {
-        return allCodestarts.stream()
-                .filter(c -> !c.getSpec().getType().isBase())
-                .filter(c -> c.getSpec().isExample() && c.getSpec().isFallback())
-                .filter(c -> c.implementsLanguage(languageName))
-                .collect(Collectors.toList());
-    }
-
 }
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/strategy/FailOnDuplicateCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/strategy/FailOnDuplicateCodestartFileStrategyHandler.java
index ff9684033aaac0..b968eb0c86da0e 100644
--- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/strategy/FailOnDuplicateCodestartFileStrategyHandler.java
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/strategy/FailOnDuplicateCodestartFileStrategyHandler.java
@@ -34,7 +34,7 @@ public void process(Path targetDirectory, String relativePath, List<CodestartFil
     public void copyStaticFile(Path sourcePath, Path targetPath) throws IOException {
         if (Files.exists(targetPath)) {
             throw new CodestartDefinitionException(
-                    "Multiple files found for path with 'fail-on-duplicate' FileStrategy: " + targetPath);
+                    "Multiple files found for path with 'fail-on-duplicate' FileStrategy: " + sourcePath + ":" + targetPath);
         }
         Files.createDirectories(targetPath.getParent());
         Files.copy(sourcePath, targetPath);
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartLoaderTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartLoaderTest.java
index 9614e147647a10..3c4710e7c6ff78 100644
--- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartLoaderTest.java
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartLoaderTest.java
@@ -1,6 +1,6 @@
 package io.quarkus.devtools.codestarts;
 
-import static io.quarkus.devtools.codestarts.CodestartSpec.Type.EXAMPLE;
+import static io.quarkus.devtools.codestarts.CodestartSpec.Type.CODE;
 import static io.quarkus.devtools.codestarts.CodestartSpec.Type.PROJECT;
 import static org.apache.commons.io.IOUtils.resourceToString;
 import static org.assertj.core.api.Assertions.as;
@@ -28,7 +28,7 @@ void testReadCodestartSpec1() throws IOException {
         assertThat(codestartSpec.getOutputStrategy()).containsEntry("foo/bar", "strategy").hasSize(1);
         assertThat(codestartSpec.isPreselected()).isTrue();
         assertThat(codestartSpec.isFallback()).isTrue();
-        assertThat(codestartSpec.isExample()).isFalse();
+        assertThat(codestartSpec.getTags()).isEmpty();
         assertThat(codestartSpec.getLanguagesSpec()).containsOnlyKeys("base", "java");
 
         final CodestartSpec.LanguageSpec baseLanguageSpec = codestartSpec.getLanguagesSpec().get("base");
@@ -54,8 +54,8 @@ void testReadCodestartSpecDefault() throws IOException {
                 StandardCharsets.UTF_8, Thread.currentThread().getContextClassLoader()));
 
         assertThat(codestartSpec.getName()).isEqualTo("specdefault");
-        assertThat(codestartSpec.getType()).isEqualTo(EXAMPLE);
-        assertThat(codestartSpec.isExample()).isTrue();
+        assertThat(codestartSpec.getType()).isEqualTo(CODE);
+        assertThat(codestartSpec.getTags()).isEmpty();
         assertThat(codestartSpec.isPreselected()).isFalse();
         assertThat(codestartSpec.isFallback()).isFalse();
         assertThat(codestartSpec.getLanguagesSpec()).isEmpty();
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartPathProcessorTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartPathProcessorTest.java
new file mode 100644
index 00000000000000..b8670e28c29c53
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartPathProcessorTest.java
@@ -0,0 +1,41 @@
+package io.quarkus.devtools.codestarts;
+
+import static io.quarkus.devtools.codestarts.NestedMaps.unflatten;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class CodestartPathProcessorTest {
+
+    @Test
+    void testProcess() {
+        Map<String, Object> dataFlat = new HashMap<>();
+        dataFlat.put("foo.bar", "vfoobar");
+        dataFlat.put("baz", "vbaz");
+        dataFlat.put("package-name", "org.acme.andy");
+        dataFlat.put("class-name", "MyResource");
+        final Map<String, Object> data = unflatten(dataFlat);
+        assertThat(CodestartPathProcessor.process("/foo/bar/{foo.bar}/baz", data))
+                .isEqualTo("/foo/bar/vfoobar/baz");
+        assertThat(CodestartPathProcessor.process("{foo.bar}", data))
+                .isEqualTo("vfoobar");
+        assertThat(CodestartPathProcessor.process("{foo.bar}/{foo.bar}", data))
+                .isEqualTo("vfoobar/vfoobar");
+        assertThat(CodestartPathProcessor.process("{foo.bar}/{baz}", data))
+                .isEqualTo("vfoobar/vbaz");
+        assertThat(CodestartPathProcessor.process("{foo.bar}/{baz}.txt", data))
+                .isEqualTo("vfoobar/vbaz.txt");
+        assertThat(CodestartPathProcessor.process("src/main/java/{package-name.dir}/{class-name}.java", data))
+                .isEqualTo("src/main/java/org/acme/andy/MyResource.java");
+        assertThat(CodestartPathProcessor.process("src/main/java/{package-name}/{class-name}.java", data))
+                .isEqualTo("src/main/java/org.acme.andy/MyResource.java");
+        assertThat(CodestartPathProcessor.process("foo/bar.txt", data))
+                .isEqualTo("foo/bar.txt");
+        assertThatExceptionOfType(CodestartDefinitionException.class)
+                .isThrownBy(() -> CodestartPathProcessor.process("{foo.bar}/{baz}/{foo.baz}.txt", data))
+                .withMessageContaining("{foo.baz}");
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartsTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartsTest.java
index 48c5f144385a25..31b16985a8512d 100644
--- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartsTest.java
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartsTest.java
@@ -92,12 +92,14 @@ void checkDefaultProject() throws IOException {
     void checkSpecificProject() throws IOException {
         final TestCodestartResourceLoader resourceLoader = new TestCodestartResourceLoader();
         final CodestartInput input = CodestartInput.builder(resourceLoader)
-                .includeExamples()
                 .addCodestart("b")
                 .addCodestart("example-with-b")
                 .addCodestart("maven")
                 .addCodestart("config-yaml")
                 .putData("project.version", "1.2.3")
+                .putData("prop1", "prop-1-nonamespace")
+                .putData("maven.prop2", "prop-2-namespaced")
+                .putData("example-with-b.my-file-name", "my-dynamic-file-from-input")
                 .build();
         final CodestartProject codestartProject = Codestarts.prepareProject(input);
 
@@ -111,11 +113,13 @@ void checkSpecificProject() throws IOException {
 
         final Path targetDirectory = projectPath.resolve("specific-project");
         Codestarts.generateProject(codestartProject, targetDirectory);
-
+        System.out.println(targetDirectory.toAbsolutePath().toString());
         assertThat(targetDirectory.resolve("README.md")).hasContent("Base readme world maven");
         assertThat(targetDirectory.resolve("config.yml")).hasContent("example: \"code\"");
         assertThat(targetDirectory.resolve(".gitignore")).hasContent("base-ignore1\nbase-ignore2\n");
         assertThat(targetDirectory.resolve("b/example-code")).hasContent("example-code");
+        assertThat(targetDirectory.resolve("my-dynamic-dir/so-cool/my-dynamic-file-from-input.test"))
+                .hasContent("hello my-dynamic-file-from-input");
         assertThat(targetDirectory.resolve("pom.xml"))
                 .hasSameTextualContentAs(getResource("expected-pom-maven-merge.xml"));
     }
diff --git a/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/b/pom.tpl.qute.xml b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/b/pom.tpl.qute.xml
index b2769a22da292d..fcc7ebafe9de59 100644
--- a/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/b/pom.tpl.qute.xml
+++ b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/b/pom.tpl.qute.xml
@@ -1,6 +1,7 @@
 <project>
     <properties>
         <prop1>{prop1}</prop1>
+        <prop2>{prop2}</prop2>
     </properties>
 
     <dependencies>
diff --git a/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/base/pom.tpl.qute.xml b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/base/pom.tpl.qute.xml
index 6c2cceab7778f1..3e58b2b3baad14 100644
--- a/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/base/pom.tpl.qute.xml
+++ b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/base/pom.tpl.qute.xml
@@ -1,7 +1,7 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>{project.group-id}</groupId>
+    <groupId>{project.group-id2}</groupId>
     <artifactId>{project.artifact-id}</artifactId>
     <version>{project.version}</version>
 </project>
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/codestart.yml
index 805106ab23052c..2c161c2a60ee2c 100644
--- a/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/codestart.yml
+++ b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/buildtool-maven/codestart.yml
@@ -4,9 +4,10 @@ language:
   base:
     data:
       prop1: proppp
+      prop2: proppp2
+    shared-data:
       project:
-        group-id: org.acme
+        group-id2: org.toto
         artifact-id: andy
-    shared-data:
       buildtool:
         foo: world maven
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/example-with-b/b/{my-dir-name}/{my-file-name}.tpl.qute.test b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/example-with-b/b/{my-dir-name}/{my-file-name}.tpl.qute.test
new file mode 100644
index 00000000000000..69cb50e85de088
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/example-with-b/b/{my-dir-name}/{my-file-name}.tpl.qute.test
@@ -0,0 +1 @@
+hello {my-file-name}
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/example-with-b/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/example-with-b/codestart.yml
index 62eaa6f8c8915a..61f250a93c0562 100644
--- a/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/example-with-b/codestart.yml
+++ b/independent-projects/tools/codestarts/src/test/resources/bundled-codestarts/example-with-b/codestart.yml
@@ -1,2 +1,8 @@
 name: example-with-b
-type: example
\ No newline at end of file
+type: code
+tags: example
+language:
+  base:
+    data:
+      my-dir-name: my-dynamic-dir/so-cool
+      my-file-name: my-dynamic-file
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/example-forbidden/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/example-forbidden/codestart.yml
index f45cd0d6f9e3eb..1097a20ef75eba 100644
--- a/independent-projects/tools/codestarts/src/test/resources/codestarts/example-forbidden/codestart.yml
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/example-forbidden/codestart.yml
@@ -1 +1,2 @@
-name: example-forbidden
\ No newline at end of file
+name: example-forbidden
+tags: example
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/example1/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/example1/codestart.yml
index 48072a02cfc173..c20c21d1952719 100644
--- a/independent-projects/tools/codestarts/src/test/resources/codestarts/example1/codestart.yml
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/example1/codestart.yml
@@ -1 +1,2 @@
-name: example1
\ No newline at end of file
+name: example1
+tags: example
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/example2/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/example2/codestart.yml
index b6c7450f004d1f..72258a113003fd 100644
--- a/independent-projects/tools/codestarts/src/test/resources/codestarts/example2/codestart.yml
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/example2/codestart.yml
@@ -1 +1,2 @@
-name: example2
\ No newline at end of file
+name: example2
+tags: example
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/example-fallback/example-fallback/a/.gitkeep b/independent-projects/tools/codestarts/src/test/resources/example-fallback/example-fallback/a/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/independent-projects/tools/codestarts/src/test/resources/example-fallback/example-fallback/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/example-fallback/example-fallback/codestart.yml
deleted file mode 100644
index 7ecaa8b08a8201..00000000000000
--- a/independent-projects/tools/codestarts/src/test/resources/example-fallback/example-fallback/codestart.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: example-fallback
-fallback: true
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/expected-pom-maven-merge.xml b/independent-projects/tools/codestarts/src/test/resources/expected-pom-maven-merge.xml
index f34f4b93cfb5d7..6c02adbec95569 100644
--- a/independent-projects/tools/codestarts/src/test/resources/expected-pom-maven-merge.xml
+++ b/independent-projects/tools/codestarts/src/test/resources/expected-pom-maven-merge.xml
@@ -2,10 +2,11 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.acme</groupId>
+  <groupId>org.toto</groupId>
   <artifactId>quarkus-project</artifactId>
   <version>1.2.3</version>
   <properties>
+    <prop2>prop-2-namespaced</prop2>
     <prop1>proppp</prop1>
   </properties>
   <dependencies>
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartData.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartData.java
index 6684cad45f8599..2788f5646ddeaf 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartData.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartData.java
@@ -2,6 +2,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -24,6 +26,14 @@ public enum DataKey {
         QUARKUS_GRADLE_PLUGIN_VERSION("quarkus.gradle-plugin.version"),
         QUARKUS_VERSION("quarkus.version"),
         JAVA_VERSION("java.version"),
+
+        RESTEASY_EXAMPLE_RESOURCE_PATH("resteasy-example.resource.path"),
+        RESTEASY_EXAMPLE_PACKAGE_NAME("resteasy-example.package-name"),
+        RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME("resteasy-example.resource.class-name"),
+
+        COMMANDMODE_EXAMPLE_PACKAGE_NAME("commandmode-example.package-name"),
+        COMMANDMODE_EXAMPLE_RESOURCE_CLASS_NAME("commandmode-example.main.class-name"),
+
         ;
 
         private final String key;
@@ -50,30 +60,62 @@ public enum LegacySupport {
         QUARKUS_GRADLE_PLUGIN_ID("gradle_plugin_id"),
         QUARKUS_GRADLE_PLUGIN_VERSION("gradle_plugin_version"),
         QUARKUS_VERSION("quarkus_version"),
-        JAVA_VERSION("java_target");
+        JAVA_VERSION("java_target"),
+
+        RESTEASY_EXAMPLE_RESOURCE_PATH("path"),
+        RESTEASY_EXAMPLE_PACKAGE_NAME(QuarkusCodestartData::convertPackageName),
+        RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME(QuarkusCodestartData::convertClassName);
 
-        private final String legacyKey;
         private final String key;
+        private final Function<Map<String, Object>, Object> converter;
 
         LegacySupport(String legacyKey) {
+            this((m) -> m.get(legacyKey));
+        }
+
+        LegacySupport(Function<Map<String, Object>, Object> converter) {
             this.key = DataKey.valueOf(this.name()).getKey();
-            this.legacyKey = legacyKey;
+            this.converter = converter;
         }
 
         public String getKey() {
             return key;
         }
 
-        public String getLegacyKey() {
-            return legacyKey;
-        }
-
         public static Map<String, Object> convertFromLegacy(Map<String, Object> legacy) {
             return NestedMaps.unflatten(Stream.of(values())
-                    .filter(v -> v.getLegacyKey() != null)
-                    .filter(v -> legacy.containsKey(v.getLegacyKey()))
-                    .map(v -> new HashMap.SimpleImmutableEntry<>(v.getKey(), legacy.get(v.getLegacyKey())))
+                    .map(v -> new HashMap.SimpleImmutableEntry<>(v.getKey(), v.converter.apply(legacy)))
+                    .filter(v -> v.getValue() != null)
                     .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
         }
     }
+
+    private static String convertClassName(final Map<String, Object> legacyData) {
+        Optional<String> classNameValue = NestedMaps.getValue(legacyData, "class_name");
+        if (classNameValue.isPresent()) {
+            final String className = classNameValue.get();
+            int idx = classNameValue.get().lastIndexOf('.');
+            if (idx < 0) {
+                return className;
+            }
+            return className.substring(idx + 1);
+        }
+        return null;
+    }
+
+    private static String convertPackageName(final Map<String, Object> legacyData) {
+        Optional<String> packageNameValue = NestedMaps.getValue(legacyData, "package_name");
+        if (packageNameValue.isPresent()) {
+            return packageNameValue.get();
+        }
+        Optional<String> classNameValue = NestedMaps.getValue(legacyData, "class_name");
+        if (classNameValue.isPresent()) {
+            final String className = classNameValue.get();
+            int idx = className.lastIndexOf('.');
+            if (idx >= 0) {
+                return className.substring(0, idx);
+            }
+        }
+        return null;
+    }
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartInput.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartInput.java
new file mode 100644
index 00000000000000..c55004d6175548
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartInput.java
@@ -0,0 +1,37 @@
+package io.quarkus.devtools.codestarts;
+
+import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+
+public final class QuarkusCodestartInput {
+    private final CodestartInput codestartInput;
+    private final boolean noExamples;
+    private final boolean noDockerfiles;
+    private final boolean noBuildToolWrapper;
+
+    QuarkusCodestartInput(QuarkusCodestartInputBuilder builder) {
+        this.codestartInput = builder.inputBuilder.build();
+        this.noExamples = builder.noExamples;
+        this.noDockerfiles = builder.noDockerfiles;
+        this.noBuildToolWrapper = builder.noBuildToolWrapper;
+    }
+
+    public static QuarkusCodestartInputBuilder builder(QuarkusPlatformDescriptor platformDescr) {
+        return new QuarkusCodestartInputBuilder(platformDescr);
+    }
+
+    public CodestartInput getCodestartInput() {
+        return codestartInput;
+    }
+
+    public boolean noExamples() {
+        return noExamples;
+    }
+
+    public boolean noDockerfiles() {
+        return noDockerfiles;
+    }
+
+    public boolean noBuildToolWrapper() {
+        return noBuildToolWrapper;
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartInputBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartInputBuilder.java
new file mode 100644
index 00000000000000..4d13705f75d5c5
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestartInputBuilder.java
@@ -0,0 +1,132 @@
+package io.quarkus.devtools.codestarts;
+
+import static io.quarkus.devtools.codestarts.QuarkusCodestarts.resourceLoader;
+import static java.util.Objects.requireNonNull;
+
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.dependencies.Extension;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class QuarkusCodestartInputBuilder {
+    final CodestartInputBuilder inputBuilder;
+    final Map<AppArtifactKey, String> extensionCodestartMapping;
+    boolean noExamples;
+    boolean noDockerfiles;
+    boolean noBuildToolWrapper;
+    private BuildTool buildTool = BuildTool.MAVEN;
+
+    QuarkusCodestartInputBuilder(QuarkusPlatformDescriptor platformDescr) {
+        this.inputBuilder = CodestartInput.builder(resourceLoader(platformDescr));
+        this.extensionCodestartMapping = buildCodestartMapping(platformDescr.getExtensions());
+    }
+
+    public QuarkusCodestartInputBuilder addExtensions(Collection<AppArtifactKey> extensions) {
+        final Set<String> codestarts = extensions.stream()
+                .filter(extensionCodestartMapping::containsKey)
+                .map(extensionCodestartMapping::get)
+                .collect(Collectors.toSet());
+        this.addCodestarts(codestarts);
+        this.inputBuilder.addDependencies(extensions);
+        return this;
+    }
+
+    public QuarkusCodestartInputBuilder addExtension(AppArtifactKey extension) {
+        return this.addExtensions(Collections.singletonList(extension));
+    }
+
+    public QuarkusCodestartInputBuilder addCodestarts(Collection<String> codestarts) {
+        this.inputBuilder.addCodestarts(codestarts);
+        return this;
+    }
+
+    public QuarkusCodestartInputBuilder addCodestart(String codestart) {
+        this.inputBuilder.addCodestart(codestart);
+        return this;
+    }
+
+    public QuarkusCodestartInputBuilder addData(Map<String, Object> data) {
+        this.inputBuilder.addData(data);
+        return this;
+    }
+
+    public QuarkusCodestartInputBuilder putData(String key, Object value) {
+        this.inputBuilder.putData(key, value);
+        return this;
+    }
+
+    public QuarkusCodestartInputBuilder noExamples() {
+        return this.noExamples(true);
+    }
+
+    public QuarkusCodestartInputBuilder noExamples(boolean noExamples) {
+        this.noExamples = noExamples;
+        return this;
+    }
+
+    public QuarkusCodestartInputBuilder noDockerfiles() {
+        return this.noDockerfiles(true);
+    }
+
+    public QuarkusCodestartInputBuilder noDockerfiles(boolean noDockerfiles) {
+        this.noDockerfiles = noDockerfiles;
+        return this;
+    }
+
+    public QuarkusCodestartInputBuilder noBuildToolWrapper() {
+        return this.noBuildToolWrapper(true);
+    }
+
+    public QuarkusCodestartInputBuilder noBuildToolWrapper(boolean noBuildToolWrapper) {
+        this.noBuildToolWrapper = noBuildToolWrapper;
+        return this;
+    }
+
+    public QuarkusCodestartInputBuilder buildTool(BuildTool buildTool) {
+        this.buildTool = requireNonNull(buildTool, "buildTool is required");
+        ;
+        return this;
+    }
+
+    public QuarkusCodestartInput build() {
+        this.inputBuilder.addCodestarts(getToolingCodestarts());
+        return new QuarkusCodestartInput(this);
+    }
+
+    private List<String> getToolingCodestarts() {
+        final List<String> codestarts = new ArrayList<>();
+        codestarts.add(buildTool.getKey());
+        if (!noBuildToolWrapper) {
+            switch (buildTool) {
+                case GRADLE:
+                case GRADLE_KOTLIN_DSL:
+                    codestarts.add(QuarkusCodestarts.Tooling.GRADLE_WRAPPER.getKey());
+                    break;
+                case MAVEN:
+                    codestarts.add(QuarkusCodestarts.Tooling.MAVEN_WRAPPER.getKey());
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unsupported build tool wrapper: " + buildTool);
+            }
+        }
+        if (!noDockerfiles) {
+            codestarts.add(QuarkusCodestarts.Tooling.DOCKERFILES.getKey());
+        }
+        return codestarts;
+    }
+
+    private static Map<AppArtifactKey, String> buildCodestartMapping(Collection<Extension> extensions) {
+        return extensions.stream()
+                .filter(e -> e.getCodestart() != null)
+                .collect(Collectors.toMap(e -> new AppArtifactKey(e.getGroupId(), e.getArtifactId(), e.getClassifier(),
+                        e.getType() == null ? "jar" : e.getType()), Extension::getCodestart));
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestarts.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestarts.java
index 9097f3aad63b78..2703be032a0b52 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestarts.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusCodestarts.java
@@ -1,70 +1,70 @@
 package io.quarkus.devtools.codestarts;
 
-import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.dependencies.Extension;
-import io.quarkus.devtools.project.BuildTool;
+import static io.quarkus.devtools.codestarts.CodestartLoader.loadAllCodestarts;
+
 import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 public final class QuarkusCodestarts {
     private QuarkusCodestarts() {
     }
 
-    public enum Language implements CodestartName {
+    public enum Tag implements KeySupplier {
+        EXAMPLE,
+        COMPATIBILITY_ISSUES,
+        MAVEN_ONLY;
+    }
+
+    public enum Language implements KeySupplier {
         JAVA,
         KOTLIN,
         SCALA
     }
 
-    public enum Tooling implements CodestartName {
+    public enum Tooling implements KeySupplier {
         GRADLE_WRAPPER,
         MAVEN_WRAPPER,
         DOCKERFILES
     }
 
-    public static CodestartInputBuilder inputBuilder(QuarkusPlatformDescriptor platformDescr) {
-        return CodestartInput.builder(resourceLoader(platformDescr), buildCodestartMapping(platformDescr.getExtensions()))
-                .includeExamples();
+    public enum Example implements KeySupplier {
+        RESTEASY_EXAMPLE,
+        COMMANDMODE_EXAMPLE
     }
 
-    public static CodestartResourceLoader resourceLoader(QuarkusPlatformDescriptor platformDescr) {
-        return new QuarkusPlatformCodestartResourceLoader(platformDescr);
+    public static CodestartProject prepareProject(QuarkusCodestartInput input) throws IOException {
+        final List<Codestart> allCodestarts = loadAllCodestarts(input.getCodestartInput());
+        final CodestartProject codestartProject = Codestarts.prepareProject(input.getCodestartInput(), allCodestarts);
+
+        // Filter out examples if noExamples
+        final List<Codestart> codestarts = codestartProject.getCodestarts().stream()
+                .filter(c -> !isExample(c) || !input.noExamples())
+                .collect(Collectors.toCollection(ArrayList::new));
+
+        // include commandmode example codestarts if none selected
+        if (!input.noExamples()
+                && codestartProject.getExtraCodestarts().stream()
+                        .noneMatch(c -> isExample(c) && !c.getSpec().isPreselected())) {
+            final Codestart commandModeCodestart = allCodestarts.stream()
+                    .filter(c -> c.isSelected(Collections.singleton(Example.COMMANDMODE_EXAMPLE.getKey())))
+                    .findFirst().orElseThrow(() -> new CodestartDefinitionException(
+                            Example.COMMANDMODE_EXAMPLE.getKey() + " codestart not found"));
+            codestarts.add(commandModeCodestart);
+        }
+
+        return new CodestartProject(input.getCodestartInput(), codestarts);
     }
 
-    public static Map<AppArtifactKey, String> buildCodestartMapping(Collection<Extension> extensions) {
-        return extensions.stream()
-                .filter(e -> e.getCodestart() != null)
-                .collect(Collectors.toMap(e -> new AppArtifactKey(e.getGroupId(), e.getArtifactId(), e.getClassifier(),
-                        e.getType() == null ? "jar" : e.getType()), Extension::getCodestart));
+    public static CodestartResourceLoader resourceLoader(QuarkusPlatformDescriptor platformDescr) {
+        return new QuarkusPlatformCodestartResourceLoader(platformDescr);
     }
 
-    public static List<String> getToolingCodestarts(final BuildTool buildTool,
-            boolean noBuildToolWrapper,
-            boolean noDockerfiles) {
-        final List<String> codestarts = new ArrayList<>();
-        codestarts.add(buildTool.getKey());
-        if (!noBuildToolWrapper) {
-            switch (buildTool) {
-                case GRADLE:
-                case GRADLE_KOTLIN_DSL:
-                    codestarts.add(Tooling.GRADLE_WRAPPER.getCodestartName());
-                    break;
-                case MAVEN:
-                    codestarts.add(Tooling.MAVEN_WRAPPER.getCodestartName());
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unsupported build tool wrapper: " + buildTool);
-            }
-        }
-        if (!noDockerfiles) {
-            codestarts.add(Tooling.DOCKERFILES.getCodestartName());
-        }
-        return codestarts;
+    public static boolean isExample(Codestart codestart) {
+        return codestart.getType() == CodestartSpec.Type.CODE && codestart.getSpec().getTags().contains(Tag.EXAMPLE.getKey());
     }
 
     private static class QuarkusPlatformCodestartResourceLoader implements CodestartResourceLoader {
@@ -80,8 +80,8 @@ public <T> T loadResourceAsPath(String name, Consumer<T> consumer) throws IOExce
         }
     };
 
-    interface CodestartName {
-        default String getCodestartName() {
+    interface KeySupplier {
+        default String getKey() {
             return this.toString().toLowerCase().replace("_", "-");
         }
     }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
index 2d7edc210427de..02db70b94795f1 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
@@ -1,5 +1,6 @@
 package io.quarkus.devtools.commands.handlers;
 
+import static io.quarkus.devtools.codestarts.QuarkusCodestarts.prepareProject;
 import static io.quarkus.devtools.commands.CreateProject.CODESTARTS_ENABLED;
 import static io.quarkus.devtools.commands.CreateProject.NO_BUILDTOOL_WRAPPER;
 import static io.quarkus.devtools.commands.CreateProject.NO_DOCKERFILES;
@@ -10,13 +11,12 @@
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.devtools.codestarts.Codestart;
-import io.quarkus.devtools.codestarts.CodestartInput;
 import io.quarkus.devtools.codestarts.CodestartProject;
 import io.quarkus.devtools.codestarts.CodestartSpec;
 import io.quarkus.devtools.codestarts.Codestarts;
 import io.quarkus.devtools.codestarts.NestedMaps;
 import io.quarkus.devtools.codestarts.QuarkusCodestartData.LegacySupport;
-import io.quarkus.devtools.codestarts.QuarkusCodestarts;
+import io.quarkus.devtools.codestarts.QuarkusCodestartInput;
 import io.quarkus.devtools.commands.data.QuarkusCommandException;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
@@ -77,16 +77,18 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
                 if (platformDescr.getMetadata().get("gradle") != null) {
                     platformData.put("gradle", platformDescr.getMetadata().get("gradle"));
                 }
-                final CodestartInput input = QuarkusCodestarts.inputBuilder(platformDescr)
+                final QuarkusCodestartInput input = QuarkusCodestartInput.builder(platformDescr)
                         .addExtensions(extensionsToAdd)
-                        .addCodestarts(getToolingCodestarts(invocation))
+                        .buildTool(invocation.getQuarkusProject().getBuildTool())
+                        .noExamples(invocation.getValue(NO_EXAMPLES, false))
+                        .noBuildToolWrapper(invocation.getValue(NO_BUILDTOOL_WRAPPER, false))
+                        .noDockerfiles(invocation.getValue(NO_DOCKERFILES, false))
                         .addData(platformData)
                         .addData(LegacySupport.convertFromLegacy(invocation.getValues()))
-                        .includeExamples(!invocation.getValue(NO_EXAMPLES, false))
                         .build();
-                invocation.log().info("Generating Quarkus Codestart Project with data: " + input.getData().toString());
-                final CodestartProject codestartProject = Codestarts
-                        .prepareProject(input);
+                invocation.log().info(
+                        "Generating Quarkus Codestart Project with data: " + input.getCodestartInput().getData().toString());
+                final CodestartProject codestartProject = prepareProject(input);
                 invocation.log().info("Codestarts: " + codestartProject.getCodestarts().stream().map(Codestart::getSpec)
                         .map(CodestartSpec::getName).collect(Collectors.joining(", ")));
                 Codestarts.generateProject(codestartProject, invocation.getQuarkusProject().getProjectDirPath());
@@ -153,13 +155,6 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
         return QuarkusCommandOutcome.success();
     }
 
-    private List<String> getToolingCodestarts(final QuarkusCommandInvocation invocation) {
-        return QuarkusCodestarts.getToolingCodestarts(
-                invocation.getQuarkusProject().getBuildTool(),
-                invocation.getValue(NO_BUILDTOOL_WRAPPER, false),
-                invocation.getValue(NO_DOCKERFILES, false));
-    }
-
     // # CLOSE YOUR EYES PLEASE
     static void addPlatformDataToLegacyCodegen(QuarkusCommandInvocation invocation) {
         final BuildTool buildTool = invocation.getQuarkusProject().getBuildTool();
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectRunIT.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectRunIT.java
deleted file mode 100644
index d4be69c656dff7..00000000000000
--- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectRunIT.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package io.quarkus.devtools.codestarts;
-
-import static io.quarkus.devtools.codestarts.QuarkusCodestarts.getToolingCodestarts;
-import static io.quarkus.devtools.codestarts.QuarkusCodestarts.inputBuilder;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import com.google.common.collect.Sets;
-
-import io.quarkus.devtools.PlatformAwareTestBase;
-import io.quarkus.devtools.ProjectTestUtil;
-import io.quarkus.devtools.codestarts.QuarkusCodestartData.DataKey;
-import io.quarkus.devtools.project.BuildTool;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class CodestartProjectRunIT extends PlatformAwareTestBase {
-
-    private static final Path testDirPath = Paths.get("target/codestarts-run-test");
-
-    private static final Set<String> RUN_MANUALLY_CODESTARTS = Sets.newHashSet(
-            "azure-functions-http-example");
-    private static final Set<String> RUN_ALONE_CODESTARTS = Sets.newHashSet(
-            "funqy-amazon-lambda-example",
-            "funqy-knative-events-example",
-            "amazon-lambda-example");
-
-    @BeforeAll
-    static void setUp() throws IOException {
-        ProjectTestUtil.delete(testDirPath.toFile());
-    }
-
-    private Map<String, Object> getTestInputData() {
-        return getTestInputData(null);
-    }
-
-    private Map<String, Object> getTestInputData(final Map<String, Object> override) {
-        return CodestartProjectGenerationIT.getTestInputData(getPlatformDescriptor(), override);
-    }
-
-    private Stream<Arguments> provideGenerateCombinations() throws IOException {
-        final List<String> examples = CodestartLoader
-                .loadCodestartsFromExtensions(QuarkusCodestarts.resourceLoader(getPlatformDescriptor())).stream()
-                .filter(c -> c.getSpec().isExample())
-                .map(Codestart::getName)
-                .filter(c -> !RUN_MANUALLY_CODESTARTS.contains(c))
-                .collect(Collectors.toList());
-        final List<List<String>> runAlone = examples.stream().filter(RUN_ALONE_CODESTARTS::contains)
-                .map(Collections::singletonList).collect(Collectors.toList());
-        final List<String> runTogether = examples.stream().filter(o -> !RUN_ALONE_CODESTARTS.contains(o))
-                .collect(Collectors.toList());
-        return Stream.of("java", "kotlin", "scala")
-                .flatMap(l -> Stream.concat(Stream.of(runTogether, Collections.emptyList()), Stream.of(runAlone.toArray()))
-                        .map(c -> Arguments.of(l, c)));
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideGenerateCombinations")
-    public void generateMavenProjectRun(String language, List<String> codestarts) throws Exception {
-        generateProjectRunTests("maven", language, codestarts);
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideGenerateCombinations")
-    public void generateGradleProjectRun(String language, List<String> codestarts) throws Exception {
-        generateProjectRunTests("gradle", language, codestarts);
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideGenerateCombinations")
-    public void generateGradleKotlinProjectRun(String language, List<String> codestarts) throws Exception {
-        generateProjectRunTests("gradle-kotlin-dsl", language, codestarts);
-    }
-
-    @Test
-    public void generateAzureFunctionsHttpExampleProjectRun() throws Exception {
-        generateProjectRunTests("maven", "java", Collections.singletonList("azure-functions-http-example"));
-    }
-
-    private void generateProjectRunTests(String buildtool, String language, List<String> codestarts) throws Exception {
-        String name = "project-" + buildtool + "-" + language;
-        if (codestarts.isEmpty()) {
-            name += "-commandmode";
-        } else {
-            name += "-" + String.join("-", codestarts);
-        }
-        final BuildTool buildTool = BuildTool.findTool(buildtool);
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addData(getTestInputData(Collections.singletonMap("artifact-id", name)))
-                .addCodestarts(getToolingCodestarts(buildTool, false, false))
-                .addCodestarts(codestarts)
-                // for JVM 8 and 14 this will generate project with java 1.8, for JVM 11 project with java 11
-                .putData(DataKey.JAVA_VERSION.getKey(), System.getProperty("java.specification.version"))
-                .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
-        Path projectDir = testDirPath.resolve(name);
-        Codestarts.generateProject(codestartProject, projectDir);
-        final int result = CodestartProjectTestRunner.run(projectDir,
-                CodestartProjectTestRunner.Wrapper.fromBuildtool(buildtool));
-        assertThat(result).isZero();
-    }
-}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationIT.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartGenerationIT.java
similarity index 57%
rename from integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationIT.java
rename to integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartGenerationIT.java
index 6c9a7353c66f34..ded9682b6bba14 100644
--- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationIT.java
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartGenerationIT.java
@@ -1,7 +1,7 @@
 package io.quarkus.devtools.codestarts;
 
 import static io.quarkus.devtools.codestarts.QuarkusCodestartData.DataKey.*;
-import static io.quarkus.devtools.codestarts.QuarkusCodestarts.inputBuilder;
+import static io.quarkus.devtools.codestarts.QuarkusCodestarts.prepareProject;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
@@ -22,7 +22,7 @@
 import io.quarkus.devtools.project.BuildTool;
 import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
 
-class CodestartProjectGenerationIT extends PlatformAwareTestBase {
+class QuarkusCodestartGenerationIT extends PlatformAwareTestBase {
 
     private static final Path testDirPath = Paths.get("target/codestarts-test");
 
@@ -36,7 +36,7 @@ private Map<String, Object> getTestInputData() {
     }
 
     private Map<String, Object> getTestInputData(final Map<String, Object> override) {
-        return CodestartProjectGenerationIT.getTestInputData(getPlatformDescriptor(), override);
+        return QuarkusCodestartGenerationIT.getTestInputData(getPlatformDescriptor(), override);
     }
 
     static Map<String, Object> getTestInputData(final QuarkusPlatformDescriptor descriptor,
@@ -62,11 +62,13 @@ static Map<String, Object> getTestInputData(final QuarkusPlatformDescriptor desc
 
     @Test
     void generateCodestartProjectEmpty() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .includeExamples(false)
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .noExamples()
+                .noDockerfiles()
+                .noBuildToolWrapper()
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("empty");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -80,13 +82,12 @@ void generateCodestartProjectEmpty() throws IOException {
     }
 
     @Test
-    void generateCodestartProjectEmptyWithExamples() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.MAVEN, false, false))
+    void generateCodestartProjectDefaultWithExamples() throws IOException {
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
-        final Path projectDir = testDirPath.resolve("empty-examples");
+        final CodestartProject codestartProject = prepareProject(input);
+        final Path projectDir = testDirPath.resolve("default-examples");
         Codestarts.generateProject(codestartProject, projectDir);
 
         checkMaven(projectDir);
@@ -94,17 +95,138 @@ void generateCodestartProjectEmptyWithExamples() throws IOException {
         checkDockerfiles(projectDir);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/commandmode/GreetingMain.java")).exists();
+        assertThat(projectDir.resolve("src/main/java/org/acme/commandmode/HelloCommando.java")).exists();
+    }
+
+    @Test
+    void generateCodestartProjectCommandModeCustom() throws IOException {
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .addData(getTestInputData())
+                .putData(COMMANDMODE_EXAMPLE_PACKAGE_NAME.getKey(), "com.test.andy")
+                .putData(COMMANDMODE_EXAMPLE_RESOURCE_CLASS_NAME.getKey(), "AndyCommando")
+                .build();
+        final CodestartProject codestartProject = prepareProject(input);
+        final Path projectDir = testDirPath.resolve("commandmode-custom");
+        Codestarts.generateProject(codestartProject, projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir);
+        checkConfigProperties(projectDir);
+
+        assertThat(projectDir.resolve("src/main/java/com/test/andy/AndyCommando.java")).exists()
+                .satisfies(checkContains("package com.test.andy;"))
+                .satisfies(checkContains("class AndyCommando"));
+    }
+
+    @Test
+    void generateCodestartProjectRESTEasyJavaCustom() throws IOException {
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .addData(getTestInputData())
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .putData(RESTEASY_EXAMPLE_PACKAGE_NAME.getKey(), "com.andy")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME.getKey(), "BonjourResource")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_PATH.getKey(), "/bonjour")
+                .build();
+        final CodestartProject codestartProject = prepareProject(input);
+        final Path projectDir = testDirPath.resolve("resteasy-java-custom");
+        Codestarts.generateProject(codestartProject, projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir);
+        checkConfigProperties(projectDir);
+
+        assertThat(projectDir.resolve("src/main/java/com/andy/BonjourResource.java")).exists()
+                .satisfies(checkContains("package com.andy;"))
+                .satisfies(checkContains("class BonjourResource"))
+                .satisfies(checkContains("@Path(\"/bonjour\")"));
+
+        assertThat(projectDir.resolve("src/test/java/com/andy/BonjourResourceTest.java")).exists()
+                .satisfies(checkContains("package com.andy;"))
+                .satisfies(checkContains("class BonjourResourceTest"))
+                .satisfies(checkContains("\"/bonjour\""));
+
+        assertThat(projectDir.resolve("src/test/java/com/andy/NativeBonjourResourceIT.java")).exists()
+                .satisfies(checkContains("package com.andy;"))
+                .satisfies(checkContains("class NativeBonjourResourceIT extends BonjourResourceTest"));
+    }
+
+    @Test
+    void generateCodestartProjectRESTEasyKotlinCustom() throws IOException {
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .addData(getTestInputData())
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
+                .putData(RESTEASY_EXAMPLE_PACKAGE_NAME.getKey(), "com.andy")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME.getKey(), "BonjourResource")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_PATH.getKey(), "/bonjour")
+                .build();
+        final CodestartProject codestartProject = prepareProject(input);
+        final Path projectDir = testDirPath.resolve("resteasy-kotlin-custom");
+        Codestarts.generateProject(codestartProject, projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir);
+        checkConfigProperties(projectDir);
+
+        assertThat(projectDir.resolve("src/main/kotlin/com/andy/BonjourResource.kt")).exists()
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class BonjourResource"))
+                .satisfies(checkContains("@Path(\"/bonjour\")"));
+
+        assertThat(projectDir.resolve("src/test/kotlin/com/andy/BonjourResourceTest.kt")).exists()
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class BonjourResourceTest"))
+                .satisfies(checkContains("\"/bonjour\""));
+
+        assertThat(projectDir.resolve("src/test/kotlin/com/andy/NativeBonjourResourceIT.kt")).exists()
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class NativeBonjourResourceIT : BonjourResourceTest"));
+    }
+
+    @Test
+    void generateCodestartProjectRESTEasyScalaCustom() throws IOException {
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .addData(getTestInputData())
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
+                .putData(RESTEASY_EXAMPLE_PACKAGE_NAME.getKey(), "com.andy")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME.getKey(), "BonjourResource")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_PATH.getKey(), "/bonjour")
+                .build();
+        final CodestartProject codestartProject = prepareProject(input);
+        final Path projectDir = testDirPath.resolve("resteasy-kotlin-custom");
+        Codestarts.generateProject(codestartProject, projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir);
+        checkConfigProperties(projectDir);
+
+        assertThat(projectDir.resolve("src/main/scala/com/andy/BonjourResource.scala")).exists()
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class BonjourResource"))
+                .satisfies(checkContains("@Path(\"/bonjour\")"));
+
+        assertThat(projectDir.resolve("src/test/scala/com/andy/BonjourResourceTest.scala")).exists()
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class BonjourResourceTest"))
+                .satisfies(checkContains("\"/bonjour\""));
+
+        assertThat(projectDir.resolve("src/test/scala/com/andy/NativeBonjourResourceIT.scala")).exists()
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class NativeBonjourResourceIT extends BonjourResourceTest"));
     }
 
     @Test
     void generateCodestartProjectMavenResteasyJava() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.MAVEN, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("maven-resteasy-java");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -114,16 +236,17 @@ void generateCodestartProjectMavenResteasyJava() throws IOException {
         checkConfigProperties(projectDir);
 
         assertThat(projectDir.resolve("src/main/java/org/acme/resteasy/ExampleResource.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/ExampleResourceTest.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/NativeExampleResourceIT.java")).exists();
     }
 
     @Test
     void generateCodestartProjectMavenConfigYamlJava() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.MAVEN, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-config-yaml"))
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("maven-yaml-java");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -137,13 +260,12 @@ void generateCodestartProjectMavenConfigYamlJava() throws IOException {
 
     @Test
     void generateCodestartProjectMavenResteasyKotlin() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.MAVEN, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("maven-resteasy-kotlin");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -153,17 +275,18 @@ void generateCodestartProjectMavenResteasyKotlin() throws IOException {
         checkConfigProperties(projectDir);
 
         assertThat(projectDir.resolve("src/main/kotlin/org/acme/resteasy/ExampleResource.kt")).exists();
+        assertThat(projectDir.resolve("src/test/kotlin/org/acme/resteasy/ExampleResourceTest.kt")).exists();
+        assertThat(projectDir.resolve("src/test/kotlin/org/acme/resteasy/NativeExampleResourceIT.kt")).exists();
     }
 
     @Test
     void generateCodestartProjectMavenResteasyScala() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.MAVEN, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("maven-resteasy-scala");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -173,17 +296,19 @@ void generateCodestartProjectMavenResteasyScala() throws IOException {
         checkConfigProperties(projectDir);
 
         assertThat(projectDir.resolve("src/main/scala/org/acme/resteasy/ExampleResource.scala")).exists();
+        assertThat(projectDir.resolve("src/test/scala/org/acme/resteasy/ExampleResourceTest.scala")).exists();
+        assertThat(projectDir.resolve("src/test/scala/org/acme/resteasy/NativeExampleResourceIT.scala")).exists();
     }
 
     @Test
     void generateCodestartProjectGradleResteasyJava() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.GRADLE, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .buildTool(BuildTool.GRADLE)
                 .addCodestart("gradle")
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("gradle-resteasy-java");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -193,18 +318,20 @@ void generateCodestartProjectGradleResteasyJava() throws IOException {
         checkConfigProperties(projectDir);
 
         assertThat(projectDir.resolve("src/main/java/org/acme/resteasy/ExampleResource.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/ExampleResourceTest.java")).exists();
+        assertThat(projectDir.resolve("src/native-test/java/org/acme/resteasy/NativeExampleResourceIT.java")).exists();
     }
 
     @Test
     void generateCodestartProjectGradleResteasyKotlin() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.GRADLE, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .buildTool(BuildTool.GRADLE)
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
                 .addCodestart("gradle")
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("gradle-resteasy-kotlin");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -214,17 +341,19 @@ void generateCodestartProjectGradleResteasyKotlin() throws IOException {
         checkConfigProperties(projectDir);
 
         assertThat(projectDir.resolve("src/main/kotlin/org/acme/resteasy/ExampleResource.kt")).exists();
+        assertThat(projectDir.resolve("src/test/kotlin/org/acme/resteasy/ExampleResourceTest.kt")).exists();
+        assertThat(projectDir.resolve("src/native-test/kotlin/org/acme/resteasy/NativeExampleResourceIT.kt")).exists();
     }
 
     @Test
     void generateCodestartProjectGradleResteasyScala() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.GRADLE, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .buildTool(BuildTool.GRADLE)
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("gradle-resteasy-scala");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -234,16 +363,18 @@ void generateCodestartProjectGradleResteasyScala() throws IOException {
         checkConfigProperties(projectDir);
 
         assertThat(projectDir.resolve("src/main/scala/org/acme/resteasy/ExampleResource.scala")).exists();
+        assertThat(projectDir.resolve("src/test/scala/org/acme/resteasy/ExampleResourceTest.scala")).exists();
+        assertThat(projectDir.resolve("src/native-test/scala/org/acme/resteasy/NativeExampleResourceIT.scala")).exists();
     }
 
     @Test
     void generateCodestartProjectGradleWithKotlinDslResteasyJava() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.GRADLE_KOTLIN_DSL, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .buildTool(BuildTool.GRADLE_KOTLIN_DSL)
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("gradle-kotlin-dsl-resteasy-java");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -257,13 +388,13 @@ void generateCodestartProjectGradleWithKotlinDslResteasyJava() throws IOExceptio
 
     @Test
     void generateCodestartProjectGradleWithKotlinDslResteasyKotlin() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.GRADLE_KOTLIN_DSL, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .buildTool(BuildTool.GRADLE_KOTLIN_DSL)
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("gradle-kotlin-dsl-resteasy-kotlin");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -277,13 +408,13 @@ void generateCodestartProjectGradleWithKotlinDslResteasyKotlin() throws IOExcept
 
     @Test
     void generateCodestartProjectGradleWithKotlinDslResteasyScala() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.GRADLE_KOTLIN_DSL, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .buildTool(BuildTool.GRADLE_KOTLIN_DSL)
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("gradle-kotlin-dsl-resteasy-scala");
         Codestarts.generateProject(codestartProject, projectDir);
 
@@ -297,13 +428,12 @@ void generateCodestartProjectGradleWithKotlinDslResteasyScala() throws IOExcepti
 
     @Test
     void generateCodestartProjectQute() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(QuarkusCodestarts.getToolingCodestarts(BuildTool.MAVEN, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-qute"))
                 .addCodestart("qute")
                 .addData(getTestInputData())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         final Path projectDir = testDirPath.resolve("maven-qute");
         Codestarts.generateProject(codestartProject, projectDir);
 
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartRunIT.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartRunIT.java
new file mode 100644
index 00000000000000..363cd1ba6d1667
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartRunIT.java
@@ -0,0 +1,158 @@
+package io.quarkus.devtools.codestarts;
+
+import static io.quarkus.devtools.codestarts.QuarkusCodestarts.prepareProject;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import com.google.common.collect.Sets;
+
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.ProjectTestUtil;
+import io.quarkus.devtools.codestarts.QuarkusCodestartData.DataKey;
+import io.quarkus.devtools.codestarts.QuarkusCodestarts.Tag;
+import io.quarkus.devtools.project.BuildTool;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class QuarkusCodestartRunIT extends PlatformAwareTestBase {
+
+    private static final Path testDirPath = Paths.get("target/codestarts-run-test");
+
+    private static final Set<String> EXCLUDED = Sets.newHashSet(
+            "azure-functions-http-example", "commandmode-example");
+
+    @BeforeAll
+    static void setUp() throws IOException {
+        ProjectTestUtil.delete(testDirPath.toFile());
+    }
+
+    private Map<String, Object> getTestInputData() {
+        return getTestInputData(null);
+    }
+
+    private Map<String, Object> getTestInputData(final Map<String, Object> override) {
+        return QuarkusCodestartGenerationIT.getTestInputData(getPlatformDescriptor(), override);
+    }
+
+    private Stream<Arguments> provideGenerateCombinations() throws IOException {
+        final List<Codestart> examples = CodestartLoader
+                .loadAllCodestarts(QuarkusCodestarts.resourceLoader(getPlatformDescriptor())).stream()
+                .filter(QuarkusCodestarts::isExample)
+                .filter(c -> !EXCLUDED.contains(c.getName()))
+                .collect(Collectors.toList());
+        final List<List<String>> runAlone = examples.stream()
+                .filter(c -> c.containsTag(Tag.COMPATIBILITY_ISSUES.getKey()))
+                .map(Codestart::getName)
+                .map(Collections::singletonList)
+                .collect(Collectors.toList());
+        final List<String> runTogether = examples.stream()
+                .filter(c -> !c.containsTag(Tag.COMPATIBILITY_ISSUES.getKey()))
+                .map(Codestart::getName)
+                .collect(Collectors.toList());
+        return Stream.of("java", "kotlin", "scala")
+                .flatMap(l -> Stream.concat(Stream.of(runTogether, Collections.emptyList()), Stream.of(runAlone.toArray()))
+                        .map(c -> Arguments.of(l, c)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideGenerateCombinations")
+    public void generateMavenProjectRun(String language, List<String> codestarts) throws Exception {
+        generateProjectRunTests("maven", language, codestarts, Collections.emptyMap());
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideGenerateCombinations")
+    public void generateGradleProjectRun(String language, List<String> codestarts) throws Exception {
+        generateProjectRunTests("gradle", language, codestarts, Collections.emptyMap());
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideGenerateCombinations")
+    public void generateGradleKotlinProjectRun(String language, List<String> codestarts) throws Exception {
+        generateProjectRunTests("gradle-kotlin-dsl", language, codestarts, Collections.emptyMap());
+    }
+
+    @Test
+    public void generateAzureFunctionsHttpExampleProjectRun() throws Exception {
+        generateProjectRunTests("maven", "java", Collections.singletonList("azure-functions-http-example"),
+                Collections.emptyMap());
+    }
+
+    @Test
+    public void generateCustomizedRESTEasyProjectRun() throws Exception {
+        final HashMap<String, Object> data = new HashMap<>();
+        data.put(DataKey.RESTEASY_EXAMPLE_PACKAGE_NAME.getKey(), "com.test.andy");
+        data.put(DataKey.RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME.getKey(), "AndyEndpoint");
+        data.put(DataKey.RESTEASY_EXAMPLE_RESOURCE_PATH.getKey(), "/andy");
+        final String buildTool = "maven";
+        final String language = "java";
+        final List<String> codestarts = Collections.singletonList("resteasy-example");
+        generateProjectRunTests(buildTool, language, codestarts, data,
+                genName(buildTool, language, codestarts) + "-customized");
+    }
+
+    @Test
+    public void generateCustomizedCommandModeProjectRun() throws Exception {
+        final HashMap<String, Object> data = new HashMap<>();
+        data.put(DataKey.COMMANDMODE_EXAMPLE_PACKAGE_NAME.getKey(), "com.test.andy");
+        data.put(DataKey.COMMANDMODE_EXAMPLE_RESOURCE_CLASS_NAME.getKey(), "AndyCommando");
+        final String buildTool = "maven";
+        final String language = "java";
+        final List<String> codestarts = Collections.emptyList();
+        generateProjectRunTests(buildTool, language, codestarts, data,
+                genName(buildTool, language, codestarts) + "-customized");
+    }
+
+    private void generateProjectRunTests(String buildTool, String language, List<String> codestarts, Map<String, Object> data)
+            throws Exception {
+        generateProjectRunTests(buildTool, language, codestarts, data, genName(buildTool, language, codestarts));
+    }
+
+    private void generateProjectRunTests(String buildToolName, String language, List<String> codestarts,
+            Map<String, Object> data, String name)
+            throws Exception {
+        final BuildTool buildTool = BuildTool.findTool(buildToolName);
+
+        // for JVM 8 and 14 this will generate project with java 1.8, for JVM 11 project with java 11
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .addData(getTestInputData(Collections.singletonMap("artifact-id", name)))
+                .buildTool(buildTool)
+                .addCodestarts(codestarts)
+                .addCodestart(language)
+                .addData(data)
+                .putData(DataKey.JAVA_VERSION.getKey(), System.getProperty("java.specification.version"))
+                .build();
+        final CodestartProject codestartProject = prepareProject(input);
+        Path projectDir = testDirPath.resolve(name);
+        Codestarts.generateProject(codestartProject, projectDir);
+        final int result = WrapperRunner.run(projectDir,
+                WrapperRunner.Wrapper.fromBuildtool(buildToolName));
+        assertThat(result).isZero();
+    }
+
+    private String genName(String buildtool, String language, List<String> codestarts) {
+        String name = "project-" + buildtool + "-" + language;
+        if (codestarts.isEmpty()) {
+            name += "-commandmode";
+        } else {
+            name += "-" + String.join("-", codestarts);
+        }
+        return name;
+    }
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartsIT.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartsIT.java
similarity index 73%
rename from integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartsIT.java
rename to integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartsIT.java
index a989855edd06ec..c739e187af2256 100644
--- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartsIT.java
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartsIT.java
@@ -1,7 +1,6 @@
 package io.quarkus.devtools.codestarts;
 
-import static io.quarkus.devtools.codestarts.QuarkusCodestarts.getToolingCodestarts;
-import static io.quarkus.devtools.codestarts.QuarkusCodestarts.inputBuilder;
+import static io.quarkus.devtools.codestarts.QuarkusCodestarts.prepareProject;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
@@ -18,7 +17,7 @@
 import io.quarkus.devtools.codestarts.CodestartSpec.Type;
 import io.quarkus.devtools.project.BuildTool;
 
-class CodestartsIT extends PlatformAwareTestBase {
+class QuarkusCodestartsIT extends PlatformAwareTestBase {
 
     private final Path projectPath = Paths.get("target/codestarts-test");
 
@@ -30,7 +29,7 @@ void setUp() throws IOException {
     @Test
     void loadBundledCodestartsTest() throws IOException {
         final Collection<Codestart> codestarts = CodestartLoader
-                .loadBundledCodestarts(inputBuilder(getPlatformDescriptor()).build());
+                .loadBundledCodestarts(QuarkusCodestarts.resourceLoader(getPlatformDescriptor()));
         assertThat(codestarts).hasSize(13);
         assertThat(codestarts)
                 .filteredOn(c -> c.getType().isBase())
@@ -46,7 +45,7 @@ void loadBundledCodestartsTest() throws IOException {
     @Test
     void loadExtensionCodestartsTest() throws IOException {
         final Collection<Codestart> codestarts = CodestartLoader
-                .loadCodestartsFromExtensions(inputBuilder(getPlatformDescriptor()).build());
+                .loadCodestartsFromExtensions(QuarkusCodestarts.resourceLoader(getPlatformDescriptor()));
 
         assertThat(codestarts).filteredOn("ref", "qute")
                 .extracting(Codestart::getImplementedLanguages)
@@ -61,8 +60,10 @@ void loadExtensionCodestartsTest() throws IOException {
 
     @Test
     void prepareProjectTestEmpty() throws IOException {
-        final CodestartProject codestartProject = Codestarts
-                .prepareProject(inputBuilder(getPlatformDescriptor()).includeExamples(false).build());
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .noExamples()
+                .build();
+        final CodestartProject codestartProject = prepareProject(input);
         assertThat(codestartProject.getRequiredCodestart(Type.PROJECT)).extracting(Codestart::getResourceDir)
                 .isEqualTo("bundled-codestarts/project/quarkus");
         assertThat(codestartProject.getRequiredCodestart(Type.BUILDTOOL)).extracting(Codestart::getResourceDir)
@@ -78,54 +79,50 @@ void prepareProjectTestEmpty() throws IOException {
 
     @Test
     void prepareProjectTestGradle() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(getToolingCodestarts(BuildTool.GRADLE, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
+                .buildTool(BuildTool.GRADLE)
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         assertThat(codestartProject.getRequiredCodestart(Type.BUILDTOOL)).extracting(Codestart::getResourceDir)
                 .isEqualTo("bundled-codestarts/buildtool/gradle");
     }
 
     @Test
     void prepareProjectTestKotlin() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(getToolingCodestarts(BuildTool.MAVEN, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         assertThat(codestartProject.getRequiredCodestart(Type.LANGUAGE)).extracting(Codestart::getResourceDir)
                 .isEqualTo("bundled-codestarts/language/kotlin");
     }
 
     @Test
     void prepareProjectTestScala() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(getToolingCodestarts(BuildTool.MAVEN, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         assertThat(codestartProject.getRequiredCodestart(Type.LANGUAGE)).extracting(Codestart::getResourceDir)
                 .isEqualTo("bundled-codestarts/language/scala");
     }
 
     @Test
     void prepareProjectTestConfigYaml() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(getToolingCodestarts(BuildTool.MAVEN, false, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-config-yaml"))
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         assertThat(codestartProject.getRequiredCodestart(Type.CONFIG)).extracting(Codestart::getResourceDir)
                 .isEqualTo("bundled-codestarts/config/yaml");
     }
 
     @Test
     void prepareProjectTestResteasy() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(getToolingCodestarts(BuildTool.MAVEN, false, true))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         assertThat(codestartProject.getBaseCodestarts()).extracting(Codestart::getResourceDir)
                 .contains("bundled-codestarts/config/properties");
         assertThat(codestartProject.getExtraCodestarts()).extracting(Codestart::getResourceDir)
@@ -135,10 +132,9 @@ void prepareProjectTestResteasy() throws IOException {
 
     @Test
     void prepareProjectTestCommandMode() throws IOException {
-        final CodestartInput input = inputBuilder(getPlatformDescriptor())
-                .addCodestarts(getToolingCodestarts(BuildTool.MAVEN, true, false))
+        final QuarkusCodestartInput input = QuarkusCodestartInput.builder(getPlatformDescriptor())
                 .build();
-        final CodestartProject codestartProject = Codestarts.prepareProject(input);
+        final CodestartProject codestartProject = prepareProject(input);
         assertThat(codestartProject.getBaseCodestarts()).extracting(Codestart::getResourceDir)
                 .contains("bundled-codestarts/config/properties");
         assertThat(codestartProject.getExtraCodestarts()).extracting(Codestart::getResourceDir)
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectTestRunner.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/WrapperRunner.java
similarity index 98%
rename from integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectTestRunner.java
rename to integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/WrapperRunner.java
index ba140f0e21d07b..021384279b58ec 100644
--- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectTestRunner.java
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/WrapperRunner.java
@@ -11,7 +11,7 @@
 
 import io.quarkus.deployment.util.ProcessUtil;
 
-public final class CodestartProjectTestRunner {
+public final class WrapperRunner {
 
     enum Wrapper {
         GRADLE("gradlew", "gradlew.bat", new String[] { "--no-daemon", "build" }),
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java
index e0731efbb68fff..686e4144b71785 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java
@@ -11,6 +11,8 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.file.Path;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -25,6 +27,7 @@
 import org.apache.maven.shared.invoker.InvokerLogger;
 import org.apache.maven.shared.invoker.MavenInvocationException;
 import org.apache.maven.shared.invoker.PrintStreamLogger;
+import org.junit.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -46,32 +49,68 @@ private static Stream<Arguments> provideLanguages() {
     @ParameterizedTest
     @MethodSource("provideLanguages")
     public void generateMavenProject(String language, String extensions) throws Exception {
-        final Path generatedProjectPath = generateProject("maven", language, extensions);
+        final Path generatedProjectPath = generateProject("maven", language, extensions, Collections.emptyMap());
         checkDir(generatedProjectPath.resolve("src/main/" + language));
         Stream.of(extensions.split(","))
                 .filter(s -> !s.isEmpty())
-                .forEach(e -> check(generatedProjectPath.resolve("pom.xml"), e));
+                .forEach(e -> checkContent(generatedProjectPath.resolve("pom.xml"), e));
     }
 
     @ParameterizedTest
     @MethodSource("provideLanguages")
     public void generateGradleProject(String language, String extensions) throws Exception {
-        final Path generatedProjectPath = generateProject("gradle", language, extensions);
+        final Path generatedProjectPath = generateProject("gradle", language, extensions, Collections.emptyMap());
         checkDir(generatedProjectPath.resolve("src/main/" + language));
         Stream.of(extensions.split(","))
-                .forEach(e -> check(generatedProjectPath.resolve("build.gradle"), e));
+                .forEach(e -> checkContent(generatedProjectPath.resolve("build.gradle"), e));
     }
 
-    private Path generateProject(String buildtool, String language, String extensions) throws Exception {
+    @ParameterizedTest
+    @MethodSource("provideLanguages")
+    public void generateGradleKotlinProject(String language, String extensions) throws Exception {
+        final Path generatedProjectPath = generateProject("gradle-kotlin-dsl", language, extensions, Collections.emptyMap());
+        checkDir(generatedProjectPath.resolve("src/main/" + language));
+        Stream.of(extensions.split(","))
+                .forEach(e -> checkContent(generatedProjectPath.resolve("build.gradle.kts"), e));
+    }
+
+    @Test
+    public void generateCustomRESTEasyJavaProject() throws Exception {
+        final HashMap<String, String> options = new HashMap<>();
+        options.put("path", "/bonjour");
+        options.put("className", "com.andy.BonjourResource");
+        final Path generatedProjectPath = generateProject("maven", "java",
+                "resteasy", options);
+        checkDir(generatedProjectPath.resolve("src/main/java/com/andy"));
+        checkContent(generatedProjectPath.resolve("src/main/java/com/andy/BonjourResource.java"),
+                "package com.andy;",
+                "class BonjourResource",
+                "@Path(\"/bonjour\")");
+
+        checkContent(generatedProjectPath.resolve("src/test/java/com/andy/BonjourResourceTest.java"),
+                "package com.andy;",
+                "class BonjourResourceTest",
+                "\"/bonjour\"");
+
+        checkContent(generatedProjectPath.resolve("src/test/java/com/andy/NativeBonjourResourceIT.java"),
+                "package comandy;",
+                "class NativeBonjourResourceIT extends BonjourResourceTest");
+    }
+
+    private Path generateProject(String buildtool, String language, String extensions, Map<String, String> options)
+            throws Exception {
         String name = "project-" + buildtool + "-" + language;
         if (extensions.isEmpty()) {
             name += "-commandmode";
         } else {
             name += "-" + extensions.replace(",", "-");
         }
+        if (!options.isEmpty()) {
+            name += "-custom";
+        }
         testDir = prepareTestDir(name);
         LOG.info("creating project in " + testDir.toPath().toString());
-        return runCreateCommand(buildtool, extensions + (!Objects.equals(language, "java") ? "," + language : ""));
+        return runCreateCommand(buildtool, extensions + (!Objects.equals(language, "java") ? "," + language : ""), options);
     }
 
     private static File prepareTestDir(String name) {
@@ -88,7 +127,7 @@ private static File prepareTestDir(String name) {
         return tc;
     }
 
-    private Path runCreateCommand(String buildTool, String extensions)
+    private Path runCreateCommand(String buildTool, String extensions, Map<String, String> options)
             throws MavenInvocationException, FileNotFoundException, UnsupportedEncodingException {
         // Scaffold the new project
         assertThat(testDir).isDirectory();
@@ -99,6 +138,7 @@ private Path runCreateCommand(String buildTool, String extensions)
         properties.put("codestartsEnabled", "true");
         properties.put("buildTool", buildTool);
         properties.put("extensions", extensions);
+        properties.putAll(options);
 
         InvocationResult result = executeCreate(properties);
 
@@ -133,13 +173,16 @@ private PrintStreamLogger getPrintStreamLogger(String s) throws UnsupportedEncod
                 InvokerLogger.DEBUG);
     }
 
-    private void check(final Path resource, final String contentsToFind) {
+    private void checkContent(final Path resource, final String... contentsToFind) {
         assertThat(resource).isRegularFile();
-        try {
-            assertThat(FileUtils.readFileToString(resource.toFile(), "UTF-8")).contains(contentsToFind);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
+        Stream.of(contentsToFind)
+                .forEach(c -> {
+                    try {
+                        assertThat(FileUtils.readFileToString(resource.toFile(), "UTF-8")).contains(c);
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                });
     }
 
     private void checkDir(final Path dir) throws IOException {