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 dependencies to latest versions

Browse Source
This commit is contained in:
Rogiel Sulzbach
2012-03-25 10:41:02 -03:00
parent ef39f3c67e
commit ed2b948dac
20 changed files with 8351 additions and 8346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
l2jserver2-common/pom.xml
View File

@@ -86,7 +86,7 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<version>2.5.0</version>
<version>2.5.1</version>
<scope>compile</scope>
</dependency>
<!-- utils -->
@@ -99,7 +99,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>11.0</version>
<version>11.0.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -111,7 +111,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.7</version>
<version>1.6</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -130,7 +130,7 @@
<dependency>
<groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-sql</artifactId>
<version>2.3.0</version>
<version>2.3.3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -143,19 +143,19 @@
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orient-commons</artifactId>
<version>1.0rc7</version>
<version>1.0rc8</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId>
<version>1.0rc7</version>
<version>1.0rc8</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.162</version>
<version>1.3.165</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -168,25 +168,25 @@
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-kernel</artifactId>
<version>7.4.3</version>
<version>7.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-driver-zip</artifactId>
<version>7.4.3</version>
<version>7.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-driver-file</artifactId>
<version>7.4.3</version>
<version>7.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-path</artifactId>
<version>7.4.3</version>
<version>7.5</version>
<scope>compile</scope>
</dependency>
</dependencies>

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

@@ -270,7 +270,7 @@ public abstract class AbstractOrientDatabaseService extends
CSVUtils.parseCSV(path, new CSVMapProcessor<Object>() {
@Override
public Object process(Map<String, String> map) {
final ODocument document = new ODocument(database, entity
final ODocument document = new ODocument(entity
.getTableName());
for (final Entry<String, String> entry : map.entrySet()) {
document.field(entry.getKey(), entry.getValue());
@@ -602,7 +602,7 @@ public abstract class AbstractOrientDatabaseService extends
if (testDesire(object))
continue;
row.setDocument(new ODocument(database, entity.getTableName()));
row.setDocument(new ODocument(entity.getTableName()));
mapper.insert(entity, object, row);

4
l2jserver2-common/src/main/java/com/l2jserver/service/database/sql/AbstractSQLDatabaseService.java
View File

@@ -133,7 +133,7 @@ public abstract class AbstractSQLDatabaseService extends
/**
* The database connection pool
*/
private GenericObjectPool connectionPool;
private GenericObjectPool<Connection> connectionPool;
/**
* The dayabase connection factory
*/
@@ -200,7 +200,7 @@ public abstract class AbstractSQLDatabaseService extends
"DatabaseEngine instance not found", e);
}
connectionPool = new GenericObjectPool(null);
connectionPool = new GenericObjectPool<Connection>(null);
connectionPool.setMaxActive(config.getMaxActiveConnections());
connectionPool.setMinIdle(config.getMinIdleConnections());
connectionPool.setMaxIdle(config.getMaxIdleConnections());