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());

3
l2jserver2-gameserver/data/template/npc.xsd
View File

@@ -276,7 +276,8 @@
<xs:element name="skill" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence />
<xs:attribute name="id" type="skill:SkillTemplateID" use="required" />
<xs:attribute name="id" type="skill:SkillTemplateID"
use="required" />
<xs:attribute name="level" type="xs:int" use="required" />
</xs:complexType>
</xs:element>

3
l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml
View File

@@ -55,12 +55,11 @@
<version>0.5.3</version>
</plugin>
</plugins>
<!-- <removeOldOutput>true</removeOldOutput> -->
<args>
<arg>-extension</arg>
<arg>-Xinheritance</arg>
</args>
<schemaDirectory>data/template</schemaDirectory>
<schemaDirectory>${project.parent.basedir}/data/template</schemaDirectory>
<schemaIncludes>
<include>*.xsd</include>
</schemaIncludes>

72
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode
View File

@@ -2,26 +2,48 @@
<jaxb:bindings version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb">
<!--
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
Any modifications to this file will be lost upon recompilation of the source schema.
Generated on: 2012.01.19 at 03:37:11 PM BRST
Generated on: 2012.03.25 at 10:36:48 AM BRT
-->
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/skill">
<jaxb:schemaBindings map="false"/>
<jaxb:bindings scd="tns:skill">
<jaxb:class ref="com.l2jserver.model.template.SkillTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/character">
<jaxb:schemaBindings map="false"/>
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:character">
<jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/item">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:item">
<jaxb:class ref="com.l2jserver.model.template.ItemTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/skill">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:skill">
<jaxb:class ref="com.l2jserver.model.template.SkillTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/npc">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:npc">
<jaxb:class ref="com.l2jserver.model.template.NPCTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::">
<jaxb:schemaBindings map="false"/>
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="~CalculatorFunction">
<jaxb:class ref="com.l2jserver.model.template.CalculatorFunction"/>
</jaxb:bindings>
@@ -38,26 +60,10 @@ Generated on: 2012.01.19 at 03:37:11 PM BRST
<jaxb:class ref="com.l2jserver.model.template.CalculatorFunctionOperation"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/teleport">
<jaxb:schemaBindings map="false"/>
<jaxb:bindings scd="tns:teleports">
<jaxb:class ref="com.l2jserver.model.template.Teleports"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/item">
<jaxb:schemaBindings map="false"/>
<jaxb:bindings scd="tns:item">
<jaxb:class ref="com.l2jserver.model.template.ItemTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/npc">
<jaxb:schemaBindings map="false"/>
<jaxb:bindings scd="tns:npc">
<jaxb:class ref="com.l2jserver.model.template.NPCTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="zones">
<jaxb:schemaBindings map="false"/>
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:zones">
<jaxb:class ref="com.l2jserver.model.template.Zones"/>
</jaxb:bindings>
@@ -65,5 +71,13 @@ Generated on: 2012.01.19 at 03:37:11 PM BRST
<jaxb:class ref="com.l2jserver.model.template.ZoneType"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/teleport">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:teleports">
<jaxb:class ref="com.l2jserver.model.template.Teleports"/>
</jaxb:bindings>
</jaxb:bindings>
</jaxb:bindings>

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//

5
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java
View File

@@ -1,15 +1,14 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//
package com.l2jserver.model.template;
import java.math.BigInteger;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;

5
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//
@@ -15,7 +15,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.CharacterTemplateID;
import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//

5
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//
@@ -16,7 +16,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.ItemTemplateID;
import com.l2jserver.model.template.item.ArmorType;
import com.l2jserver.model.template.item.ItemMaterial;

6
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//
@@ -10,7 +10,6 @@ package com.l2jserver.model.template;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -20,7 +19,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.ItemTemplateID;
import com.l2jserver.model.id.template.NPCTemplateID;
import com.l2jserver.model.id.template.SkillTemplateID;

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//

5
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//
@@ -14,7 +14,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.SkillTemplateID;
import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;

6
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//
@@ -10,7 +10,6 @@ package com.l2jserver.model.template;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -18,7 +17,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.TeleportationTemplateID;
import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;

5
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//
@@ -10,7 +10,6 @@ package com.l2jserver.model.template;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;

4
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java
View File

@@ -1,8 +1,8 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST
// Generated on: 2012.03.25 at 10:36:48 AM BRT
//

2
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java
View File

@@ -149,7 +149,7 @@ public class FreyaLineage2Client implements Lineage2Client {
* @param version
* the protocol version to test for support
* @return true if version is supported by the client
* @see com.l2jserver.service.network.model.net.ProtocolVersion#supports(com.l2jserver.service.network.model.net.ProtocolVersion)
* @see ProtocolVersion#supports(ProtocolVersion)
*/
public boolean supports(ProtocolVersion version) {
if (version == null)