From 6bee3a0e1320306f41dcbc92bb1994dac551ac6c Mon Sep 17 00:00:00 2001
From: Lumijiez <danthevip@gmail.com>
Date: Sun, 24 Nov 2024 01:59:00 +0200
Subject: [PATCH] SMTP setup, Docker + fix ports

---
 SymphonyDatabaseNode/Dockerfile               |  2 +-
 SymphonyDatabaseNode/pom.xml                  |  6 --
 SymphonyDiscovery/Dockerfile                  |  2 +-
 SymphonySMTP/Dockerfile                       | 24 ++++++
 SymphonySMTP/pom.xml                          | 77 +++++++++++++++++++
 .../main/java/io/github/lumijiez/Main.java    | 11 +++
 SymphonySMTP/src/main/resources/log4j2.xml    | 18 +++++
 docker-compose.yml                            |  8 ++
 pom.xml                                       |  1 +
 9 files changed, 141 insertions(+), 8 deletions(-)
 create mode 100644 SymphonySMTP/Dockerfile
 create mode 100644 SymphonySMTP/pom.xml
 create mode 100644 SymphonySMTP/src/main/java/io/github/lumijiez/Main.java
 create mode 100644 SymphonySMTP/src/main/resources/log4j2.xml

diff --git a/SymphonyDatabaseNode/Dockerfile b/SymphonyDatabaseNode/Dockerfile
index 5444433..27a55eb 100644
--- a/SymphonyDatabaseNode/Dockerfile
+++ b/SymphonyDatabaseNode/Dockerfile
@@ -19,6 +19,6 @@ WORKDIR /app
 
 COPY --from=build /app/target/SymphonyDatabaseNode-1.0-SNAPSHOT.jar /app/SymphonyDatabaseNode.jar
 
-EXPOSE 8081
+EXPOSE 8100
 
 ENTRYPOINT ["java", "-jar", "SymphonyDatabaseNode.jar"]
diff --git a/SymphonyDatabaseNode/pom.xml b/SymphonyDatabaseNode/pom.xml
index ddeb1e4..0fe6c02 100644
--- a/SymphonyDatabaseNode/pom.xml
+++ b/SymphonyDatabaseNode/pom.xml
@@ -50,12 +50,6 @@
             <artifactId>log4j-core</artifactId>
             <version>2.24.2</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-layout-template-json</artifactId>
-            <version>2.24.2</version>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/SymphonyDiscovery/Dockerfile b/SymphonyDiscovery/Dockerfile
index 81ae3a6..abe6a7f 100644
--- a/SymphonyDiscovery/Dockerfile
+++ b/SymphonyDiscovery/Dockerfile
@@ -19,6 +19,6 @@ WORKDIR /app
 
 COPY --from=build /app/target/SymphonyDiscovery-1.0-SNAPSHOT.jar /app/SymphonyDiscovery.jar
 
-EXPOSE 8081
+EXPOSE 8083
 
 ENTRYPOINT ["java", "-jar", "SymphonyDiscovery.jar"]
diff --git a/SymphonySMTP/Dockerfile b/SymphonySMTP/Dockerfile
new file mode 100644
index 0000000..6c44804
--- /dev/null
+++ b/SymphonySMTP/Dockerfile
@@ -0,0 +1,24 @@
+FROM ubuntu:latest
+LABEL authors="lumijiez"
+
+FROM maven:3.9.9-eclipse-temurin-21 AS build
+
+WORKDIR /app
+
+COPY pom.xml .
+
+RUN mvn dependency:go-offline
+
+COPY src /app/src
+
+RUN mvn clean package -DskipTests
+
+FROM openjdk:21
+
+WORKDIR /app
+
+COPY --from=build /app/target/SymphonySMTP-1.0-SNAPSHOT.jar /app/SymphonySMTP.jar
+
+EXPOSE 8090
+
+ENTRYPOINT ["java", "-jar", "SymphonySMTP.jar"]
diff --git a/SymphonySMTP/pom.xml b/SymphonySMTP/pom.xml
new file mode 100644
index 0000000..3bbe2b1
--- /dev/null
+++ b/SymphonySMTP/pom.xml
@@ -0,0 +1,77 @@
+<?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>
+    <groupId>io.github.lumijiez</groupId>
+    <artifactId>SymphonySMTP</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.32</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.24.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.24.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Main-Class>io.github.lumijiez.Main</Main-Class>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/SymphonySMTP/src/main/java/io/github/lumijiez/Main.java b/SymphonySMTP/src/main/java/io/github/lumijiez/Main.java
new file mode 100644
index 0000000..d5ea387
--- /dev/null
+++ b/SymphonySMTP/src/main/java/io/github/lumijiez/Main.java
@@ -0,0 +1,11 @@
+package io.github.lumijiez;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class Main {
+    public static void main(String[] args) {
+        Logger logger = LogManager.getLogger(Main.class);
+        logger.info("SMTP server started");
+    }
+}
\ No newline at end of file
diff --git a/SymphonySMTP/src/main/resources/log4j2.xml b/SymphonySMTP/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..75ee285
--- /dev/null
+++ b/SymphonySMTP/src/main/resources/log4j2.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout>
+                <Pattern>
+                    %highlight{%d{yyyy-MM-dd HH:mm:ss} %-5level [%t]: %msg}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue}%n
+                </Pattern>
+            </PatternLayout>
+        </Console>
+    </Appenders>
+
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/docker-compose.yml b/docker-compose.yml
index 245b92b..39fdcc4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,6 +35,14 @@ services:
     depends_on:
       - postgres_db
 
+  symphony-smtp:
+    container_name: smtp
+    build:
+      context: ./SymphonySMTP
+      dockerfile: Dockerfile
+    ports:
+      - "8090:8090"
+
   symphony-dbnode1:
     container_name: node1
     build:
diff --git a/pom.xml b/pom.xml
index 52a2fac..e6db36a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
         <module>SymphonyProducer</module>
         <module>SymphonyDiscovery</module>
         <module>SymphonyDatabaseNode</module>
+        <module>SymphonySMTP</module>
     </modules>
 
     <dependencies>