From 6e1c294ed7e8f4d372e6e5bd60bb93aca900c712 Mon Sep 17 00:00:00 2001 From: VogelT Date: Fri, 20 Mar 2026 13:21:58 +0100 Subject: [PATCH] TITLE Ticket:# US:[US-ID] Beschreibung: --- pom.xml | 98 +++++++++++++++----- src/main/java/de/tvo/database/DBHandler.java | 8 +- src/main/resources/.gitignore | 1 + 3 files changed, 80 insertions(+), 27 deletions(-) create mode 100644 src/main/resources/.gitignore diff --git a/pom.xml b/pom.xml index 190170c..60ebc43 100644 --- a/pom.xml +++ b/pom.xml @@ -40,11 +40,8 @@ 20260204 UTF-8 - - - + - org.hibernate hibernate-core-jakarta @@ -55,6 +52,13 @@ jakarta.persistence-api 3.0.0 + + javax.transaction + javax.transaction-api + 1.3 + + + com.zaxxer HikariCP @@ -68,22 +72,19 @@ jakarta.xml.bind - - jakarta.xml.bind-api + jakarta.xml.bind-api 3.0.0 jakarta.platform - - jakarta.jakartaee-api + jakarta.jakartaee-api 9.1.0 provided org.eclnt eclntjsfserverRISC_jakarta - - ${cc.version} + ${cc.version} xml-apis @@ -146,29 +147,21 @@ xmlbeans 5.3.0 - - - - org.apache.httpcomponents.client5 + org.apache.httpcomponents.client5 httpclient5 - - 5.2.1 + 5.2.1 - - com.sun.mail + com.sun.mail jakarta.mail 2.0.1 - - dnsjava dnsjava 3.5.2 - org.mariadb.jdbc mariadb-java-client @@ -184,9 +177,6 @@ microsoft-graph 5.69.0 - - - commons-codec commons-codec @@ -195,7 +185,7 @@ - + ${project.artifactId} @@ -208,6 +198,7 @@ **/*.icc **/*.pdf **/*.adoc + **/*.css @@ -228,6 +219,63 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + jarinstall + install + + jar + + + ${project.groupId} + ${project.artifactId} + ${project.version} + false + classes + target/${project.artifactId}.jar + jar + + + + + true + + + + org.apache.maven.plugins + maven-install-plugin + 3.1.1 + + ${project.groupId} + ${project.artifactId} + ${project.version} + jar + false + true + target\${project.artifactId}-classes.jar + + + + install + + install-file + + + ${project.groupId} + ${project.artifactId} + ${project.version} + jar + false + true + target\${project.artifactId}-classes.jar + + + + org.apache.maven.plugins maven-deploy-plugin diff --git a/src/main/java/de/tvo/database/DBHandler.java b/src/main/java/de/tvo/database/DBHandler.java index 9588a7a..52be08e 100644 --- a/src/main/java/de/tvo/database/DBHandler.java +++ b/src/main/java/de/tvo/database/DBHandler.java @@ -48,7 +48,11 @@ public class DBHandler { static { for (SchemataENUM sEnum : SchemataENUM.values()) { try { - SESSIONPOOLMAP.put(sEnum, new Configuration().configure("META-INF/" + sEnum.name() + ".cfg.xml").buildSessionFactory()); + Configuration configuration = new Configuration().configure("META-INF2/" + sEnum.name() + ".cfg.xml"); + + System.out.println(configuration.getProperties()); + + SESSIONPOOLMAP.put(sEnum, configuration.buildSessionFactory()); } catch (Throwable e) { try { @@ -720,7 +724,7 @@ public class DBHandler { public Connection getConnection() { try { Connection con = ((DataSource) new InitialContext().lookup(DBTools.getJNDIConnectionString(SCHEMA))).getConnection(); - if (!SCHEMA.equals(SchemataENUM.MARIADBNL)) { + if (SCHEMA.equals(SchemataENUM.MARIADBNL)) { con.setSchema(SCHEMA.name()); } return con; diff --git a/src/main/resources/.gitignore b/src/main/resources/.gitignore new file mode 100644 index 0000000..4658b7a --- /dev/null +++ b/src/main/resources/.gitignore @@ -0,0 +1 @@ +/rebel.xml