From b75a4227d786cc372cde2a46d732ee4a2b1f0f3b Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 9 Sep 2018 13:22:57 +0000 Subject: [PATCH] Use MariaDB JDBC URL for connections. --- L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini | 4 ++-- L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini | 4 ++-- L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java | 4 ++-- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java | 2 +- L2J_Mobius_2.5_Underground/dist/game/config/Server.ini | 4 ++-- L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini | 4 ++-- L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java | 4 ++-- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java | 2 +- L2J_Mobius_3.0_Helios/dist/game/config/Server.ini | 4 ++-- L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini | 4 ++-- L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java | 4 ++-- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java | 2 +- L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini | 4 ++-- L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini | 4 ++-- L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java | 4 ++-- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java | 2 +- .../dist/game/config/network/gameserver.ini | 4 ++-- .../dist/login/config/network/loginserver.ini | 4 ++-- L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java | 4 ++-- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java | 2 +- L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini | 4 ++-- L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini | 4 ++-- L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java | 4 ++-- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java | 2 +- L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini | 4 ++-- .../dist/login/config/LoginServer.ini | 4 ++-- L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java | 4 ++-- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java | 2 +- L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini | 4 ++-- .../dist/login/config/LoginServer.ini | 4 ++-- L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java | 4 ++-- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java | 2 +- L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini | 4 ++-- .../dist/login/config/LoginServer.ini | 4 ++-- .../java/com/l2jmobius/Config.java | 4 ++-- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java | 2 +- 45 files changed, 72 insertions(+), 72 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini index 0cd67e2a62..174436573e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini @@ -41,8 +41,8 @@ GameserverPort = 7777 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini b/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini index ebf4aa0348..5e62ccea48 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini @@ -41,8 +41,8 @@ LoginPort = 9014 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java index acbc662c06..13d83a6dd0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java @@ -1200,7 +1200,7 @@ public final class Config ACCEPT_ALTERNATE_ID = serverSettings.getBoolean("AcceptAlternateID", true); DATABASE_DRIVER = serverSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getString("URL", "jdbc:mysql://localhost/l2jgs"); + DATABASE_URL = serverSettings.getString("URL", "jdbc:mariadb://localhost/l2jgs"); DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); @@ -2809,7 +2809,7 @@ public final class Config LOGIN_SERVER_SCHEDULE_RESTART_TIME = ServerSettings.getLong("LoginRestartTime", 24); DATABASE_DRIVER = ServerSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = ServerSettings.getString("URL", "jdbc:mysql://localhost/l2jls"); + DATABASE_URL = ServerSettings.getString("URL", "jdbc:mariadb://localhost/l2jls"); DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseBackup.java index 97aee034ba..4d08f41445 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -72,7 +72,7 @@ public class DatabaseBackup final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; try { - final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); + final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); process.waitFor(); } catch (Exception e) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java index bc7a004504..8bc19460d2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java @@ -36,7 +36,7 @@ public class MySqlConnect try (Formatter form = new Formatter()) { Class.forName("org.mariadb.jdbc.Driver").getDeclaredConstructor().newInstance(); - final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString(); + final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString(); con = DriverManager.getConnection(formattedText, user, password); try (Statement s = con.createStatement()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini index c756be2e1d..2adf08588e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini +++ b/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini @@ -41,8 +41,8 @@ GameserverPort = 7777 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini b/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini index ebf4aa0348..5e62ccea48 100644 --- a/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini @@ -41,8 +41,8 @@ LoginPort = 9014 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java index b8e5f9ba3a..115c276fe4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java @@ -1207,7 +1207,7 @@ public final class Config ACCEPT_ALTERNATE_ID = serverSettings.getBoolean("AcceptAlternateID", true); DATABASE_DRIVER = serverSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getString("URL", "jdbc:mysql://localhost/l2jgs"); + DATABASE_URL = serverSettings.getString("URL", "jdbc:mariadb://localhost/l2jgs"); DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); @@ -2825,7 +2825,7 @@ public final class Config LOGIN_SERVER_SCHEDULE_RESTART_TIME = ServerSettings.getLong("LoginRestartTime", 24); DATABASE_DRIVER = ServerSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = ServerSettings.getString("URL", "jdbc:mysql://localhost/l2jls"); + DATABASE_URL = ServerSettings.getString("URL", "jdbc:mariadb://localhost/l2jls"); DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseBackup.java index 97aee034ba..4d08f41445 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -72,7 +72,7 @@ public class DatabaseBackup final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; try { - final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); + final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); process.waitFor(); } catch (Exception e) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java index bc7a004504..8bc19460d2 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java @@ -36,7 +36,7 @@ public class MySqlConnect try (Formatter form = new Formatter()) { Class.forName("org.mariadb.jdbc.Driver").getDeclaredConstructor().newInstance(); - final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString(); + final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString(); con = DriverManager.getConnection(formattedText, user, password); try (Statement s = con.createStatement()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini index 33062b66e3..4e0b9b672f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini +++ b/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini @@ -41,8 +41,8 @@ GameserverPort = 7777 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini b/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini index ebf4aa0348..5e62ccea48 100644 --- a/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini @@ -41,8 +41,8 @@ LoginPort = 9014 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java index b1983cc420..d956b059f9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java @@ -1215,7 +1215,7 @@ public final class Config ACCEPT_ALTERNATE_ID = serverSettings.getBoolean("AcceptAlternateID", true); DATABASE_DRIVER = serverSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getString("URL", "jdbc:mysql://localhost/l2jgs"); + DATABASE_URL = serverSettings.getString("URL", "jdbc:mariadb://localhost/l2jgs"); DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); @@ -2840,7 +2840,7 @@ public final class Config LOGIN_SERVER_SCHEDULE_RESTART_TIME = ServerSettings.getLong("LoginRestartTime", 24); DATABASE_DRIVER = ServerSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = ServerSettings.getString("URL", "jdbc:mysql://localhost/l2jls"); + DATABASE_URL = ServerSettings.getString("URL", "jdbc:mariadb://localhost/l2jls"); DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseBackup.java index 97aee034ba..4d08f41445 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -72,7 +72,7 @@ public class DatabaseBackup final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; try { - final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); + final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); process.waitFor(); } catch (Exception e) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java index bc7a004504..8bc19460d2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java @@ -36,7 +36,7 @@ public class MySqlConnect try (Formatter form = new Formatter()) { Class.forName("org.mariadb.jdbc.Driver").getDeclaredConstructor().newInstance(); - final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString(); + final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString(); con = DriverManager.getConnection(formattedText, user, password); try (Statement s = con.createStatement()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini index 98c6e57b9a..31a375212d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini @@ -41,8 +41,8 @@ GameserverPort = 7777 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini index ebf4aa0348..5e62ccea48 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini @@ -41,8 +41,8 @@ LoginPort = 9014 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobius?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java index 9b0112dd1b..0e08e14d49 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java @@ -1208,7 +1208,7 @@ public final class Config ACCEPT_ALTERNATE_ID = serverSettings.getBoolean("AcceptAlternateID", true); DATABASE_DRIVER = serverSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getString("URL", "jdbc:mysql://localhost/l2jgs"); + DATABASE_URL = serverSettings.getString("URL", "jdbc:mariadb://localhost/l2jgs"); DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); @@ -2826,7 +2826,7 @@ public final class Config LOGIN_SERVER_SCHEDULE_RESTART_TIME = ServerSettings.getLong("LoginRestartTime", 24); DATABASE_DRIVER = ServerSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = ServerSettings.getString("URL", "jdbc:mysql://localhost/l2jls"); + DATABASE_URL = ServerSettings.getString("URL", "jdbc:mariadb://localhost/l2jls"); DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseBackup.java index 97aee034ba..4d08f41445 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -72,7 +72,7 @@ public class DatabaseBackup final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; try { - final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); + final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); process.waitFor(); } catch (Exception e) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java index bc7a004504..8bc19460d2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java @@ -36,7 +36,7 @@ public class MySqlConnect try (Formatter form = new Formatter()) { Class.forName("org.mariadb.jdbc.Driver").getDeclaredConstructor().newInstance(); - final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString(); + final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString(); con = DriverManager.getConnection(formattedText, user, password); try (Statement s = con.createStatement()) diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/network/gameserver.ini b/L2J_Mobius_C6_Interlude/dist/game/config/network/gameserver.ini index 3f50954ac2..a81debbdf7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/config/network/gameserver.ini +++ b/L2J_Mobius_C6_Interlude/dist/game/config/network/gameserver.ini @@ -37,8 +37,8 @@ LoginHost = 127.0.0.1 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiusc6?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiusc6?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiusc6?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiusc6?useUnicode=true&characterEncoding=utf-8&useSSL=false # Login - Mysql's user Login = root diff --git a/L2J_Mobius_C6_Interlude/dist/login/config/network/loginserver.ini b/L2J_Mobius_C6_Interlude/dist/login/config/network/loginserver.ini index 1de283959d..7c67b7ec17 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/config/network/loginserver.ini +++ b/L2J_Mobius_C6_Interlude/dist/login/config/network/loginserver.ini @@ -48,8 +48,8 @@ ShowLicence = True Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiusc6?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiusc6?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiusc6?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiusc6?useUnicode=true&characterEncoding=utf-8&useSSL=false # Parameters Databases - MYSQL # Login - Mysql's user diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java index dd7cffbbd0..84075dd44d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java @@ -1369,7 +1369,7 @@ public final class Config GAME_SERVER_LOGIN_HOST = serverSettings.getProperty("LoginHost", "127.0.0.1"); DATABASE_DRIVER = serverSettings.getProperty("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getProperty("URL", "jdbc:mysql://localhost/"); + DATABASE_URL = serverSettings.getProperty("URL", "jdbc:mariadb://localhost/"); DATABASE_LOGIN = serverSettings.getProperty("Login", "root"); DATABASE_PASSWORD = serverSettings.getProperty("Password", ""); @@ -3822,7 +3822,7 @@ public final class Config EXTERNAL_HOSTNAME = serverSettings.getProperty("ExternalHostname", "localhost"); DATABASE_DRIVER = serverSettings.getProperty("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getProperty("URL", "jdbc:mysql://localhost/l2jdb"); + DATABASE_URL = serverSettings.getProperty("URL", "jdbc:mariadb://localhost/l2jdb"); DATABASE_LOGIN = serverSettings.getProperty("Login", "root"); DATABASE_PASSWORD = serverSettings.getProperty("Password", ""); DATABASE_MAX_CONNECTIONS = Integer.parseInt(serverSettings.getProperty("MaximumDbConnections", "10")); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseBackup.java index 97aee034ba..4d08f41445 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -72,7 +72,7 @@ public class DatabaseBackup final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; try { - final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); + final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); process.waitFor(); } catch (Exception e) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java index f312b565fb..c62e55cfa0 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java @@ -36,7 +36,7 @@ public class MySqlConnect try (Formatter form = new Formatter()) { Class.forName("org.mariadb.jdbc.Driver").newInstance(); - final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString(); + final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString(); con = DriverManager.getConnection(formattedText, user, password); try (Statement s = con.createStatement()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini index 4b702c0369..57f1221690 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini @@ -41,8 +41,8 @@ GameserverPort = 7777 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini index 1566b008b5..080138734c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini @@ -41,8 +41,8 @@ LoginPort = 9014 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java index d436676404..9032d3aa0d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java @@ -1378,7 +1378,7 @@ public final class Config ACCEPT_ALTERNATE_ID = serverSettings.getBoolean("AcceptAlternateID", true); DATABASE_DRIVER = serverSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getString("URL", "jdbc:mysql://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8"); + DATABASE_URL = serverSettings.getString("URL", "jdbc:mariadb://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8"); DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); @@ -3364,7 +3364,7 @@ public final class Config LOGIN_SERVER_SCHEDULE_RESTART_TIME = ServerSettings.getLong("LoginRestartTime", 24); DATABASE_DRIVER = ServerSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = ServerSettings.getString("URL", "jdbc:mysql://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8"); + DATABASE_URL = ServerSettings.getString("URL", "jdbc:mariadb://localhost/l2jmobiush5?useUnicode=true&characterEncoding=utf-8"); DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseBackup.java index 97aee034ba..4d08f41445 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -72,7 +72,7 @@ public class DatabaseBackup final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; try { - final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); + final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); process.waitFor(); } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java index bc7a004504..8bc19460d2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java @@ -36,7 +36,7 @@ public class MySqlConnect try (Formatter form = new Formatter()) { Class.forName("org.mariadb.jdbc.Driver").getDeclaredConstructor().newInstance(); - final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString(); + final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString(); con = DriverManager.getConnection(formattedText, user, password); try (Statement s = con.createStatement()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini index a7959469f2..3d0228fdfc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini @@ -41,8 +41,8 @@ GameserverPort = 7777 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini index 0dc3ccf41e..e1cae0cfd8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini @@ -41,8 +41,8 @@ LoginPort = 9014 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java index 5a0590c400..d3d342b6d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java @@ -1151,7 +1151,7 @@ public final class Config ACCEPT_ALTERNATE_ID = serverSettings.getBoolean("AcceptAlternateID", true); DATABASE_DRIVER = serverSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getString("URL", "jdbc:mysql://localhost/l2jgs"); + DATABASE_URL = serverSettings.getString("URL", "jdbc:mariadb://localhost/l2jgs"); DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); @@ -2726,7 +2726,7 @@ public final class Config LOGIN_SERVER_SCHEDULE_RESTART_TIME = ServerSettings.getLong("LoginRestartTime", 24); DATABASE_DRIVER = ServerSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = ServerSettings.getString("URL", "jdbc:mysql://localhost/l2jls"); + DATABASE_URL = ServerSettings.getString("URL", "jdbc:mariadb://localhost/l2jls"); DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseBackup.java index 97aee034ba..4d08f41445 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -72,7 +72,7 @@ public class DatabaseBackup final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; try { - final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); + final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); process.waitFor(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java index bc7a004504..8bc19460d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java @@ -36,7 +36,7 @@ public class MySqlConnect try (Formatter form = new Formatter()) { Class.forName("org.mariadb.jdbc.Driver").getDeclaredConstructor().newInstance(); - final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString(); + final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString(); con = DriverManager.getConnection(formattedText, user, password); try (Statement s = con.createStatement()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini index 596f264bf3..66bd4ecfe7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini @@ -41,8 +41,8 @@ GameserverPort = 7777 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini index 0dc3ccf41e..e1cae0cfd8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini @@ -41,8 +41,8 @@ LoginPort = 9014 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java index 30b4664073..53e700c448 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java @@ -1155,7 +1155,7 @@ public final class Config ACCEPT_ALTERNATE_ID = serverSettings.getBoolean("AcceptAlternateID", true); DATABASE_DRIVER = serverSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getString("URL", "jdbc:mysql://localhost/l2jgs"); + DATABASE_URL = serverSettings.getString("URL", "jdbc:mariadb://localhost/l2jgs"); DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); @@ -2733,7 +2733,7 @@ public final class Config LOGIN_SERVER_SCHEDULE_RESTART_TIME = ServerSettings.getLong("LoginRestartTime", 24); DATABASE_DRIVER = ServerSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = ServerSettings.getString("URL", "jdbc:mysql://localhost/l2jls"); + DATABASE_URL = ServerSettings.getString("URL", "jdbc:mariadb://localhost/l2jls"); DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/database/DatabaseBackup.java index 97aee034ba..4d08f41445 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -72,7 +72,7 @@ public class DatabaseBackup final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; try { - final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); + final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); process.waitFor(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java index bc7a004504..8bc19460d2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java @@ -36,7 +36,7 @@ public class MySqlConnect try (Formatter form = new Formatter()) { Class.forName("org.mariadb.jdbc.Driver").getDeclaredConstructor().newInstance(); - final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString(); + final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString(); con = DriverManager.getConnection(formattedText, user, password); try (Statement s = con.createStatement()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini index a99c1205f6..f6b18e6cbb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini @@ -41,8 +41,8 @@ GameserverPort = 7777 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini index 0dc3ccf41e..e1cae0cfd8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini @@ -41,8 +41,8 @@ LoginPort = 9014 Driver = org.mariadb.jdbc.Driver # Database URL -# Default: jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false -URL = jdbc:mysql://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +# Default: jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false +URL = jdbc:mariadb://localhost/l2jmobiusclassic?useUnicode=true&characterEncoding=utf-8&useSSL=false # Database user info (default is "root" but it's not recommended) Login = root diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java index 30b4664073..53e700c448 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java @@ -1155,7 +1155,7 @@ public final class Config ACCEPT_ALTERNATE_ID = serverSettings.getBoolean("AcceptAlternateID", true); DATABASE_DRIVER = serverSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = serverSettings.getString("URL", "jdbc:mysql://localhost/l2jgs"); + DATABASE_URL = serverSettings.getString("URL", "jdbc:mariadb://localhost/l2jgs"); DATABASE_LOGIN = serverSettings.getString("Login", "root"); DATABASE_PASSWORD = serverSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = serverSettings.getInt("MaximumDbConnections", 10); @@ -2733,7 +2733,7 @@ public final class Config LOGIN_SERVER_SCHEDULE_RESTART_TIME = ServerSettings.getLong("LoginRestartTime", 24); DATABASE_DRIVER = ServerSettings.getString("Driver", "org.mariadb.jdbc.Driver"); - DATABASE_URL = ServerSettings.getString("URL", "jdbc:mysql://localhost/l2jls"); + DATABASE_URL = ServerSettings.getString("URL", "jdbc:mariadb://localhost/l2jls"); DATABASE_LOGIN = ServerSettings.getString("Login", "root"); DATABASE_PASSWORD = ServerSettings.getString("Password", ""); DATABASE_MAX_CONNECTIONS = ServerSettings.getInt("MaximumDbConnections", 10); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/database/DatabaseBackup.java index 97aee034ba..4d08f41445 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -72,7 +72,7 @@ public class DatabaseBackup final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; try { - final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mysql://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); + final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); process.waitFor(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java index bc7a004504..8bc19460d2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/dbinstaller/util/mysql/MySqlConnect.java @@ -36,7 +36,7 @@ public class MySqlConnect try (Formatter form = new Formatter()) { Class.forName("org.mariadb.jdbc.Driver").getDeclaredConstructor().newInstance(); - final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString(); + final String formattedText = form.format("jdbc:mariadb://%1$s:%2$s", host, port).toString(); con = DriverManager.getConnection(formattedText, user, password); try (Statement s = con.createStatement())