diff --git a/L2J_Mobius_1.0_Ertheia/.classpath b/L2J_Mobius_1.0_Ertheia/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_1.0_Ertheia/.classpath +++ b/L2J_Mobius_1.0_Ertheia/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/java.cfg b/L2J_Mobius_1.0_Ertheia/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/java.cfg +++ b/L2J_Mobius_1.0_Ertheia/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_1.0_Ertheia/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_1.0_Ertheia/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_1.0_Ertheia/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_1.0_Ertheia/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_1.0_Ertheia/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_1.0_Ertheia/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_1.0_Ertheia/launcher/Gameserver.launch b/L2J_Mobius_1.0_Ertheia/launcher/Gameserver.launch index dbb884100d..cf049f9f53 100644 --- a/L2J_Mobius_1.0_Ertheia/launcher/Gameserver.launch +++ b/L2J_Mobius_1.0_Ertheia/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/launcher/Loginserver.launch b/L2J_Mobius_1.0_Ertheia/launcher/Loginserver.launch index 9beca20fdf..35eb42eff8 100644 --- a/L2J_Mobius_1.0_Ertheia/launcher/Loginserver.launch +++ b/L2J_Mobius_1.0_Ertheia/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_2.5_Underground/.classpath b/L2J_Mobius_2.5_Underground/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_2.5_Underground/.classpath +++ b/L2J_Mobius_2.5_Underground/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_2.5_Underground/dist/game/java.cfg b/L2J_Mobius_2.5_Underground/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/java.cfg +++ b/L2J_Mobius_2.5_Underground/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_2.5_Underground/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_2.5_Underground/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_2.5_Underground/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_2.5_Underground/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_2.5_Underground/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_2.5_Underground/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_2.5_Underground/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_2.5_Underground/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_2.5_Underground/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_2.5_Underground/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_2.5_Underground/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_2.5_Underground/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_2.5_Underground/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_2.5_Underground/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_2.5_Underground/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_2.5_Underground/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_2.5_Underground/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_2.5_Underground/launcher/Gameserver.launch b/L2J_Mobius_2.5_Underground/launcher/Gameserver.launch index 34000a59ef..dc84cde963 100644 --- a/L2J_Mobius_2.5_Underground/launcher/Gameserver.launch +++ b/L2J_Mobius_2.5_Underground/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_2.5_Underground/launcher/Loginserver.launch b/L2J_Mobius_2.5_Underground/launcher/Loginserver.launch index b0e99b62cd..7c81923383 100644 --- a/L2J_Mobius_2.5_Underground/launcher/Loginserver.launch +++ b/L2J_Mobius_2.5_Underground/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_3.0_Helios/.classpath b/L2J_Mobius_3.0_Helios/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_3.0_Helios/.classpath +++ b/L2J_Mobius_3.0_Helios/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_3.0_Helios/dist/game/java.cfg b/L2J_Mobius_3.0_Helios/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/java.cfg +++ b/L2J_Mobius_3.0_Helios/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_3.0_Helios/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_3.0_Helios/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_3.0_Helios/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_3.0_Helios/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_3.0_Helios/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_3.0_Helios/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_3.0_Helios/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_3.0_Helios/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_3.0_Helios/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_3.0_Helios/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_3.0_Helios/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_3.0_Helios/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_3.0_Helios/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_3.0_Helios/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_3.0_Helios/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_3.0_Helios/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_3.0_Helios/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_3.0_Helios/launcher/Gameserver.launch b/L2J_Mobius_3.0_Helios/launcher/Gameserver.launch index c0ebe50183..7af9d209e8 100644 --- a/L2J_Mobius_3.0_Helios/launcher/Gameserver.launch +++ b/L2J_Mobius_3.0_Helios/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_3.0_Helios/launcher/Loginserver.launch b/L2J_Mobius_3.0_Helios/launcher/Loginserver.launch index 282ed96059..b003f3bc2f 100644 --- a/L2J_Mobius_3.0_Helios/launcher/Loginserver.launch +++ b/L2J_Mobius_3.0_Helios/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_4.0_GrandCrusade/.classpath b/L2J_Mobius_4.0_GrandCrusade/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_4.0_GrandCrusade/.classpath +++ b/L2J_Mobius_4.0_GrandCrusade/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/java.cfg b/L2J_Mobius_4.0_GrandCrusade/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/java.cfg +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_4.0_GrandCrusade/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_4.0_GrandCrusade/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_4.0_GrandCrusade/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_4.0_GrandCrusade/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_4.0_GrandCrusade/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_4.0_GrandCrusade/launcher/Gameserver.launch b/L2J_Mobius_4.0_GrandCrusade/launcher/Gameserver.launch index 4db443c1eb..249fe76e76 100644 --- a/L2J_Mobius_4.0_GrandCrusade/launcher/Gameserver.launch +++ b/L2J_Mobius_4.0_GrandCrusade/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_4.0_GrandCrusade/launcher/Loginserver.launch b/L2J_Mobius_4.0_GrandCrusade/launcher/Loginserver.launch index a4e8c6a02d..408ec0367c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/launcher/Loginserver.launch +++ b/L2J_Mobius_4.0_GrandCrusade/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_5.0_Salvation/.classpath b/L2J_Mobius_5.0_Salvation/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_5.0_Salvation/.classpath +++ b/L2J_Mobius_5.0_Salvation/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_5.0_Salvation/dist/game/java.cfg b/L2J_Mobius_5.0_Salvation/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/java.cfg +++ b/L2J_Mobius_5.0_Salvation/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_5.0_Salvation/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_5.0_Salvation/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_5.0_Salvation/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_5.0_Salvation/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_5.0_Salvation/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_5.0_Salvation/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_5.0_Salvation/launcher/Gameserver.launch b/L2J_Mobius_5.0_Salvation/launcher/Gameserver.launch index 17191839ad..2173bd9366 100644 --- a/L2J_Mobius_5.0_Salvation/launcher/Gameserver.launch +++ b/L2J_Mobius_5.0_Salvation/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_5.0_Salvation/launcher/Loginserver.launch b/L2J_Mobius_5.0_Salvation/launcher/Loginserver.launch index e08eb938b1..bd5c443681 100644 --- a/L2J_Mobius_5.0_Salvation/launcher/Loginserver.launch +++ b/L2J_Mobius_5.0_Salvation/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_5.5_EtinasFate/.classpath b/L2J_Mobius_5.5_EtinasFate/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_5.5_EtinasFate/.classpath +++ b/L2J_Mobius_5.5_EtinasFate/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/java.cfg b/L2J_Mobius_5.5_EtinasFate/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/java.cfg +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_5.5_EtinasFate/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_5.5_EtinasFate/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_5.5_EtinasFate/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_5.5_EtinasFate/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_5.5_EtinasFate/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_5.5_EtinasFate/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_5.5_EtinasFate/launcher/Gameserver.launch b/L2J_Mobius_5.5_EtinasFate/launcher/Gameserver.launch index 916e58b8f7..34848b87a7 100644 --- a/L2J_Mobius_5.5_EtinasFate/launcher/Gameserver.launch +++ b/L2J_Mobius_5.5_EtinasFate/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_5.5_EtinasFate/launcher/Loginserver.launch b/L2J_Mobius_5.5_EtinasFate/launcher/Loginserver.launch index cd720fcf07..d0ccedbf72 100644 --- a/L2J_Mobius_5.5_EtinasFate/launcher/Loginserver.launch +++ b/L2J_Mobius_5.5_EtinasFate/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_6.0_Fafurion/.classpath b/L2J_Mobius_6.0_Fafurion/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_6.0_Fafurion/.classpath +++ b/L2J_Mobius_6.0_Fafurion/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/java.cfg b/L2J_Mobius_6.0_Fafurion/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/java.cfg +++ b/L2J_Mobius_6.0_Fafurion/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_6.0_Fafurion/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_6.0_Fafurion/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_6.0_Fafurion/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_6.0_Fafurion/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_6.0_Fafurion/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_6.0_Fafurion/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_6.0_Fafurion/launcher/Gameserver.launch b/L2J_Mobius_6.0_Fafurion/launcher/Gameserver.launch index a255718852..6b56a4b41d 100644 --- a/L2J_Mobius_6.0_Fafurion/launcher/Gameserver.launch +++ b/L2J_Mobius_6.0_Fafurion/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_6.0_Fafurion/launcher/Loginserver.launch b/L2J_Mobius_6.0_Fafurion/launcher/Loginserver.launch index c4a3d15cb4..3d677490ee 100644 --- a/L2J_Mobius_6.0_Fafurion/launcher/Loginserver.launch +++ b/L2J_Mobius_6.0_Fafurion/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_7.0_PreludeOfWar/.classpath b/L2J_Mobius_7.0_PreludeOfWar/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/.classpath +++ b/L2J_Mobius_7.0_PreludeOfWar/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/java.cfg b/L2J_Mobius_7.0_PreludeOfWar/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/java.cfg +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_7.0_PreludeOfWar/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_7.0_PreludeOfWar/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_7.0_PreludeOfWar/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/launcher/Gameserver.launch b/L2J_Mobius_7.0_PreludeOfWar/launcher/Gameserver.launch index a53c7ab8c0..2a01153e7f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/launcher/Gameserver.launch +++ b/L2J_Mobius_7.0_PreludeOfWar/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_7.0_PreludeOfWar/launcher/Loginserver.launch b/L2J_Mobius_7.0_PreludeOfWar/launcher/Loginserver.launch index 173f95daf0..1e93e188ec 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/launcher/Loginserver.launch +++ b/L2J_Mobius_7.0_PreludeOfWar/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/.classpath b/L2J_Mobius_C4_ScionsOfDestiny/.classpath index 7776d4ad45..ecdc32b3b1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/.classpath +++ b/L2J_Mobius_C4_ScionsOfDestiny/.classpath @@ -5,10 +5,7 @@ - - - diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/java.cfg b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/java.cfg +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_C4_ScionsOfDestiny/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/launcher/Gameserver.launch b/L2J_Mobius_C4_ScionsOfDestiny/launcher/Gameserver.launch index c819da0ef9..f8d298de91 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/launcher/Gameserver.launch +++ b/L2J_Mobius_C4_ScionsOfDestiny/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/launcher/Loginserver.launch b/L2J_Mobius_C4_ScionsOfDestiny/launcher/Loginserver.launch index d46a131560..ca1d388fc5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/launcher/Loginserver.launch +++ b/L2J_Mobius_C4_ScionsOfDestiny/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_C6_Interlude/.classpath b/L2J_Mobius_C6_Interlude/.classpath index 7776d4ad45..ecdc32b3b1 100644 --- a/L2J_Mobius_C6_Interlude/.classpath +++ b/L2J_Mobius_C6_Interlude/.classpath @@ -5,10 +5,7 @@ - - - diff --git a/L2J_Mobius_C6_Interlude/dist/game/java.cfg b/L2J_Mobius_C6_Interlude/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/java.cfg +++ b/L2J_Mobius_C6_Interlude/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_C6_Interlude/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_C6_Interlude/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_C6_Interlude/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_C6_Interlude/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_C6_Interlude/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_C6_Interlude/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_C6_Interlude/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_C6_Interlude/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_C6_Interlude/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_C6_Interlude/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_C6_Interlude/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_C6_Interlude/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_C6_Interlude/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_C6_Interlude/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_C6_Interlude/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_C6_Interlude/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_C6_Interlude/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_C6_Interlude/launcher/Gameserver.launch b/L2J_Mobius_C6_Interlude/launcher/Gameserver.launch index a60e087d33..5a313cf8ca 100644 --- a/L2J_Mobius_C6_Interlude/launcher/Gameserver.launch +++ b/L2J_Mobius_C6_Interlude/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_C6_Interlude/launcher/Loginserver.launch b/L2J_Mobius_C6_Interlude/launcher/Loginserver.launch index 7e82d858a4..15f0683269 100644 --- a/L2J_Mobius_C6_Interlude/launcher/Loginserver.launch +++ b/L2J_Mobius_C6_Interlude/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.4_Epilogue/.classpath b/L2J_Mobius_CT_2.4_Epilogue/.classpath index 568d19f654..ab15c399eb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/.classpath +++ b/L2J_Mobius_CT_2.4_Epilogue/.classpath @@ -5,11 +5,8 @@ - - - diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/java.cfg b/L2J_Mobius_CT_2.4_Epilogue/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/java.cfg +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_CT_2.4_Epilogue/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_CT_2.4_Epilogue/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_CT_2.4_Epilogue/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/launcher/Gameserver.launch b/L2J_Mobius_CT_2.4_Epilogue/launcher/Gameserver.launch index bf167ad8f5..48dea78af7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/launcher/Gameserver.launch +++ b/L2J_Mobius_CT_2.4_Epilogue/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.4_Epilogue/launcher/Loginserver.launch b/L2J_Mobius_CT_2.4_Epilogue/launcher/Loginserver.launch index 985f0c94ed..916fd003a5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/launcher/Loginserver.launch +++ b/L2J_Mobius_CT_2.4_Epilogue/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/.classpath b/L2J_Mobius_CT_2.6_HighFive/.classpath index 568d19f654..ab15c399eb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/.classpath +++ b/L2J_Mobius_CT_2.6_HighFive/.classpath @@ -5,11 +5,8 @@ - - - diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/java.cfg b/L2J_Mobius_CT_2.6_HighFive/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/java.cfg +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_CT_2.6_HighFive/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_CT_2.6_HighFive/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_CT_2.6_HighFive/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_CT_2.6_HighFive/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_CT_2.6_HighFive/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_CT_2.6_HighFive/launcher/Gameserver.launch b/L2J_Mobius_CT_2.6_HighFive/launcher/Gameserver.launch index 295246121d..661774028f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/launcher/Gameserver.launch +++ b/L2J_Mobius_CT_2.6_HighFive/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/launcher/Loginserver.launch b/L2J_Mobius_CT_2.6_HighFive/launcher/Loginserver.launch index 1336efef12..e2a1691800 100644 --- a/L2J_Mobius_CT_2.6_HighFive/launcher/Loginserver.launch +++ b/L2J_Mobius_CT_2.6_HighFive/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/.classpath b/L2J_Mobius_Classic_2.0_Saviors/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/.classpath +++ b/L2J_Mobius_Classic_2.0_Saviors/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/java.cfg b/L2J_Mobius_Classic_2.0_Saviors/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/java.cfg +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_Classic_2.0_Saviors/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_Classic_2.0_Saviors/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_Classic_2.0_Saviors/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/launcher/Gameserver.launch b/L2J_Mobius_Classic_2.0_Saviors/launcher/Gameserver.launch index ff34f400f1..776c29afc4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/launcher/Gameserver.launch +++ b/L2J_Mobius_Classic_2.0_Saviors/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/launcher/Loginserver.launch b/L2J_Mobius_Classic_2.0_Saviors/launcher/Loginserver.launch index 7e9c253210..00b3c17e8a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_2.0_Saviors/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.1_Zaken/.classpath b/L2J_Mobius_Classic_2.1_Zaken/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/.classpath +++ b/L2J_Mobius_Classic_2.1_Zaken/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/java.cfg b/L2J_Mobius_Classic_2.1_Zaken/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/java.cfg +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_Classic_2.1_Zaken/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_Classic_2.1_Zaken/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_Classic_2.1_Zaken/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/launcher/Gameserver.launch b/L2J_Mobius_Classic_2.1_Zaken/launcher/Gameserver.launch index 423559ab4f..d44731bd9d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/launcher/Gameserver.launch +++ b/L2J_Mobius_Classic_2.1_Zaken/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.1_Zaken/launcher/Loginserver.launch b/L2J_Mobius_Classic_2.1_Zaken/launcher/Loginserver.launch index 2a649a4951..37ecb8aead 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_2.1_Zaken/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.2_Antharas/.classpath b/L2J_Mobius_Classic_2.2_Antharas/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/.classpath +++ b/L2J_Mobius_Classic_2.2_Antharas/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/java.cfg b/L2J_Mobius_Classic_2.2_Antharas/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/java.cfg +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_Classic_2.2_Antharas/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_Classic_2.2_Antharas/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_Classic_2.2_Antharas/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/launcher/Gameserver.launch b/L2J_Mobius_Classic_2.2_Antharas/launcher/Gameserver.launch index 9a4b2b55d5..e72d7b26e2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/launcher/Gameserver.launch +++ b/L2J_Mobius_Classic_2.2_Antharas/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.2_Antharas/launcher/Loginserver.launch b/L2J_Mobius_Classic_2.2_Antharas/launcher/Loginserver.launch index 6cbc3867d9..81ef6a35c0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_2.2_Antharas/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/.classpath b/L2J_Mobius_Classic_2.3_SevenSigns/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/.classpath +++ b/L2J_Mobius_Classic_2.3_SevenSigns/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/java.cfg b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/java.cfg +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_Classic_2.3_SevenSigns/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/launcher/Gameserver.launch b/L2J_Mobius_Classic_2.3_SevenSigns/launcher/Gameserver.launch index 303f1db6fb..dd4bbeb380 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/launcher/Gameserver.launch +++ b/L2J_Mobius_Classic_2.3_SevenSigns/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/launcher/Loginserver.launch b/L2J_Mobius_Classic_2.3_SevenSigns/launcher/Loginserver.launch index 5aa3dcce38..400afa7b96 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_2.3_SevenSigns/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/.classpath b/L2J_Mobius_Classic_2.4_SecretOfEmpire/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/.classpath +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/java.cfg b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/java.cfg +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/launcher/Gameserver.launch b/L2J_Mobius_Classic_2.4_SecretOfEmpire/launcher/Gameserver.launch index fc47af92f7..927f10410e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/launcher/Gameserver.launch +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/launcher/Loginserver.launch b/L2J_Mobius_Classic_2.4_SecretOfEmpire/launcher/Loginserver.launch index d06ce7ac74..a55d7f6028 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/.classpath b/L2J_Mobius_Classic_3.0_TheKamael/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/.classpath +++ b/L2J_Mobius_Classic_3.0_TheKamael/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/java.cfg b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/java.cfg +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_Classic_3.0_TheKamael/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/launcher/Gameserver.launch b/L2J_Mobius_Classic_3.0_TheKamael/launcher/Gameserver.launch index 83c2beffcf..6b7541b264 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/launcher/Gameserver.launch +++ b/L2J_Mobius_Classic_3.0_TheKamael/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/launcher/Loginserver.launch b/L2J_Mobius_Classic_3.0_TheKamael/launcher/Loginserver.launch index 45a9dd692c..aff6853c62 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_3.0_TheKamael/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_Interlude/.classpath b/L2J_Mobius_Classic_Interlude/.classpath index 96404c8fee..d82587c107 100644 --- a/L2J_Mobius_Classic_Interlude/.classpath +++ b/L2J_Mobius_Classic_Interlude/.classpath @@ -7,11 +7,8 @@ - - - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/java.cfg b/L2J_Mobius_Classic_Interlude/dist/game/java.cfg index 5feba5150d..e7317574b3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/java.cfg +++ b/L2J_Mobius_Classic_Interlude/dist/game/java.cfg @@ -1 +1 @@ --server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xmx4g -Xms2g \ No newline at end of file +-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Xmx4g -Xms2g \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/dist/libs/HikariCP-3.4.5-sources.jar b/L2J_Mobius_Classic_Interlude/dist/libs/HikariCP-3.4.5-sources.jar deleted file mode 100644 index ea4b7b6a4a..0000000000 Binary files a/L2J_Mobius_Classic_Interlude/dist/libs/HikariCP-3.4.5-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_Interlude/dist/libs/HikariCP-3.4.5.jar b/L2J_Mobius_Classic_Interlude/dist/libs/HikariCP-3.4.5.jar deleted file mode 100644 index 95247be0c4..0000000000 Binary files a/L2J_Mobius_Classic_Interlude/dist/libs/HikariCP-3.4.5.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-api-1.7.30-sources.jar b/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-api-1.7.30-sources.jar deleted file mode 100644 index a282ebb47a..0000000000 Binary files a/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-api-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-api-1.7.30.jar b/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-simple-1.7.30-sources.jar b/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-simple-1.7.30-sources.jar deleted file mode 100644 index 74e77ba026..0000000000 Binary files a/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-simple-1.7.30-sources.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-simple-1.7.30.jar b/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-simple-1.7.30.jar deleted file mode 100644 index 6debaa9dec..0000000000 Binary files a/L2J_Mobius_Classic_Interlude/dist/libs/slf4j-simple-1.7.30.jar and /dev/null differ diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java index 48ab735514..87967f922c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/database/DatabaseFactory.java @@ -19,33 +19,26 @@ package org.l2jmobius.commons.database; import java.sql.Connection; import java.util.logging.Logger; -import com.zaxxer.hikari.HikariDataSource; +import org.mariadb.jdbc.MariaDbPoolDataSource; import org.l2jmobius.Config; /** * @author Mobius + * @version November 10th 2018 */ public class DatabaseFactory { private static final Logger LOGGER = Logger.getLogger(DatabaseFactory.class.getName()); - private static final HikariDataSource _hds = new HikariDataSource(); + private static final MariaDbPoolDataSource DATABASE_POOL = new MariaDbPoolDataSource(Config.DATABASE_URL + "&user=" + Config.DATABASE_LOGIN + "&password=" + Config.DATABASE_PASSWORD + "&minPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxPoolSize=" + Config.DATABASE_MAX_CONNECTIONS + "&maxIdleTime=60"); public static void init() { - _hds.setDriverClassName(Config.DATABASE_DRIVER); - _hds.setJdbcUrl(Config.DATABASE_URL); - _hds.setUsername(Config.DATABASE_LOGIN); - _hds.setPassword(Config.DATABASE_PASSWORD); - _hds.setMaximumPoolSize(Config.DATABASE_MAX_CONNECTIONS); - _hds.setConnectionTimeout(600000); - _hds.setMaxLifetime(1200000); - // Test if connection is valid. try { - _hds.getConnection().close(); + DATABASE_POOL.getConnection().close(); LOGGER.info("Database: Initialized."); } catch (Exception e) @@ -61,7 +54,7 @@ public class DatabaseFactory { try { - con = _hds.getConnection(); + con = DATABASE_POOL.getConnection(); } catch (Exception e) { @@ -75,7 +68,7 @@ public class DatabaseFactory { try { - _hds.close(); + DATABASE_POOL.close(); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_Interlude/launcher/Gameserver.launch b/L2J_Mobius_Classic_Interlude/launcher/Gameserver.launch index 865b372457..3c14f66828 100644 --- a/L2J_Mobius_Classic_Interlude/launcher/Gameserver.launch +++ b/L2J_Mobius_Classic_Interlude/launcher/Gameserver.launch @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_Interlude/launcher/Loginserver.launch b/L2J_Mobius_Classic_Interlude/launcher/Loginserver.launch index 5ff825189c..ac311e7fcb 100644 --- a/L2J_Mobius_Classic_Interlude/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_Interlude/launcher/Loginserver.launch @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +