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

Updates dependency versions

Browse Source
This commit is contained in:
Rogiel Sulzbach
2011-12-21 11:43:14 -02:00
parent 9f85cffe85
commit 84033a0bb9
10 changed files with 106 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
l2jserver2-common/pom.xml
View File

@@ -23,7 +23,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
<version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.6.1</version>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -76,13 +76,13 @@
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId>
<version>1.0rc5</version>
<version>1.0rc7</version>
</dependency>
<!-- cache -->
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<version>2.4.2</version>
<version>2.5.0</version>
</dependency>
<!-- utils -->
<dependency>
@@ -93,17 +93,17 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>10.0.1</version>
<version>11.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
<version>2.1</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.6</version>
<version>1.5.7</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>

10
l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java
View File

@@ -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<ODocument, OQueryContextNativeSchema<ODocument>> query = createQuery(
final ONativeSynchQuery<OQueryContextNative> query = createQuery(
database, object);
final ODocument document;
if (query != null) {
@@ -423,7 +423,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService
* @return the <b>prepared</b> query. If <tt>null</tt> is returned a
* insert query will be performed.
*/
protected abstract ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery(
protected abstract ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database, T object);
/**
@@ -515,7 +515,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService
*
* @return the <b>prepared</b> query
*/
protected abstract ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery(
protected abstract ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database);
/**
@@ -578,7 +578,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService
*
* @return the <b>prepared</b> query
*/
protected abstract ONativeSynchQuery<ODocument, OQueryContextNativeSchema<ODocument>> createQuery(
protected abstract ONativeSynchQuery<OQueryContextNative> createQuery(
ODatabaseDocumentTx database);
/**