Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-05 23:22:47 +00:00
Code Releases Activity

Refactored "com.l2jserver.model.jdbc.dao" to

Browse Source 
"com.l2jserver.service.database.jdbc"
This commit is contained in:
Rogiel Sulzbach
2011-08-07 22:40:10 -03:00
parent 6b28b48ae7
commit 4fe7eeb95b
24 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/l2jserver/GameServerModule.java
View File

@@ -18,9 +18,9 @@ package com.l2jserver;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
import com.l2jserver.model.MySQL5DAOModule;
import com.l2jserver.model.id.provider.IDProviderModule;
import com.l2jserver.service.ServiceModule;
import com.l2jserver.service.database.MySQL5DAOModule;
/**
* The game server Google Guice {@link Module}.

14
src/main/java/com/l2jserver/model/H2DAOModule.java → src/main/java/com/l2jserver/service/database/H2DAOModule.java
View File

@@ -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.model;
package com.l2jserver.service.database;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
@@ -25,12 +25,12 @@ 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;
import com.l2jserver.service.database.jdbc.h2.H2CharacterDAO;
import com.l2jserver.service.database.jdbc.h2.H2CharacterFriendDAO;
import com.l2jserver.service.database.jdbc.h2.H2ChatMessageDAO;
import com.l2jserver.service.database.jdbc.h2.H2ClanDAO;
import com.l2jserver.service.database.jdbc.h2.H2ItemDAO;
import com.l2jserver.service.database.jdbc.h2.H2NPCDAO;
/**
* Google Guice {@link Module} for H2 DAOs

14
src/main/java/com/l2jserver/model/MySQL5DAOModule.java → src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java
View File

@@ -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.model;
package com.l2jserver.service.database;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
@@ -25,12 +25,12 @@ 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;
import com.l2jserver.service.database.jdbc.mysql5.MySQL5CharacterDAO;
import com.l2jserver.service.database.jdbc.mysql5.MySQL5CharacterFriendDAO;
import com.l2jserver.service.database.jdbc.mysql5.MySQL5ChatMessageDAO;
import com.l2jserver.service.database.jdbc.mysql5.MySQL5ClanDAO;
import com.l2jserver.service.database.jdbc.mysql5.MySQL5ItemDAO;
import com.l2jserver.service.database.jdbc.mysql5.MySQL5NPCDAO;
/**
* Google Guice {@link Module} for MySQL5 DAOs

2
src/main/java/com/l2jserver/model/dao/jdbc/AbstractJDBCDAO.java → src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java
View File

@@ -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.model.dao.jdbc;
package com.l2jserver.service.database.jdbc;
import com.google.inject.Inject;
import com.l2jserver.model.Model;

2
src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterDAO.java → src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterDAO.java
View File

@@ -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.model.dao.jdbc;
package com.l2jserver.service.database.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;

2
src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterFriendDAO.java → src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java
View File

@@ -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.model.dao.jdbc;
package com.l2jserver.service.database.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;

2
src/main/java/com/l2jserver/model/dao/jdbc/JDBCChatMessageDAO.java → src/main/java/com/l2jserver/service/database/jdbc/JDBCChatMessageDAO.java
View File

@@ -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.model.dao.jdbc;
package com.l2jserver.service.database.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;

2
src/main/java/com/l2jserver/model/dao/jdbc/JDBCClanDAO.java → src/main/java/com/l2jserver/service/database/jdbc/JDBCClanDAO.java
View File

@@ -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.model.dao.jdbc;
package com.l2jserver.service.database.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;

2
src/main/java/com/l2jserver/model/dao/jdbc/JDBCItemDAO.java → src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java
View File

@@ -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.model.dao.jdbc;
package com.l2jserver.service.database.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;

2
src/main/java/com/l2jserver/model/dao/jdbc/JDBCNPCDAO.java → src/main/java/com/l2jserver/service/database/jdbc/JDBCNPCDAO.java
View File

@@ -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.model.dao.jdbc;
package com.l2jserver.service.database.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;

4
src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterDAO.java → src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterDAO.java
View File

@@ -14,16 +14,16 @@
* 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.model.dao.jdbc.h2;
package com.l2jserver.service.database.jdbc.h2;
import com.google.inject.Inject;
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;
import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider;
import com.l2jserver.service.database.DatabaseService;
import com.l2jserver.service.database.jdbc.JDBCCharacterDAO;
/**
* {@link CharacterDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterFriendDAO.java → src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java
View File

@@ -14,14 +14,14 @@
* 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.model.dao.jdbc.h2;
package com.l2jserver.service.database.jdbc.h2;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.jdbc.JDBCCharacterFriendDAO;
/**
* {@link CharacterFriendDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ChatMessageDAO.java → src/main/java/com/l2jserver/service/database/jdbc/h2/H2ChatMessageDAO.java
View File

@@ -14,14 +14,14 @@
* 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.model.dao.jdbc.h2;
package com.l2jserver.service.database.jdbc.h2;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.jdbc.JDBCChatMessageDAO;
/**
* {@link ChatMessageDAO} implementation for H2 database

4
src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ClanDAO.java → src/main/java/com/l2jserver/service/database/jdbc/h2/H2ClanDAO.java
View File

@@ -14,15 +14,15 @@
* 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.model.dao.jdbc.h2;
package com.l2jserver.service.database.jdbc.h2;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.jdbc.JDBCClanDAO;
/**
* {@link CharacterDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ItemDAO.java → src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java
View File

@@ -14,15 +14,15 @@
* 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.model.dao.jdbc.h2;
package com.l2jserver.service.database.jdbc.h2;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.DatabaseService;
import com.l2jserver.service.database.jdbc.JDBCItemDAO;
/**
* {@link ItemDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/h2/H2NPCDAO.java → src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java
View File

@@ -14,15 +14,15 @@
* 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.model.dao.jdbc.h2;
package com.l2jserver.service.database.jdbc.h2;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.jdbc.JDBCNPCDAO;
/**
* {@link CharacterDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterDAO.java → src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterDAO.java
View File

@@ -14,16 +14,16 @@
* 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.model.dao.jdbc.mysql5;
package com.l2jserver.service.database.jdbc.mysql5;
import com.google.inject.Inject;
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;
import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider;
import com.l2jserver.service.database.DatabaseService;
import com.l2jserver.service.database.jdbc.JDBCCharacterDAO;
/**
* {@link CharacterDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java → src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java
View File

@@ -14,14 +14,14 @@
* 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.model.dao.jdbc.mysql5;
package com.l2jserver.service.database.jdbc.mysql5;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.jdbc.JDBCCharacterFriendDAO;
/**
* {@link CharacterFriendDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java → src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ChatMessageDAO.java
View File

@@ -14,14 +14,14 @@
* 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.model.dao.jdbc.mysql5;
package com.l2jserver.service.database.jdbc.mysql5;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.jdbc.JDBCChatMessageDAO;
/**
* {@link ChatMessageDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ClanDAO.java → src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ClanDAO.java
View File

@@ -14,15 +14,15 @@
* 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.model.dao.jdbc.mysql5;
package com.l2jserver.service.database.jdbc.mysql5;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.jdbc.JDBCClanDAO;
/**
* {@link CharacterDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ItemDAO.java → src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java
View File

@@ -14,15 +14,15 @@
* 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.model.dao.jdbc.mysql5;
package com.l2jserver.service.database.jdbc.mysql5;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.DatabaseService;
import com.l2jserver.service.database.jdbc.JDBCItemDAO;
/**
* {@link ItemDAO} implementation for MySQL5

4
src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5NPCDAO.java → src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java
View File

@@ -14,15 +14,15 @@
* 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.model.dao.jdbc.mysql5;
package com.l2jserver.service.database.jdbc.mysql5;
import com.google.inject.Inject;
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;
import com.l2jserver.service.database.jdbc.JDBCNPCDAO;
/**
* {@link CharacterDAO} implementation for MySQL5

2
src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java
View File

@@ -23,7 +23,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
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;
@@ -33,6 +32,7 @@ import com.l2jserver.service.ServiceManager;
import com.l2jserver.service.ServiceModule;
import com.l2jserver.service.ServiceStartException;
import com.l2jserver.service.database.DatabaseService;
import com.l2jserver.service.database.H2DAOModule;
import com.l2jserver.service.game.template.TemplateService;
import com.l2jserver.service.game.world.WorldService;

2
src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java
View File

@@ -20,12 +20,12 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
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;
import com.l2jserver.service.ServiceModule;
import com.l2jserver.service.ServiceStartException;
import com.l2jserver.service.database.H2DAOModule;
public class StaticTemplateServiceTest {
private final Injector injector = Guice.createInjector(new ServiceModule(),