Integrate configuration into a single module, mve to portal-core

bom/pom.xml

@@ -13,19 +13,6 @@
     <description>BOM for the portal-core-modules</description>
     <dependencyManagement>
         <dependencies>
-            <!-- Configuration-->
-            <dependency>
-                <groupId>de.cuioss.portal.configuration</groupId>
-                <artifactId>portal-configuration-api</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>de.cuioss.portal.configuration</groupId>
-                <artifactId>portal-configuration-impl</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <!-- Authentication-->
             <dependency>
                 <groupId>de.cuioss.portal.authentication</groupId>
@@ -51,6 +38,13 @@
                 <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
+            <!-- Configuration-->
+            <dependency>
+                <groupId>de.cuioss.portal.core</groupId>
+                <artifactId>portal-configuration</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
             <!-- Portal-Common-->
             <dependency>
                 <groupId>de.cuioss.portal.core</groupId>

modules/authentication/pom.xml

@@ -50,11 +50,7 @@
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>de.cuioss.portal.configuration</groupId>
-            <artifactId>portal-configuration-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-junit5</artifactId>

modules/authentication/portal-authentication-api/pom.xml

@@ -1,28 +1,33 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>de.cuioss.portal.authentication</groupId>
-    <artifactId>authentication</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>portal-authentication-api</artifactId>
-  <name>Portal Authentication API</name>
-  <description>Api for the different way of authentication within the portal</description>
-  <properties>
-    <maven.jar.plugin.automatic.module.name>
-      de.cuioss.portal.authentication.api</maven.jar.plugin.automatic.module.name>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>jakarta.inject</groupId>
-      <artifactId>jakarta.inject-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-    </dependency>
-  </dependencies>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>de.cuioss.portal.authentication</groupId>
+        <artifactId>authentication</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>portal-authentication-api</artifactId>
+    <name>Portal Authentication API</name>
+    <description>Api for the different way of authentication within the portal</description>
+    <properties>
+        <maven.jar.plugin.automatic.module.name>
+            de.cuioss.portal.authentication.api
+        </maven.jar.plugin.automatic.module.name>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss.portal.core</groupId>
+            <artifactId>portal-common-cdi</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>

modules/core/pom.xml

@@ -13,6 +13,7 @@
     <description>Groups all core modules of the portal</description>
     <name>Portal Core Modules</name>
     <modules>
+        <module>portal-configuration</module>
         <module>portal-core</module>
         <module>portal-common-cdi</module>
     </modules>

modules/core/portal-configuration/README.adoc

@@ -0,0 +1,25 @@
+= portal-configuration
+
+== What is it?
+Provides some portal-specific extensions to microprofile-config. In addition it provides some default configuration.
+
+== Maven Coordinates
+
+[source, xml]
+----
+    <dependency>
+        <groupId>de.cuioss.portal.core</groupId>
+        <artifactId>portal-configuration</artifactId>
+    </dependency>
+----
+
+== Core Types and Concepts
+* link:src/main/java/de/cuioss/portal/configuration/types/[Additional configuration-types]
+* link:src/main/java/de/cuioss/portal/configuration/util/ConfigurationHelper.java[Simplifies the programmatic lookup up configuration-properties]
+
+Constant Key classes for:
+
+* link:src/main/java/de/cuioss/portal/configuration/PortalConfigurationKeys.java[Portal-Configuration-Core]
+* link:src/main/java/de/cuioss/portal/configuration/HealthCheckConfigKeys.java[Health-Check]
+* link:src/main/java/de/cuioss/portal/configuration/MetricsConfigKeys.java[Metrics]
+* link:src/main/java/de/cuioss/portal/configuration/TracingConfigKeys.java[Tracing]

modules/configuration/pom.xml → modules/core/portal-configuration/pom.xml

@@ -3,15 +3,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>de.cuioss.portal</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>de.cuioss.portal.core</groupId>
+        <artifactId>core</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-    <groupId>de.cuioss.portal.configuration</groupId>
-    <artifactId>configuration</artifactId>
-    <packaging>pom</packaging>
-    <name>Portal Modules for configuration</name>
-    <description>Groups all configuration modules of the portal</description>
+    <properties>
+        <maven.jar.plugin.automatic.module.name>
+            de.cuioss.portal.configuration
+        </maven.jar.plugin.automatic.module.name>
+    </properties>
+    <artifactId>portal-configuration</artifactId>
+    <name>Portal Configuration</name>
+    <description>Extensions to the micro-profile configuration</description>
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -29,7 +32,27 @@
             <groupId>org.eclipse.microprofile.config</groupId>
             <artifactId>microprofile-config-api</artifactId>
         </dependency>
-        <!-- Unit testing -->
+        <dependency>
+            <groupId>de.cuioss</groupId>
+            <artifactId>cui-core-ui-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss.portal.core</groupId>
+            <artifactId>portal-common-cdi</artifactId>
+        </dependency>
+        <!-- Test-->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -51,9 +74,18 @@
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-junit5</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
-    <modules>
-        <module>portal-configuration-api</module>
-        <module>portal-configuration-impl</module>
-    </modules>
 </project>