Fixes #315 - Add UI module (#324)

manorrock · Jul 22, 2024 · 99e0497 · 99e0497
1 parent 7ccafdb
commit 99e0497
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 80 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
         <jakarta.version>10.0.0</jakarta.version>
         <jakarta.enterprise.cdi-api.version>3.0.0</jakarta.enterprise.cdi-api.version>
         <junit.version>4.13.2</junit.version>
-        <piranha.version>23.10.0</piranha.version>
+        <piranha.version>24.7.0</piranha.version>
         <yasson.version>2.0.3</yasson.version>
         <!-- other -->
         <java.version>21</java.version>
@@ -28,7 +28,7 @@
         <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
         <moditect-maven-plugin.version>1.1.0</moditect-maven-plugin.version>
-        <native-image-maven-plugin.version>21.2.0</native-image-maven-plugin.version>
+        <native-image-maven-plugin.version>21.2.0</native-image-maven-plugin.version>        
     </properties>
     <build>
         <pluginManagement>
@@ -44,147 +44,75 @@
                     <version>${maven-dependency-plugin.version}</version>
                 </plugin>
                 <plugin>
-
                     <groupId>org.apache.maven.plugins</groupId>
-
                     <artifactId>maven-jar-plugin</artifactId>
-
                     <version>${maven-jar-plugin.version}</version>
-
                 </plugin>
-
                 <plugin>
-
                     <groupId>org.apache.maven.plugins</groupId>
-
                     <artifactId>maven-resources-plugin</artifactId>
-
                     <version>${maven-resources-plugin.version}</version>
-
                 </plugin>
-
                 <plugin>
-
                     <groupId>org.apache.maven.plugins</groupId>
-
                     <artifactId>maven-surefire-plugin</artifactId>
-
                     <version>${maven-surefire-plugin.version}</version>
-
                 </plugin>
-
                 <plugin>
-
                     <groupId>org.apache.maven.plugins</groupId>
-
                     <artifactId>maven-war-plugin</artifactId>
-
                     <version>${maven-war-plugin.version}</version>
-
                 </plugin>
-
                 <plugin>
-
                     <groupId>org.graalvm.nativeimage</groupId>
-
                     <artifactId>native-image-maven-plugin</artifactId>
-
                     <version>${native-image-maven-plugin.version}</version>
-
                 </plugin>
-
                 <plugin>
-
                     <groupId>org.jacoco</groupId>
-
                     <artifactId>jacoco-maven-plugin</artifactId>
-
                     <version>${jacoco-maven-plugin.version}</version>
-
                 </plugin>
-
                 <plugin>
-
                     <groupId>org.moditect</groupId>
-
                     <artifactId>moditect-maven-plugin</artifactId>
-
                     <version>${moditect-maven-plugin.version}</version>
-
                 </plugin>
-
             </plugins>
-
         </pluginManagement>
-
         <plugins>
-
             <plugin>
-
                 <groupId>org.apache.maven.plugins</groupId>
-
                 <artifactId>maven-compiler-plugin</artifactId>
-
                 <inherited>true</inherited>
-
                 <configuration>
-
                     <release>${java.version}</release>
-
                 </configuration>
-
             </plugin>
-
-            <plugin>
-
-                <groupId>org.apache.maven.plugins</groupId>
-
-                <artifactId>maven-war-plugin</artifactId>
-
-                <inherited>true</inherited>
-
-                <configuration>
-
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-
-                </configuration>
-
-            </plugin>
-
         </plugins>
-
     </build>
-
     <dependencyManagement>
-
         <dependencies>
-
             <dependency>
-
                 <groupId>cloud.piranha.http</groupId>
-
                 <artifactId>piranha-http-impl</artifactId>
-
                 <version>${piranha.version}</version>
-
             </dependency>
-
-
             <dependency>
-
                 <groupId>cloud.piranha.http</groupId>
-
                 <artifactId>piranha-http-webapp</artifactId>
-
                 <version>${piranha.version}</version>
-
             </dependency>
-
             <dependency>
                 <groupId>jakarta.enterprise</groupId>
                 <artifactId>jakarta.enterprise.cdi-api</artifactId>
                 <version>${jakarta.enterprise.cdi-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.platform</groupId>
+                <artifactId>jakarta.jakartaee-web-api</artifactId>
+                <version>${jakarta.version}</version>
+            </dependency>          
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -195,13 +123,15 @@
                 <artifactId>yasson</artifactId>
                 <version>${yasson.version}</version>
             </dependency>
+
         </dependencies>
     </dependencyManagement>
     <modules>
         <module>cli</module>
         <module>desktop</module>
+        <module>docker</module>
         <module>rest</module>
         <module>shared</module>
-        <module>docker</module>
+        <module>ui</module>
     </modules>
 </project>
diff --git a/ui/pom.xml b/ui/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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>
+        <artifactId>project</artifactId>
+        <groupId>com.manorrock.sphynx</groupId>
+        <version>24.5.0-SNAPSHOT</version>
+    </parent>
+    <groupId>com.manorrock.sphynx</groupId>
+    <artifactId>sphynx-ui</artifactId>
+    <packaging>war</packaging>
+    <name>Manorrock Sphynx - UI</name>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-web-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/ui/src/main/webapp/WEB-INF/beans.xml b/ui/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       bean-discovery-mode="all">
+</beans>
diff --git a/ui/src/main/webapp/index.html b/ui/src/main/webapp/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Manorrock Sphynx</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h1>Manorrock Sphynx</h1>
+    </body>
+</html>