diff --git a/l2jserver2-common/pom.xml b/l2jserver2-common/pom.xml index 9289c18e5..2bea266ca 100644 --- a/l2jserver2-common/pom.xml +++ b/l2jserver2-common/pom.xml @@ -23,7 +23,7 @@ org.slf4j slf4j-log4j12 - 1.6.1 + 1.6.4 test @@ -59,7 +59,7 @@ org.slf4j jcl-over-slf4j - 1.6.1 + 1.6.4 log4j @@ -76,13 +76,13 @@ com.orientechnologies orientdb-core - 1.0rc5 + 1.0rc7 net.sf.ehcache ehcache-core - 2.4.2 + 2.5.0 @@ -93,17 +93,17 @@ com.google.guava guava - 10.0.1 + 11.0 commons-io commons-io - 2.0.1 + 2.1 commons-pool commons-pool - 1.5.6 + 1.5.7 commons-collections diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java index be17dfc87..aacc9ee84 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java @@ -46,7 +46,7 @@ import com.l2jserver.util.ArrayIterator; import com.l2jserver.util.factory.CollectionFactory; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; -import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; +import com.orientechnologies.orient.core.query.nativ.OQueryContextNative; import com.orientechnologies.orient.core.record.impl.ODocument; /** @@ -392,7 +392,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService int rows = 0; while (iterator.hasNext()) { final T object = iterator.next(); - final ONativeSynchQuery> query = createQuery( + final ONativeSynchQuery query = createQuery( database, object); final ODocument document; if (query != null) { @@ -423,7 +423,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService * @return the prepared query. If null is returned a * insert query will be performed. */ - protected abstract ONativeSynchQuery> createQuery( + protected abstract ONativeSynchQuery createQuery( ODatabaseDocumentTx database, T object); /** @@ -515,7 +515,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService * * @return the prepared query */ - protected abstract ONativeSynchQuery> createQuery( + protected abstract ONativeSynchQuery createQuery( ODatabaseDocumentTx database); /** @@ -578,7 +578,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService * * @return the prepared query */ - protected abstract ONativeSynchQuery> createQuery( + protected abstract ONativeSynchQuery createQuery( ODatabaseDocumentTx database); /** diff --git a/l2jserver2-gameserver/pom.xml b/l2jserver2-gameserver/pom.xml index 3f0df8603..cdf49f95f 100644 --- a/l2jserver2-gameserver/pom.xml +++ b/l2jserver2-gameserver/pom.xml @@ -42,7 +42,7 @@ junit junit - 4.8.2 + 4.10 jar test @@ -51,14 +51,14 @@ org.jboss.netty netty - 3.2.4.Final + 3.2.7.Final org.slf4j slf4j-log4j12 - 1.6.1 + 1.6.4 jar runtime @@ -66,34 +66,34 @@ mysql mysql-connector-java - 5.1.16 + 5.1.18 jar runtime com.h2database h2 - 1.3.155 + 1.3.162 jar runtime org.apache.derby derby - 10.8.1.2 + 10.8.2.2 runtime com.orientechnologies orientdb-core - 1.0rc5 + 1.0rc7 jar net.sf.ehcache ehcache-core - 2.4.2 + 2.5.0 jar diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterDAO.java index 00f9b3c4e..f0f2c6b00 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterDAO.java @@ -50,7 +50,7 @@ import com.l2jserver.service.database.DatabaseService; import com.l2jserver.util.geometry.Point3D; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; -import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; +import com.orientechnologies.orient.core.query.nativ.OQueryContextNative; import com.orientechnologies.orient.core.record.impl.ODocument; /** @@ -200,18 +200,16 @@ public class OrientDBCharacterDAO extends public L2Character select(final CharacterID id) { return database.query(new SelectSingleQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(CHAR_ID).eq(id.getID()).go(); - }; + } }; } @@ -226,16 +224,14 @@ public class OrientDBCharacterDAO extends public Collection selectIDs() { return database.query(new SelectListQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return true; }; }; @@ -252,7 +248,7 @@ public class OrientDBCharacterDAO extends public int insertObjects(L2Character... objects) { return database.query(new InsertUpdateQuery(objects) { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database, L2Character object) { return null; } @@ -309,16 +305,14 @@ public class OrientDBCharacterDAO extends public int updateObjects(final L2Character... characters) { return database.query(new InsertUpdateQuery(characters) { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database, final L2Character character) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(CHAR_ID) .eq(character.getID().getID()).go(); }; @@ -376,16 +370,14 @@ public class OrientDBCharacterDAO extends public int deleteObjects(L2Character... objects) { return database.query(new InsertUpdateQuery(objects) { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database, final L2Character character) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(CHAR_ID) .eq(character.getID().getID()).go(); }; @@ -416,16 +408,14 @@ public class OrientDBCharacterDAO extends public L2Character selectByName(final String name) { return database.query(new SelectSingleQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(NAME).eq(name).go(); }; }; @@ -442,17 +432,16 @@ public class OrientDBCharacterDAO extends public List selectByAccount(final AccountID account) { return database.query(new SelectListQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { - return criteria.field(ACCOUNT_ID).eq(account.getID()).go(); + public boolean filter(OQueryContextNative criteria) { + return criteria.field(ACCOUNT_ID).eq(account.getID()) + .go(); }; }; } @@ -463,7 +452,7 @@ public class OrientDBCharacterDAO extends } }); } - + @Override protected L2Character[] wrap(Model... objects) { final L2Character[] array = new L2Character[objects.length]; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterFriendDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterFriendDAO.java index b36c4d62d..1da559596 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterFriendDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBCharacterFriendDAO.java @@ -38,7 +38,7 @@ import com.l2jserver.service.database.DatabaseService; import com.l2jserver.service.database.jdbc.JDBCCharacterDAO; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; -import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; +import com.orientechnologies.orient.core.query.nativ.OQueryContextNative; import com.orientechnologies.orient.core.record.impl.ODocument; /** @@ -115,16 +115,14 @@ public class OrientDBCharacterFriendDAO extends public CharacterFriend select(final FriendID id) { return database.query(new SelectSingleQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(CHAR_ID).eq(id.getID1().getID()) .field(CHAR_ID_FRIEND).eq(id.getID2().getID()) .go(); @@ -144,16 +142,14 @@ public class OrientDBCharacterFriendDAO extends final List list = database .query(new SelectListQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery( + database, CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(CHAR_ID) .eq(character.getID().getID()).go(); }; @@ -172,16 +168,14 @@ public class OrientDBCharacterFriendDAO extends public List selectIDs() { return database.query(new SelectListQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return true; }; }; @@ -198,7 +192,7 @@ public class OrientDBCharacterFriendDAO extends public int insertObjects(CharacterFriend... friends) { return database.query(new InsertUpdateQuery(friends) { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database, CharacterFriend object) { return null; } @@ -230,16 +224,14 @@ public class OrientDBCharacterFriendDAO extends public int deleteObjects(CharacterFriend... friends) { return database.query(new InsertUpdateQuery(friends) { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database, final CharacterFriend friend) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(CHAR_ID) .eq(friend.getCharacterID().getID()).and() .field(CHAR_ID_FRIEND) @@ -280,7 +272,7 @@ public class OrientDBCharacterFriendDAO extends } return true; } - + @Override protected CharacterFriend[] wrap(Model... objects) { final CharacterFriend[] array = new CharacterFriend[objects.length]; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBChatMessageDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBChatMessageDAO.java index 296f178e7..bd552ed14 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBChatMessageDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBChatMessageDAO.java @@ -38,7 +38,7 @@ import com.l2jserver.service.database.DatabaseService; import com.l2jserver.service.game.chat.ChatMessageType; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; -import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; +import com.orientechnologies.orient.core.query.nativ.OQueryContextNative; import com.orientechnologies.orient.core.record.impl.ODocument; /** @@ -132,16 +132,14 @@ public class OrientDBChatMessageDAO extends public ChatMessage select(final ChatMessageID id) { return database.query(new SelectSingleQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(MESSAGE_ID).eq(id.getID()).go(); }; }; @@ -158,16 +156,14 @@ public class OrientDBChatMessageDAO extends public List selectIDs() { return database.query(new SelectListQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return true; }; }; @@ -184,7 +180,7 @@ public class OrientDBChatMessageDAO extends public int insertObjects(ChatMessage... messages) { return database.query(new InsertUpdateQuery(messages) { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database, ChatMessage object) { return null; } @@ -226,16 +222,14 @@ public class OrientDBChatMessageDAO extends public int deleteObjects(ChatMessage... messages) { return database.query(new InsertUpdateQuery(messages) { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database, final ChatMessage message) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(MESSAGE_ID).eq(message.getID()) .and().go(); }; @@ -257,7 +251,7 @@ public class OrientDBChatMessageDAO extends } }); } - + @Override protected ChatMessage[] wrap(Model... objects) { final ChatMessage[] array = new ChatMessage[objects.length]; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBClanDAO.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBClanDAO.java index 9e6ea3364..078ae10a3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBClanDAO.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/database/orientdb/OrientDBClanDAO.java @@ -37,7 +37,7 @@ import com.l2jserver.service.database.AbstractOrientDatabaseService.SelectSingle import com.l2jserver.service.database.DatabaseService; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.query.nativ.ONativeSynchQuery; -import com.orientechnologies.orient.core.query.nativ.OQueryContextNativeSchema; +import com.orientechnologies.orient.core.query.nativ.OQueryContextNative; import com.orientechnologies.orient.core.record.impl.ODocument; /** @@ -111,16 +111,14 @@ public class OrientDBClanDAO extends AbstractOrientDBDAO public Clan select(final ClanID id) { return database.query(new SelectSingleQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(CLAN_ID).eq(id.getID()).go(); }; }; @@ -137,16 +135,14 @@ public class OrientDBClanDAO extends AbstractOrientDBDAO public List selectIDs() { return database.query(new SelectListQuery() { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return true; }; }; @@ -163,7 +159,7 @@ public class OrientDBClanDAO extends AbstractOrientDBDAO public int insertObjects(Clan... clans) { return database.query(new InsertUpdateQuery(clans) { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database, Clan object) { return null; } @@ -194,16 +190,14 @@ public class OrientDBClanDAO extends AbstractOrientDBDAO public int deleteObjects(Clan... clans) { return database.query(new InsertUpdateQuery(clans) { @Override - protected ONativeSynchQuery> createQuery( + protected ONativeSynchQuery createQuery( ODatabaseDocumentTx database, final Clan clan) { - return new ONativeSynchQuery>( - database, CLASS_NAME, - new OQueryContextNativeSchema()) { + return new ONativeSynchQuery(database, + CLASS_NAME, new OQueryContextNative()) { private static final long serialVersionUID = 1L; @Override - public boolean filter( - OQueryContextNativeSchema criteria) { + public boolean filter(OQueryContextNative criteria) { return criteria.field(CLAN_ID).eq(clan.getID()).go(); }; }; @@ -224,7 +218,7 @@ public class OrientDBClanDAO extends AbstractOrientDBDAO } }); } - + @Override protected Clan[] wrap(Model... objects) { final Clan[] array = new Clan[objects.length]; diff --git a/l2jserver2-loginserver/pom.xml b/l2jserver2-loginserver/pom.xml index ab059f907..0345e6ef4 100644 --- a/l2jserver2-loginserver/pom.xml +++ b/l2jserver2-loginserver/pom.xml @@ -22,26 +22,26 @@ junit junit - 4.8.2 + 4.10 jar test org.jboss.netty netty - 3.2.4.Final + 3.2.7.Final org.slf4j slf4j-log4j12 - 1.6.1 + 1.6.4 jar runtime mysql mysql-connector-java - 5.1.16 + 5.1.18 jar runtime diff --git a/l2jserver2-loginserver/src/main/java/com/l2jserver/ls/net/LoginServerChannelPipelineFactory.java b/l2jserver2-loginserver/src/main/java/com/l2jserver/ls/net/LoginServerChannelPipelineFactory.java index 3a3d22a95..4ce0f93d7 100644 --- a/l2jserver2-loginserver/src/main/java/com/l2jserver/ls/net/LoginServerChannelPipelineFactory.java +++ b/l2jserver2-loginserver/src/main/java/com/l2jserver/ls/net/LoginServerChannelPipelineFactory.java @@ -6,8 +6,6 @@ import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder; import org.jboss.netty.handler.codec.frame.LengthFieldPrepender; -import org.jboss.netty.handler.codec.serialization.ObjectDecoder; -import org.jboss.netty.handler.codec.serialization.ObjectEncoder; import com.l2jserver.service.gameserver.GameServerNetworkService; @@ -30,8 +28,8 @@ public class LoginServerChannelPipelineFactory implements pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder( 1048576, 0, 4, 0, 4)); - pipeline.addLast("encoder", new ObjectEncoder()); - pipeline.addLast("decoder", new ObjectDecoder()); + // pipeline.addLast("encoder", new ObjectEncoder()); + // pipeline.addLast("decoder", new ObjectDecoder()); return null; } diff --git a/pom.xml b/pom.xml index 952a11af8..42171b827 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ junit junit - 4.8.2 + 4.10 jar test