From 6b28b48ae7d67d03678544674fd5aa1528dae9fc Mon Sep 17 00:00:00 2001 From: Rogiel Date: Sun, 7 Aug 2011 22:36:47 -0300 Subject: [PATCH] Refactored "src/dao" source folder to "src/main/java". --- .classpath | 1 - .../java/com/l2jserver/GameServerModule.java | 2 +- .../game/net/packet/client/CM_AUTH_LOGIN.java | 2 +- .../net/packet/client/CM_CHAR_CREATE.java | 2 +- .../net/packet/client/CM_CHAR_SELECT.java | 2 +- .../game/net/packet/client/CM_GOTO_LOBBY.java | 2 +- .../game/net/packet/client/CM_RESTART.java | 2 +- .../com/l2jserver/model}/H2DAOModule.java | 26 +++++++++---------- .../com/l2jserver/model}/MySQL5DAOModule.java | 26 +++++++++---------- .../l2jserver/model}/dao/CharacterDAO.java | 2 +- .../model}/dao/CharacterFriendDAO.java | 2 +- .../l2jserver/model}/dao/ChatMessageDAO.java | 2 +- .../com/l2jserver/model}/dao/ClanDAO.java | 2 +- .../com/l2jserver/model}/dao/ItemDAO.java | 2 +- .../java/com/l2jserver/model}/dao/NPCDAO.java | 2 +- .../java/com/l2jserver/model}/dao/PetDAO.java | 2 +- .../model}/dao/jdbc/AbstractJDBCDAO.java | 2 +- .../model}/dao/jdbc/JDBCCharacterDAO.java | 4 +-- .../dao/jdbc/JDBCCharacterFriendDAO.java | 4 +-- .../model}/dao/jdbc/JDBCChatMessageDAO.java | 6 ++--- .../model}/dao/jdbc/JDBCClanDAO.java | 6 ++--- .../model}/dao/jdbc/JDBCItemDAO.java | 4 +-- .../l2jserver/model}/dao/jdbc/JDBCNPCDAO.java | 6 ++--- .../model}/dao/jdbc/h2/H2CharacterDAO.java | 6 ++--- .../dao/jdbc/h2/H2CharacterFriendDAO.java | 6 ++--- .../model}/dao/jdbc/h2/H2ChatMessageDAO.java | 6 ++--- .../model}/dao/jdbc/h2/H2ClanDAO.java | 8 +++--- .../model}/dao/jdbc/h2/H2ItemDAO.java | 6 ++--- .../model}/dao/jdbc/h2/H2NPCDAO.java | 8 +++--- .../dao/jdbc/mysql5/MySQL5CharacterDAO.java | 6 ++--- .../jdbc/mysql5/MySQL5CharacterFriendDAO.java | 6 ++--- .../dao/jdbc/mysql5/MySQL5ChatMessageDAO.java | 6 ++--- .../model}/dao/jdbc/mysql5/MySQL5ClanDAO.java | 8 +++--- .../model}/dao/jdbc/mysql5/MySQL5ItemDAO.java | 6 ++--- .../model}/dao/jdbc/mysql5/MySQL5NPCDAO.java | 8 +++--- .../model/id/object/CharacterID.java | 2 +- .../com/l2jserver/model/id/object/ClanID.java | 2 +- .../com/l2jserver/model/id/object/ItemID.java | 2 +- .../com/l2jserver/model/id/object/PetID.java | 2 +- .../service/database/JDBCDatabaseService.java | 10 +++---- .../game/character/CharacterServiceImpl.java | 2 +- .../game/chat/DatabaseChatLoggingService.java | 2 +- .../service/game/chat/SimpleChatService.java | 2 +- .../service/game/npc/NPCServiceImpl.java | 2 +- .../game/world/CachedWorldIDService.java | 6 ++--- .../db/dao/mysql5/MySQL5CharacterDAOTest.java | 2 +- .../model/id/factory/IDFactoryTest.java | 2 +- .../template/StaticTemplateServiceTest.java | 2 +- 48 files changed, 114 insertions(+), 115 deletions(-) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/H2DAOModule.java (70%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/MySQL5DAOModule.java (69%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/CharacterDAO.java (98%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/CharacterFriendDAO.java (98%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/ChatMessageDAO.java (97%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/ClanDAO.java (97%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/ItemDAO.java (97%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/NPCDAO.java (97%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/PetDAO.java (96%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/AbstractJDBCDAO.java (97%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/JDBCCharacterDAO.java (99%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/JDBCCharacterFriendDAO.java (98%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/JDBCChatMessageDAO.java (98%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/JDBCClanDAO.java (97%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/JDBCItemDAO.java (98%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/JDBCNPCDAO.java (98%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/h2/H2CharacterDAO.java (91%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/h2/H2CharacterFriendDAO.java (89%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/h2/H2ChatMessageDAO.java (90%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/h2/H2ClanDAO.java (87%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/h2/H2ItemDAO.java (91%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/h2/H2NPCDAO.java (88%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/mysql5/MySQL5CharacterDAO.java (91%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java (89%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java (89%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/mysql5/MySQL5ClanDAO.java (87%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/mysql5/MySQL5ItemDAO.java (91%) rename src/{dao/com/l2jserver/db => main/java/com/l2jserver/model}/dao/jdbc/mysql5/MySQL5NPCDAO.java (87%) diff --git a/.classpath b/.classpath index 0ff9af658..291a9b671 100644 --- a/.classpath +++ b/.classpath @@ -2,7 +2,6 @@ - diff --git a/src/main/java/com/l2jserver/GameServerModule.java b/src/main/java/com/l2jserver/GameServerModule.java index 3c0d5cb97..0466829e3 100644 --- a/src/main/java/com/l2jserver/GameServerModule.java +++ b/src/main/java/com/l2jserver/GameServerModule.java @@ -18,7 +18,7 @@ package com.l2jserver; import com.google.inject.AbstractModule; import com.google.inject.Module; -import com.l2jserver.db.MySQL5DAOModule; +import com.l2jserver.model.MySQL5DAOModule; import com.l2jserver.model.id.provider.IDProviderModule; import com.l2jserver.service.ServiceModule; diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java index 21e50ef4a..0ac748331 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java @@ -21,11 +21,11 @@ import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.Lineage2Session; import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_LIST; +import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.id.AccountID; import com.l2jserver.model.id.provider.AccountIDProvider; import com.l2jserver.model.world.L2Character; diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java index 799784e90..d81e7cee6 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CREATE.java @@ -21,11 +21,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_FAIL; import com.l2jserver.game.net.packet.server.SM_CHAR_CREATE_OK; +import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.template.CharacterTemplateID; diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java index 1dd793ce2..4840d0362 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java @@ -21,10 +21,10 @@ import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_SELECTED; +import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.world.L2Character; /** diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java index 1869065cf..2fc733b9d 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java @@ -21,10 +21,10 @@ import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_LIST; +import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.world.L2Character; /** diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java index 94d0cd626..2cb9c8518 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java @@ -19,11 +19,11 @@ package com.l2jserver.game.net.packet.client; import org.jboss.netty.buffer.ChannelBuffer; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.AbstractClientPacket; import com.l2jserver.game.net.packet.server.SM_CHAR_LIST; import com.l2jserver.game.net.packet.server.SM_CHAR_RESTART; +import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.service.game.character.CharacterService; import com.l2jserver.service.game.spawn.NotSpawnedServiceException; diff --git a/src/dao/com/l2jserver/db/H2DAOModule.java b/src/main/java/com/l2jserver/model/H2DAOModule.java similarity index 70% rename from src/dao/com/l2jserver/db/H2DAOModule.java rename to src/main/java/com/l2jserver/model/H2DAOModule.java index 91fb94839..7030e0d14 100644 --- a/src/dao/com/l2jserver/db/H2DAOModule.java +++ b/src/main/java/com/l2jserver/model/H2DAOModule.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db; +package com.l2jserver.model; import com.google.inject.AbstractModule; import com.google.inject.Module; import com.google.inject.Scopes; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.CharacterFriendDAO; -import com.l2jserver.db.dao.ChatMessageDAO; -import com.l2jserver.db.dao.ClanDAO; -import com.l2jserver.db.dao.ItemDAO; -import com.l2jserver.db.dao.NPCDAO; -import com.l2jserver.db.dao.jdbc.h2.H2CharacterDAO; -import com.l2jserver.db.dao.jdbc.h2.H2CharacterFriendDAO; -import com.l2jserver.db.dao.jdbc.h2.H2ChatMessageDAO; -import com.l2jserver.db.dao.jdbc.h2.H2ClanDAO; -import com.l2jserver.db.dao.jdbc.h2.H2ItemDAO; -import com.l2jserver.db.dao.jdbc.h2.H2NPCDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.CharacterFriendDAO; +import com.l2jserver.model.dao.ChatMessageDAO; +import com.l2jserver.model.dao.ClanDAO; +import com.l2jserver.model.dao.ItemDAO; +import com.l2jserver.model.dao.NPCDAO; +import com.l2jserver.model.dao.jdbc.h2.H2CharacterDAO; +import com.l2jserver.model.dao.jdbc.h2.H2CharacterFriendDAO; +import com.l2jserver.model.dao.jdbc.h2.H2ChatMessageDAO; +import com.l2jserver.model.dao.jdbc.h2.H2ClanDAO; +import com.l2jserver.model.dao.jdbc.h2.H2ItemDAO; +import com.l2jserver.model.dao.jdbc.h2.H2NPCDAO; /** * Google Guice {@link Module} for H2 DAOs diff --git a/src/dao/com/l2jserver/db/MySQL5DAOModule.java b/src/main/java/com/l2jserver/model/MySQL5DAOModule.java similarity index 69% rename from src/dao/com/l2jserver/db/MySQL5DAOModule.java rename to src/main/java/com/l2jserver/model/MySQL5DAOModule.java index 362c686d1..a801b847a 100644 --- a/src/dao/com/l2jserver/db/MySQL5DAOModule.java +++ b/src/main/java/com/l2jserver/model/MySQL5DAOModule.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db; +package com.l2jserver.model; import com.google.inject.AbstractModule; import com.google.inject.Module; import com.google.inject.Scopes; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.CharacterFriendDAO; -import com.l2jserver.db.dao.ChatMessageDAO; -import com.l2jserver.db.dao.ClanDAO; -import com.l2jserver.db.dao.ItemDAO; -import com.l2jserver.db.dao.NPCDAO; -import com.l2jserver.db.dao.jdbc.mysql5.MySQL5CharacterDAO; -import com.l2jserver.db.dao.jdbc.mysql5.MySQL5CharacterFriendDAO; -import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ChatMessageDAO; -import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ClanDAO; -import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ItemDAO; -import com.l2jserver.db.dao.jdbc.mysql5.MySQL5NPCDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.CharacterFriendDAO; +import com.l2jserver.model.dao.ChatMessageDAO; +import com.l2jserver.model.dao.ClanDAO; +import com.l2jserver.model.dao.ItemDAO; +import com.l2jserver.model.dao.NPCDAO; +import com.l2jserver.model.dao.jdbc.mysql5.MySQL5CharacterDAO; +import com.l2jserver.model.dao.jdbc.mysql5.MySQL5CharacterFriendDAO; +import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ChatMessageDAO; +import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ClanDAO; +import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ItemDAO; +import com.l2jserver.model.dao.jdbc.mysql5.MySQL5NPCDAO; /** * Google Guice {@link Module} for MySQL5 DAOs diff --git a/src/dao/com/l2jserver/db/dao/CharacterDAO.java b/src/main/java/com/l2jserver/model/dao/CharacterDAO.java similarity index 98% rename from src/dao/com/l2jserver/db/dao/CharacterDAO.java rename to src/main/java/com/l2jserver/model/dao/CharacterDAO.java index 889c8efcb..4f3c61de0 100644 --- a/src/dao/com/l2jserver/db/dao/CharacterDAO.java +++ b/src/main/java/com/l2jserver/model/dao/CharacterDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao; +package com.l2jserver.model.dao; import java.util.List; diff --git a/src/dao/com/l2jserver/db/dao/CharacterFriendDAO.java b/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java similarity index 98% rename from src/dao/com/l2jserver/db/dao/CharacterFriendDAO.java rename to src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java index 63a72bbd3..bf578ed13 100644 --- a/src/dao/com/l2jserver/db/dao/CharacterFriendDAO.java +++ b/src/main/java/com/l2jserver/model/dao/CharacterFriendDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao; +package com.l2jserver.model.dao; import com.l2jserver.model.game.CharacterFriend; import com.l2jserver.model.id.FriendID; diff --git a/src/dao/com/l2jserver/db/dao/ChatMessageDAO.java b/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java similarity index 97% rename from src/dao/com/l2jserver/db/dao/ChatMessageDAO.java rename to src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java index 241728724..7570034c2 100644 --- a/src/dao/com/l2jserver/db/dao/ChatMessageDAO.java +++ b/src/main/java/com/l2jserver/model/dao/ChatMessageDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao; +package com.l2jserver.model.dao; import com.l2jserver.model.id.ChatMessageID; import com.l2jserver.model.server.ChatMessage; diff --git a/src/dao/com/l2jserver/db/dao/ClanDAO.java b/src/main/java/com/l2jserver/model/dao/ClanDAO.java similarity index 97% rename from src/dao/com/l2jserver/db/dao/ClanDAO.java rename to src/main/java/com/l2jserver/model/dao/ClanDAO.java index e71cad41b..e27f69acc 100644 --- a/src/dao/com/l2jserver/db/dao/ClanDAO.java +++ b/src/main/java/com/l2jserver/model/dao/ClanDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao; +package com.l2jserver.model.dao; import com.l2jserver.model.id.object.ClanID; import com.l2jserver.model.world.Clan; diff --git a/src/dao/com/l2jserver/db/dao/ItemDAO.java b/src/main/java/com/l2jserver/model/dao/ItemDAO.java similarity index 97% rename from src/dao/com/l2jserver/db/dao/ItemDAO.java rename to src/main/java/com/l2jserver/model/dao/ItemDAO.java index 0f3a6437f..e0e7c18b3 100644 --- a/src/dao/com/l2jserver/db/dao/ItemDAO.java +++ b/src/main/java/com/l2jserver/model/dao/ItemDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao; +package com.l2jserver.model.dao; import com.l2jserver.model.id.object.ItemID; import com.l2jserver.model.world.Item; diff --git a/src/dao/com/l2jserver/db/dao/NPCDAO.java b/src/main/java/com/l2jserver/model/dao/NPCDAO.java similarity index 97% rename from src/dao/com/l2jserver/db/dao/NPCDAO.java rename to src/main/java/com/l2jserver/model/dao/NPCDAO.java index 0adfbc155..39cd04e3b 100644 --- a/src/dao/com/l2jserver/db/dao/NPCDAO.java +++ b/src/main/java/com/l2jserver/model/dao/NPCDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao; +package com.l2jserver.model.dao; import java.util.Collection; import java.util.List; diff --git a/src/dao/com/l2jserver/db/dao/PetDAO.java b/src/main/java/com/l2jserver/model/dao/PetDAO.java similarity index 96% rename from src/dao/com/l2jserver/db/dao/PetDAO.java rename to src/main/java/com/l2jserver/model/dao/PetDAO.java index 87b9d52b2..d6a94d813 100644 --- a/src/dao/com/l2jserver/db/dao/PetDAO.java +++ b/src/main/java/com/l2jserver/model/dao/PetDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao; +package com.l2jserver.model.dao; import com.l2jserver.model.id.object.PetID; import com.l2jserver.model.world.Pet; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/AbstractJDBCDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/AbstractJDBCDAO.java similarity index 97% rename from src/dao/com/l2jserver/db/dao/jdbc/AbstractJDBCDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/AbstractJDBCDAO.java index 7e88f8468..55b0a563a 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/AbstractJDBCDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/AbstractJDBCDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc; +package com.l2jserver.model.dao.jdbc; import com.google.inject.Inject; import com.l2jserver.model.Model; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterDAO.java similarity index 99% rename from src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterDAO.java index 66f0a35bd..0fc980f4d 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc; +package com.l2jserver.model.dao.jdbc; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -23,7 +23,7 @@ import java.sql.Types; import java.util.List; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; +import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.id.AccountID; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.ClanID; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterFriendDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterFriendDAO.java similarity index 98% rename from src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterFriendDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterFriendDAO.java index de744ec34..01ff4dcf0 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterFriendDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterFriendDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc; +package com.l2jserver.model.dao.jdbc; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -22,7 +22,7 @@ import java.sql.SQLException; import java.util.List; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterFriendDAO; +import com.l2jserver.model.dao.CharacterFriendDAO; import com.l2jserver.model.game.CharacterFriend; import com.l2jserver.model.id.FriendID; import com.l2jserver.model.id.object.CharacterID; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCChatMessageDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCChatMessageDAO.java similarity index 98% rename from src/dao/com/l2jserver/db/dao/jdbc/JDBCChatMessageDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/JDBCChatMessageDAO.java index be38e5cb8..2237e2cf7 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCChatMessageDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCChatMessageDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc; +package com.l2jserver.model.dao.jdbc; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -24,8 +24,8 @@ import java.util.Date; import java.util.List; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.ChatMessageDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.ChatMessageDAO; import com.l2jserver.model.id.ChatMessageID; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.provider.CharacterIDProvider; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCClanDAO.java similarity index 97% rename from src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/JDBCClanDAO.java index 774476874..68801b1c2 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCClanDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc; +package com.l2jserver.model.dao.jdbc; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -22,8 +22,8 @@ import java.sql.SQLException; import java.util.List; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.ClanDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.ClanDAO; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.ClanID; import com.l2jserver.model.id.object.provider.CharacterIDProvider; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCItemDAO.java similarity index 98% rename from src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/JDBCItemDAO.java index 90b482150..ead207a5b 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCItemDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc; +package com.l2jserver.model.dao.jdbc; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -22,7 +22,7 @@ import java.sql.SQLException; import java.util.List; import com.google.inject.Inject; -import com.l2jserver.db.dao.ItemDAO; +import com.l2jserver.model.dao.ItemDAO; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.ItemID; import com.l2jserver.model.id.object.provider.CharacterIDProvider; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCNPCDAO.java similarity index 98% rename from src/dao/com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/JDBCNPCDAO.java index eb135b914..cce5e1406 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/JDBCNPCDAO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc; +package com.l2jserver.model.dao.jdbc; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -25,8 +25,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.NPCDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.NPCDAO; import com.l2jserver.model.id.object.NPCID; import com.l2jserver.model.id.object.provider.NPCIDProvider; import com.l2jserver.model.id.template.NPCTemplateID; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterDAO.java similarity index 91% rename from src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterDAO.java index a436774c5..5279161e9 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterDAO.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.h2; +package com.l2jserver.model.dao.jdbc.h2; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.jdbc.JDBCCharacterDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.jdbc.JDBCCharacterDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.object.provider.ClanIDProvider; import com.l2jserver.model.id.provider.AccountIDProvider; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterFriendDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterFriendDAO.java similarity index 89% rename from src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterFriendDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterFriendDAO.java index f35ccab9d..7d5ee5adf 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterFriendDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterFriendDAO.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.h2; +package com.l2jserver.model.dao.jdbc.h2; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterFriendDAO; -import com.l2jserver.db.dao.jdbc.JDBCCharacterFriendDAO; +import com.l2jserver.model.dao.CharacterFriendDAO; +import com.l2jserver.model.dao.jdbc.JDBCCharacterFriendDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.provider.FriendIDProvider; import com.l2jserver.service.database.DatabaseService; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ChatMessageDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ChatMessageDAO.java similarity index 90% rename from src/dao/com/l2jserver/db/dao/jdbc/h2/H2ChatMessageDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ChatMessageDAO.java index 56bba9f40..b4598b2eb 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ChatMessageDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ChatMessageDAO.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.h2; +package com.l2jserver.model.dao.jdbc.h2; import com.google.inject.Inject; -import com.l2jserver.db.dao.ChatMessageDAO; -import com.l2jserver.db.dao.jdbc.JDBCChatMessageDAO; +import com.l2jserver.model.dao.ChatMessageDAO; +import com.l2jserver.model.dao.jdbc.JDBCChatMessageDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.provider.ChatMessageIDProvider; import com.l2jserver.service.database.DatabaseService; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ClanDAO.java similarity index 87% rename from src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ClanDAO.java index 6761c8639..7a8b124e6 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ClanDAO.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.h2; +package com.l2jserver.model.dao.jdbc.h2; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.ClanDAO; -import com.l2jserver.db.dao.jdbc.JDBCClanDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.ClanDAO; +import com.l2jserver.model.dao.jdbc.JDBCClanDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.object.provider.ClanIDProvider; import com.l2jserver.service.database.DatabaseService; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ItemDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ItemDAO.java similarity index 91% rename from src/dao/com/l2jserver/db/dao/jdbc/h2/H2ItemDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ItemDAO.java index c9269b069..b46b5d9d6 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ItemDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ItemDAO.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.h2; +package com.l2jserver.model.dao.jdbc.h2; import com.google.inject.Inject; -import com.l2jserver.db.dao.ItemDAO; -import com.l2jserver.db.dao.jdbc.JDBCItemDAO; +import com.l2jserver.model.dao.ItemDAO; +import com.l2jserver.model.dao.jdbc.JDBCItemDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.object.provider.ItemIDProvider; import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2NPCDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2NPCDAO.java similarity index 88% rename from src/dao/com/l2jserver/db/dao/jdbc/h2/H2NPCDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/h2/H2NPCDAO.java index 22b1d15d4..e60f90429 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2NPCDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2NPCDAO.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.h2; +package com.l2jserver.model.dao.jdbc.h2; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.NPCDAO; -import com.l2jserver.db.dao.jdbc.JDBCNPCDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.NPCDAO; +import com.l2jserver.model.dao.jdbc.JDBCNPCDAO; import com.l2jserver.model.id.object.provider.NPCIDProvider; import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider; import com.l2jserver.service.database.DatabaseService; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterDAO.java similarity index 91% rename from src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterDAO.java index aaa815944..6cdec70b5 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterDAO.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.mysql5; +package com.l2jserver.model.dao.jdbc.mysql5; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.jdbc.JDBCCharacterDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.jdbc.JDBCCharacterDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.object.provider.ClanIDProvider; import com.l2jserver.model.id.provider.AccountIDProvider; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java similarity index 89% rename from src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java index 9a6d3ebdd..16b9d32c8 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.mysql5; +package com.l2jserver.model.dao.jdbc.mysql5; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterFriendDAO; -import com.l2jserver.db.dao.jdbc.JDBCCharacterFriendDAO; +import com.l2jserver.model.dao.CharacterFriendDAO; +import com.l2jserver.model.dao.jdbc.JDBCCharacterFriendDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.provider.FriendIDProvider; import com.l2jserver.service.database.DatabaseService; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java similarity index 89% rename from src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java index 76ace5742..29e88a864 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.mysql5; +package com.l2jserver.model.dao.jdbc.mysql5; import com.google.inject.Inject; -import com.l2jserver.db.dao.ChatMessageDAO; -import com.l2jserver.db.dao.jdbc.JDBCChatMessageDAO; +import com.l2jserver.model.dao.ChatMessageDAO; +import com.l2jserver.model.dao.jdbc.JDBCChatMessageDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.provider.ChatMessageIDProvider; import com.l2jserver.service.database.DatabaseService; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ClanDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ClanDAO.java similarity index 87% rename from src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ClanDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ClanDAO.java index 487dcca10..948d6074e 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ClanDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ClanDAO.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.mysql5; +package com.l2jserver.model.dao.jdbc.mysql5; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.ClanDAO; -import com.l2jserver.db.dao.jdbc.JDBCClanDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.ClanDAO; +import com.l2jserver.model.dao.jdbc.JDBCClanDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.object.provider.ClanIDProvider; import com.l2jserver.service.database.DatabaseService; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ItemDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ItemDAO.java similarity index 91% rename from src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ItemDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ItemDAO.java index 9b40d4dfe..6b7014d37 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ItemDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ItemDAO.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.mysql5; +package com.l2jserver.model.dao.jdbc.mysql5; import com.google.inject.Inject; -import com.l2jserver.db.dao.ItemDAO; -import com.l2jserver.db.dao.jdbc.JDBCItemDAO; +import com.l2jserver.model.dao.ItemDAO; +import com.l2jserver.model.dao.jdbc.JDBCItemDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.id.object.provider.ItemIDProvider; import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5NPCDAO.java b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5NPCDAO.java similarity index 87% rename from src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5NPCDAO.java rename to src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5NPCDAO.java index 5c4ac6cf4..48b5b34c8 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5NPCDAO.java +++ b/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5NPCDAO.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with l2jserver. If not, see . */ -package com.l2jserver.db.dao.jdbc.mysql5; +package com.l2jserver.model.dao.jdbc.mysql5; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.NPCDAO; -import com.l2jserver.db.dao.jdbc.JDBCNPCDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.NPCDAO; +import com.l2jserver.model.dao.jdbc.JDBCNPCDAO; import com.l2jserver.model.id.object.provider.NPCIDProvider; import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider; import com.l2jserver.service.database.DatabaseService; diff --git a/src/main/java/com/l2jserver/model/id/object/CharacterID.java b/src/main/java/com/l2jserver/model/id/object/CharacterID.java index 0dadad1af..0cf12c4a9 100644 --- a/src/main/java/com/l2jserver/model/id/object/CharacterID.java +++ b/src/main/java/com/l2jserver/model/id/object/CharacterID.java @@ -18,7 +18,7 @@ package com.l2jserver.model.id.object; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -import com.l2jserver.db.dao.CharacterDAO; +import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.id.provider.IDProvider; import com.l2jserver.model.world.L2Character; diff --git a/src/main/java/com/l2jserver/model/id/object/ClanID.java b/src/main/java/com/l2jserver/model/id/object/ClanID.java index f4703b269..427f1be7d 100644 --- a/src/main/java/com/l2jserver/model/id/object/ClanID.java +++ b/src/main/java/com/l2jserver/model/id/object/ClanID.java @@ -18,7 +18,7 @@ package com.l2jserver.model.id.object; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -import com.l2jserver.db.dao.ClanDAO; +import com.l2jserver.model.dao.ClanDAO; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.id.provider.IDProvider; import com.l2jserver.model.world.Clan; diff --git a/src/main/java/com/l2jserver/model/id/object/ItemID.java b/src/main/java/com/l2jserver/model/id/object/ItemID.java index e62687496..95c8cfb3f 100644 --- a/src/main/java/com/l2jserver/model/id/object/ItemID.java +++ b/src/main/java/com/l2jserver/model/id/object/ItemID.java @@ -18,7 +18,7 @@ package com.l2jserver.model.id.object; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -import com.l2jserver.db.dao.ItemDAO; +import com.l2jserver.model.dao.ItemDAO; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.id.provider.IDProvider; import com.l2jserver.model.world.Item; diff --git a/src/main/java/com/l2jserver/model/id/object/PetID.java b/src/main/java/com/l2jserver/model/id/object/PetID.java index d393e2be4..5f46c8f23 100644 --- a/src/main/java/com/l2jserver/model/id/object/PetID.java +++ b/src/main/java/com/l2jserver/model/id/object/PetID.java @@ -17,7 +17,7 @@ package com.l2jserver.model.id.object; import com.google.inject.Inject; -import com.l2jserver.db.dao.PetDAO; +import com.l2jserver.model.dao.PetDAO; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.id.provider.IDProvider; import com.l2jserver.model.world.Pet; diff --git a/src/main/java/com/l2jserver/service/database/JDBCDatabaseService.java b/src/main/java/com/l2jserver/service/database/JDBCDatabaseService.java index 0b12e7821..09e38f961 100644 --- a/src/main/java/com/l2jserver/service/database/JDBCDatabaseService.java +++ b/src/main/java/com/l2jserver/service/database/JDBCDatabaseService.java @@ -38,13 +38,13 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Injector; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.ClanDAO; -import com.l2jserver.db.dao.ItemDAO; -import com.l2jserver.db.dao.NPCDAO; -import com.l2jserver.db.dao.PetDAO; import com.l2jserver.model.Model; import com.l2jserver.model.Model.ObjectDesire; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.ClanDAO; +import com.l2jserver.model.dao.ItemDAO; +import com.l2jserver.model.dao.NPCDAO; +import com.l2jserver.model.dao.PetDAO; import com.l2jserver.model.id.ID; import com.l2jserver.model.id.object.allocator.IDAllocator; import com.l2jserver.model.world.Clan; diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java b/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java index 27d609e9d..0d2358dba 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java @@ -18,7 +18,6 @@ package com.l2jserver.service.game.character; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import com.l2jserver.db.dao.ItemDAO; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.SystemMessage; import com.l2jserver.game.net.packet.server.SM_CHAR_INFO; @@ -29,6 +28,7 @@ import com.l2jserver.game.net.packet.server.SM_ITEM_GROUND; import com.l2jserver.game.net.packet.server.SM_MOVE; import com.l2jserver.game.net.packet.server.SM_MOVE_TYPE; import com.l2jserver.game.net.packet.server.SM_TARGET; +import com.l2jserver.model.dao.ItemDAO; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.server.ChatMessage; import com.l2jserver.model.world.Actor; diff --git a/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java b/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java index 398201b79..94dc684f8 100644 --- a/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java +++ b/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java @@ -19,7 +19,7 @@ package com.l2jserver.service.game.chat; import java.util.Date; import com.google.inject.Inject; -import com.l2jserver.db.dao.ChatMessageDAO; +import com.l2jserver.model.dao.ChatMessageDAO; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.server.ChatMessage; diff --git a/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java b/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java index 65bed03f5..9314aeb92 100644 --- a/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java +++ b/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java @@ -21,7 +21,7 @@ import java.util.Set; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; +import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.ClanID; import com.l2jserver.model.server.ChatMessage; diff --git a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java index d14a030f9..88d9c9e51 100644 --- a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java @@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Injector; -import com.l2jserver.db.dao.NPCDAO; import com.l2jserver.game.net.Lineage2Client; import com.l2jserver.game.net.packet.client.CM_CHAR_ACTION.CharacterAction; +import com.l2jserver.model.dao.NPCDAO; import com.l2jserver.model.template.NPCTemplate; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.Actor.ActorState; diff --git a/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java b/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java index 002eea2a5..29fb9ee57 100644 --- a/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java +++ b/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java @@ -20,9 +20,9 @@ import java.util.Collection; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import com.l2jserver.db.dao.CharacterDAO; -import com.l2jserver.db.dao.ItemDAO; -import com.l2jserver.db.dao.NPCDAO; +import com.l2jserver.model.dao.CharacterDAO; +import com.l2jserver.model.dao.ItemDAO; +import com.l2jserver.model.dao.NPCDAO; import com.l2jserver.model.id.ID; import com.l2jserver.model.id.ObjectID; import com.l2jserver.model.id.object.allocator.IDAllocator; diff --git a/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java b/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java index 25436329d..0a09923ff 100644 --- a/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java +++ b/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java @@ -24,7 +24,7 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Stage; import com.l2jserver.GameServerModule; -import com.l2jserver.db.dao.CharacterDAO; +import com.l2jserver.model.dao.CharacterDAO; import com.l2jserver.model.id.object.provider.CharacterIDProvider; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.ServiceManager; diff --git a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java index 563774249..590ce85da 100644 --- a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java +++ b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.l2jserver.db.H2DAOModule; +import com.l2jserver.model.H2DAOModule; import com.l2jserver.model.id.ID; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.provider.CharacterIDProvider; diff --git a/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java b/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java index 53c4ca5f7..e8ad9540a 100644 --- a/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java +++ b/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.l2jserver.db.H2DAOModule; +import com.l2jserver.model.H2DAOModule; import com.l2jserver.model.id.provider.IDProviderModule; import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; import com.l2jserver.service.ServiceManager;