Refactored "src/dao" source folder to "src/main/java".

.classpath

@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry excluding="mysql5/|db4o/|neodatis/|h2/" kind="src" path="src/dao"/>
 	<classpathentry kind="src" output="target/scripts" path="data/script/quest"/>
 	<classpathentry kind="src" output="target/scripts" path="data/script/ai"/>
 	<classpathentry kind="src" output="target/scripts" path="data/plugin"/>

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;
 

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;

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;

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;
 
 /**

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;
 
 /**

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;
 

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.CharacterFriendDAO;
+import com.l2jserver.model.dao.CharacterFriendDAO;
-import com.l2jserver.db.dao.ChatMessageDAO;
+import com.l2jserver.model.dao.ChatMessageDAO;
-import com.l2jserver.db.dao.ClanDAO;
+import com.l2jserver.model.dao.ClanDAO;
-import com.l2jserver.db.dao.ItemDAO;
+import com.l2jserver.model.dao.ItemDAO;
-import com.l2jserver.db.dao.NPCDAO;
+import com.l2jserver.model.dao.NPCDAO;
-import com.l2jserver.db.dao.jdbc.h2.H2CharacterDAO;
+import com.l2jserver.model.dao.jdbc.h2.H2CharacterDAO;
-import com.l2jserver.db.dao.jdbc.h2.H2CharacterFriendDAO;
+import com.l2jserver.model.dao.jdbc.h2.H2CharacterFriendDAO;
-import com.l2jserver.db.dao.jdbc.h2.H2ChatMessageDAO;
+import com.l2jserver.model.dao.jdbc.h2.H2ChatMessageDAO;
-import com.l2jserver.db.dao.jdbc.h2.H2ClanDAO;
+import com.l2jserver.model.dao.jdbc.h2.H2ClanDAO;
-import com.l2jserver.db.dao.jdbc.h2.H2ItemDAO;
+import com.l2jserver.model.dao.jdbc.h2.H2ItemDAO;
-import com.l2jserver.db.dao.jdbc.h2.H2NPCDAO;
+import com.l2jserver.model.dao.jdbc.h2.H2NPCDAO;
 
 /**
  * Google Guice {@link Module} for H2 DAOs

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.CharacterFriendDAO;
+import com.l2jserver.model.dao.CharacterFriendDAO;
-import com.l2jserver.db.dao.ChatMessageDAO;
+import com.l2jserver.model.dao.ChatMessageDAO;
-import com.l2jserver.db.dao.ClanDAO;
+import com.l2jserver.model.dao.ClanDAO;
-import com.l2jserver.db.dao.ItemDAO;
+import com.l2jserver.model.dao.ItemDAO;
-import com.l2jserver.db.dao.NPCDAO;
+import com.l2jserver.model.dao.NPCDAO;
-import com.l2jserver.db.dao.jdbc.mysql5.MySQL5CharacterDAO;
+import com.l2jserver.model.dao.jdbc.mysql5.MySQL5CharacterDAO;
-import com.l2jserver.db.dao.jdbc.mysql5.MySQL5CharacterFriendDAO;
+import com.l2jserver.model.dao.jdbc.mysql5.MySQL5CharacterFriendDAO;
-import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ChatMessageDAO;
+import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ChatMessageDAO;
-import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ClanDAO;
+import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ClanDAO;
-import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ItemDAO;
+import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ItemDAO;
-import com.l2jserver.db.dao.jdbc.mysql5.MySQL5NPCDAO;
+import com.l2jserver.model.dao.jdbc.mysql5.MySQL5NPCDAO;
 
 /**
  * Google Guice {@link Module} for MySQL5 DAOs

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 <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.db.dao;
+package com.l2jserver.model.dao;
 
 import java.util.List;
 

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 <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.db.dao;
+package com.l2jserver.model.dao;
 
 import com.l2jserver.model.game.CharacterFriend;
 import com.l2jserver.model.id.FriendID;

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 <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.db.dao;
+package com.l2jserver.model.dao;
 
 import com.l2jserver.model.id.ChatMessageID;
 import com.l2jserver.model.server.ChatMessage;

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 <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.db.dao;
+package com.l2jserver.model.dao;
 
 import com.l2jserver.model.id.object.ClanID;
 import com.l2jserver.model.world.Clan;

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 <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.db.dao;
+package com.l2jserver.model.dao;
 
 import com.l2jserver.model.id.object.ItemID;
 import com.l2jserver.model.world.Item;

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 <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.db.dao;
+package com.l2jserver.model.dao;
 
 import java.util.Collection;
 import java.util.List;

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 <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.db.dao;
+package com.l2jserver.model.dao;
 
 import com.l2jserver.model.id.object.PetID;
 import com.l2jserver.model.world.Pet;

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 <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.db.dao.jdbc;
+package com.l2jserver.model.dao.jdbc;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.Model;

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 <http://www.gnu.org/licenses/>.
  */
-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;

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 <http://www.gnu.org/licenses/>.
  */
-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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.ChatMessageDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.ClanDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.NPCDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.jdbc.JDBCCharacterDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterFriendDAO;
-import com.l2jserver.db.dao.jdbc.JDBCCharacterFriendDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.ChatMessageDAO;
-import com.l2jserver.db.dao.jdbc.JDBCChatMessageDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.ClanDAO;
+import com.l2jserver.model.dao.ClanDAO;
-import com.l2jserver.db.dao.jdbc.JDBCClanDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.ItemDAO;
-import com.l2jserver.db.dao.jdbc.JDBCItemDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.NPCDAO;
+import com.l2jserver.model.dao.NPCDAO;
-import com.l2jserver.db.dao.jdbc.JDBCNPCDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.jdbc.JDBCCharacterDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterFriendDAO;
-import com.l2jserver.db.dao.jdbc.JDBCCharacterFriendDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.ChatMessageDAO;
-import com.l2jserver.db.dao.jdbc.JDBCChatMessageDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.ClanDAO;
+import com.l2jserver.model.dao.ClanDAO;
-import com.l2jserver.db.dao.jdbc.JDBCClanDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.ItemDAO;
-import com.l2jserver.db.dao.jdbc.JDBCItemDAO;
+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;

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 <http://www.gnu.org/licenses/>.
  */
-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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.NPCDAO;
+import com.l2jserver.model.dao.NPCDAO;
-import com.l2jserver.db.dao.jdbc.JDBCNPCDAO;
+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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.model.dao.CharacterDAO;
-import com.l2jserver.db.dao.ItemDAO;
+import com.l2jserver.model.dao.ItemDAO;
-import com.l2jserver.db.dao.NPCDAO;
+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;

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;

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;

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;