Webmaster
/
web_shared
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TITLE

Browse Source 
Ticket:#
US:[US-ID]
Beschreibung:
master
VogelT 1 month ago
parent 05b4611bd1
commit 6e1c294ed7
3 changed files with 80 additions and 27 deletions
Show Stats Download Patch File Download Diff File

96
pom.xml
Unescape View File

@ -41,10 +41,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core-jakarta</artifactId>
@ -55,6 +52,13 @@
<artifactId>jakarta.persistence-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
@ -68,22 +72,19 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>
jakarta.xml.bind-api</artifactId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>
jakarta.jakartaee-api</artifactId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>9.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclnt</groupId>
<artifactId>eclntjsfserverRISC_jakarta</artifactId>
<version>
${cc.version}</version>
<version>${cc.version}</version>
<exclusions>
<exclusion>
<artifactId>xml-apis</artifactId>
@ -146,29 +147,21 @@
<artifactId>xmlbeans</artifactId>
<version>5.3.0</version>
</dependency>
<dependency>
<groupId>
org.apache.httpcomponents.client5</groupId>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>
5.2.1</version>
<version>5.2.1</version>
</dependency>
<dependency>
<groupId>
com.sun.mail</groupId>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
@ -184,9 +177,6 @@
<artifactId>microsoft-graph</artifactId>
<version>5.69.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@ -195,7 +185,7 @@
</dependencies>
<build>
<build>
<finalName>${project.artifactId}</finalName>
<resources>
<resource>
@ -208,6 +198,7 @@
<include>**/*.icc</include>
<include>**/*.pdf</include>
<include>**/*.adoc</include>
<include>**/*.css</include>
</includes>
</resource>
<resource>
@ -228,6 +219,63 @@
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>jarinstall</id>
<phase>install</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<generatePom>false</generatePom>
<classifier>classes</classifier>
<file>target/${project.artifactId}.jar</file>
<packaging>jar</packaging>
</configuration>
</execution>
</executions>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
<generatePom>false</generatePom>
<override>true</override>
<file>target\${project.artifactId}-classes.jar</file>
</configuration>
<executions>
<execution>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
<generatePom>false</generatePom>
<override>true</override>
<file>target\${project.artifactId}-classes.jar</file>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>

8
src/main/java/de/tvo/database/DBHandler.java
Unescape View File

@ -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;

1
src/main/resources/.gitignore vendored
Unescape View File

@ -0,0 +1 @@
/rebel.xml
Write Preview
Loading…
Cancel
Save