Fixes piranhacloud#3804 - Add SinglePiranha (piranhacloud#3805)

mnriem · Jul 9, 2024 · 9f69d28 · 9f69d28
1 parent 101748b
commit 9f69d28
Show file tree

Hide file tree

Showing 30 changed files with 394 additions and 2,205 deletions.
diff --git a/core/impl/src/main/java/module-info.java b/core/impl/src/main/java/module-info.java
@@ -37,5 +37,4 @@
     opens cloud.piranha.core.impl;
     requires transitive cloud.piranha.core.api;
     requires transitive cloud.piranha.resource.impl;
-    requires java.base;
 }
diff --git a/dist/coreprofile/pom.xml b/dist/coreprofile/pom.xml
@@ -17,44 +17,14 @@
     <dependencies>
         <!-- compile -->
         <dependency>
-            <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-coreprofile</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cloud.piranha.feature</groupId>
-            <artifactId>piranha-feature-exitonstop</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cloud.piranha.feature</groupId>
-            <artifactId>piranha-feature-http</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cloud.piranha.feature</groupId>
-            <artifactId>piranha-feature-https</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cloud.piranha.feature</groupId>
-            <artifactId>piranha-feature-logging</artifactId>
+            <groupId>cloud.piranha</groupId>
+            <artifactId>piranha-single</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>cloud.piranha.feature</groupId>
-            <artifactId>piranha-feature-webapp</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cloud.piranha.http</groupId>
-            <artifactId>piranha-http-crac</artifactId>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-coreprofile</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/dist/coreprofile/src/main/java/cloud/piranha/dist/coreprofile/CoreProfilePiranha.java b/dist/coreprofile/src/main/java/cloud/piranha/dist/coreprofile/CoreProfilePiranha.java
diff --git a/dist/coreprofile/src/main/java/cloud/piranha/dist/coreprofile/CoreProfilePiranhaMain.java b/dist/coreprofile/src/main/java/cloud/piranha/dist/coreprofile/CoreProfilePiranhaMain.java
@@ -27,6 +27,8 @@
  */
 package cloud.piranha.dist.coreprofile;
 
+import cloud.piranha.extension.coreprofile.CoreProfileExtension;
+import cloud.piranha.single.SinglePiranhaBuilder;
 import static java.lang.System.Logger.Level.WARNING;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
@@ -49,7 +51,7 @@ public class CoreProfilePiranhaMain {
      * @param arguments the arguments.
      */
     public static void main(String[] arguments) {
-        CoreProfilePiranhaBuilder builder = new CoreProfilePiranhaMain().processArguments(arguments);
+        SinglePiranhaBuilder builder = new CoreProfilePiranhaMain().processArguments(arguments);
         if (builder != null) {
             builder.build().start();
         } else {
@@ -62,9 +64,10 @@ public static void main(String[] arguments) {
      *
      * @param arguments the arguments.
      */
-    private CoreProfilePiranhaBuilder processArguments(String[] arguments) {
+    private SinglePiranhaBuilder processArguments(String[] arguments) {
 
-        CoreProfilePiranhaBuilder builder = new CoreProfilePiranhaBuilder()
+        SinglePiranhaBuilder builder = new SinglePiranhaBuilder()
+                .extensionClass(CoreProfileExtension.class)
                 .exitOnStop(true);
         int httpPort = 0;
         int httpsPort = 0;

diff --git a/dist/coreprofile/src/main/java/module-info.java b/dist/coreprofile/src/main/java/module-info.java
@@ -36,10 +36,6 @@
     exports cloud.piranha.dist.coreprofile;
     opens cloud.piranha.dist.coreprofile;
     requires cloud.piranha.extension.coreprofile;
-    requires cloud.piranha.feature.exitonstop;
-    requires cloud.piranha.feature.http;
-    requires cloud.piranha.feature.https;
-    requires cloud.piranha.feature.logging;
-    requires cloud.piranha.feature.webapp;
+    requires cloud.piranha.single;
     requires java.logging;
 }