diff --git a/MvnDemo/pom.xml b/MvnDemo/pom.xml
index 405bd52..a71a577 100644
--- a/MvnDemo/pom.xml
+++ b/MvnDemo/pom.xml
@@ -66,8 +66,7 @@
-
- de.hs_mannheim.informatik.mvn.Main
+ de.hs_mannheim.informatik.mvn.Main
@@ -120,11 +119,8 @@
-
-
-
+
org.apache.maven.plugins
maven-javadoc-plugin
diff --git a/MvnDemo/src/main/java/de/hs_mannheim/informatik/mvn/Main.java b/MvnDemo/src/main/java/de/hs_mannheim/informatik/mvn/Main.java
index 123b49e..da3f0bf 100644
--- a/MvnDemo/src/main/java/de/hs_mannheim/informatik/mvn/Main.java
+++ b/MvnDemo/src/main/java/de/hs_mannheim/informatik/mvn/Main.java
@@ -1,20 +1,41 @@
package de.hs_mannheim.informatik.mvn;
-import org.apache.logging.log4j.Logger;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class Main {
- private static final Logger LOG = LogManager.getLogger();
+ // Aufruf mit externer Log-Config im gleichen Pfad wie das JAR:
+ // java -Dlog4j.configurationFile=log4j2.xml -jar MvnDemo-0.0.1-SNAPSHOT.jar
+ private static final Logger LOG = LogManager.getLogger(Main.class);
public static void main(String[] args) {
- LOG.info("Hallo Maven, Gitea & Jenkins!?");
+ LOG.info("Hallo Log4J");
+ System.out.println("Hello!");
+ System.out.println(loadText("someText.txt"));
System.out.println(new Main().add(3, 4));
}
public int add(int a, int b) {
LOG.info("a = {}, b = {}", a, b);
-
+
return a + b;
}
+
+ public static String loadText(String filename) {
+ try (InputStream in = Main.class.getClassLoader().getResourceAsStream(filename);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
+
+ return reader.readLine();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
}
diff --git a/MvnDemo/src/main/resources/log4j2.xml b/MvnDemo/src/main/resources/log4j2.xml
index 5d2ccbf..05900aa 100644
--- a/MvnDemo/src/main/resources/log4j2.xml
+++ b/MvnDemo/src/main/resources/log4j2.xml
@@ -1,17 +1,18 @@
-
+
-
-
+
+
+ pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" />
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/MvnDemo/src/main/resources/someText.txt b/MvnDemo/src/main/resources/someText.txt
new file mode 100644
index 0000000..7feb3eb
--- /dev/null
+++ b/MvnDemo/src/main/resources/someText.txt
@@ -0,0 +1 @@
+Hallo Maven!
\ No newline at end of file
diff --git a/MvnDemo/src/test/java/de/hs_mannheim/informatik/mvn/AddTest.java b/MvnDemo/src/test/java/de/hs_mannheim/informatik/mvn/AddTest.java
index 7bba4b1..64ef45d 100644
--- a/MvnDemo/src/test/java/de/hs_mannheim/informatik/mvn/AddTest.java
+++ b/MvnDemo/src/test/java/de/hs_mannheim/informatik/mvn/AddTest.java
@@ -6,8 +6,13 @@ import org.junit.jupiter.api.Test;
class AddTest {
@Test
- void test() {
+ void testAdd() {
assertEquals(7, new Main().add(3, 4));
}
+
+ @Test
+ void testLoader() {
+ assertEquals("Test Text", Main.loadText("test.txt"));
+ }
}
diff --git a/MvnDemo/src/test/resources/test.txt b/MvnDemo/src/test/resources/test.txt
new file mode 100644
index 0000000..fdc551c
--- /dev/null
+++ b/MvnDemo/src/test/resources/test.txt
@@ -0,0 +1 @@
+Test Text
\ No newline at end of file