Implements server version modularization

Now each server server has an maven module which implements changes to
the default behavior within the "core" gameserver module. This allows to
keep multiple server versions without the need of several branches and
with little code duplication.

l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml

@@ -0,0 +1,75 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>l2jserver2-gameserver</artifactId>
+		<groupId>com.l2jserver</groupId>
+		<version>0.0.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>l2jserver2-gameserver-core</artifactId>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<ignoreMissingDescriptor>true</ignoreMissingDescriptor>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>src/main/generated</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.jvnet.jaxb2.maven2</groupId>
+				<artifactId>maven-jaxb2-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<plugins>
+								<plugin>
+									<groupId>org.jvnet.jaxb2_commons</groupId>
+									<artifactId>jaxb2-basics</artifactId>
+									<version>0.5.3</version>
+								</plugin>
+							</plugins>
+							<!-- <removeOldOutput>true</removeOldOutput> -->
+							<args>
+								<arg>-extension</arg>
+								<arg>-Xinheritance</arg>
+							</args>
+							<schemaDirectory>data/template</schemaDirectory>
+							<schemaIncludes>
+								<include>*.xsd</include>
+							</schemaIncludes>
+							<generateDirectory>src/main/generated</generateDirectory>
+							<generatePackage>com.l2jserver.model.template</generatePackage>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<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 
+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 
+
+  -->
+  <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:bindings scd="tns:character">
+      <jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/>
+    </jaxb:bindings>
+  </jaxb:bindings>
+  <jaxb:bindings scd="x-schema::">
+    <jaxb:schemaBindings map="false"/>
+    <jaxb:bindings scd="~CalculatorFunction">
+      <jaxb:class ref="com.l2jserver.model.template.CalculatorFunction"/>
+    </jaxb:bindings>
+    <jaxb:bindings scd="~AbstractTemplate">
+      <jaxb:class ref="com.l2jserver.model.template.AbstractTemplate"/>
+    </jaxb:bindings>
+    <jaxb:bindings scd="~Coordinate">
+      <jaxb:class ref="com.l2jserver.model.template.Coordinate"/>
+    </jaxb:bindings>
+    <jaxb:bindings scd="~ActorTemplate">
+      <jaxb:class ref="com.l2jserver.model.template.ActorTemplate"/>
+    </jaxb:bindings>
+    <jaxb:bindings scd="~CalculatorFunctionOperation">
+      <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:bindings scd="tns:zones">
+      <jaxb:class ref="com.l2jserver.model.template.Zones"/>
+    </jaxb:bindings>
+    <jaxb:bindings scd="~tns:ZoneType">
+      <jaxb:class ref="com.l2jserver.model.template.ZoneType"/>
+    </jaxb:bindings>
+  </jaxb:bindings>
+</jaxb:bindings>
+

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

@@ -0,0 +1,48 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+package com.l2jserver.model.template;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for AbstractTemplate complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AbstractTemplate">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AbstractTemplate")
+@XmlSeeAlso({
+    ItemTemplate.class,
+    ActorTemplate.class,
+    SkillTemplate.class,
+    com.l2jserver.model.template.Teleports.Teleport.class
+})
+public abstract class AbstractTemplate
+    implements Template
+{
+
+
+}

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

@@ -0,0 +1,44 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+package com.l2jserver.model.template;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ActorTemplate complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ActorTemplate">
+ *   &lt;complexContent>
+ *     &lt;extension base="{}AbstractTemplate">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ActorTemplate")
+@XmlSeeAlso({
+    CharacterTemplate.class,
+    NPCTemplate.class
+})
+public abstract class ActorTemplate
+    extends AbstractTemplate
+{
+
+
+}

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

@@ -0,0 +1,148 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+package com.l2jserver.model.template;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for CalculatorFunction complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CalculatorFunction">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="set" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *         &lt;element name="add" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *         &lt;element name="subtract" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *         &lt;element name="random" type="{}CalculatorFunctionOperation" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CalculatorFunction", propOrder = {
+    "set",
+    "add",
+    "subtract",
+    "random"
+})
+public class CalculatorFunction {
+
+    protected CalculatorFunctionOperation set;
+    protected CalculatorFunctionOperation add;
+    protected CalculatorFunctionOperation subtract;
+    protected CalculatorFunctionOperation random;
+
+    /**
+     * Gets the value of the set property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CalculatorFunctionOperation }
+     *     
+     */
+    public CalculatorFunctionOperation getSet() {
+        return set;
+    }
+
+    /**
+     * Sets the value of the set property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CalculatorFunctionOperation }
+     *     
+     */
+    public void setSet(CalculatorFunctionOperation value) {
+        this.set = value;
+    }
+
+    /**
+     * Gets the value of the add property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CalculatorFunctionOperation }
+     *     
+     */
+    public CalculatorFunctionOperation getAdd() {
+        return add;
+    }
+
+    /**
+     * Sets the value of the add property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CalculatorFunctionOperation }
+     *     
+     */
+    public void setAdd(CalculatorFunctionOperation value) {
+        this.add = value;
+    }
+
+    /**
+     * Gets the value of the subtract property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CalculatorFunctionOperation }
+     *     
+     */
+    public CalculatorFunctionOperation getSubtract() {
+        return subtract;
+    }
+
+    /**
+     * Sets the value of the subtract property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CalculatorFunctionOperation }
+     *     
+     */
+    public void setSubtract(CalculatorFunctionOperation value) {
+        this.subtract = value;
+    }
+
+    /**
+     * Gets the value of the random property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CalculatorFunctionOperation }
+     *     
+     */
+    public CalculatorFunctionOperation getRandom() {
+        return random;
+    }
+
+    /**
+     * Sets the value of the random property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CalculatorFunctionOperation }
+     *     
+     */
+    public void setRandom(CalculatorFunctionOperation value) {
+        this.random = value;
+    }
+
+}

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

@@ -0,0 +1,86 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+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;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for CalculatorFunctionOperation complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CalculatorFunctionOperation">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CalculatorFunctionOperation")
+public class CalculatorFunctionOperation {
+
+    @XmlAttribute(name = "order", required = true)
+    protected BigInteger order;
+    @XmlAttribute(name = "value", required = true)
+    protected double value;
+
+    /**
+     * Gets the value of the order property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getOrder() {
+        return order;
+    }
+
+    /**
+     * Sets the value of the order property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setOrder(BigInteger value) {
+        this.order = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     */
+    public double getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     */
+    public void setValue(double value) {
+        this.value = value;
+    }
+
+}

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

@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+package com.l2jserver.model.template;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Coordinate complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Coordinate">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *       &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;attribute name="z" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Coordinate")
+public class Coordinate {
+
+    @XmlAttribute(name = "x", required = true)
+    protected int x;
+    @XmlAttribute(name = "y", required = true)
+    protected int y;
+    @XmlAttribute(name = "z", required = true)
+    protected int z;
+
+    /**
+     * Gets the value of the x property.
+     * 
+     */
+    public int getX() {
+        return x;
+    }
+
+    /**
+     * Sets the value of the x property.
+     * 
+     */
+    public void setX(int value) {
+        this.x = value;
+    }
+
+    /**
+     * Gets the value of the y property.
+     * 
+     */
+    public int getY() {
+        return y;
+    }
+
+    /**
+     * Sets the value of the y property.
+     * 
+     */
+    public void setY(int value) {
+        this.y = value;
+    }
+
+    /**
+     * Gets the value of the z property.
+     * 
+     */
+    public int getZ() {
+        return z;
+    }
+
+    /**
+     * Sets the value of the z property.
+     * 
+     */
+    public void setZ(int value) {
+        this.z = value;
+    }
+
+}

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

@@ -0,0 +1,535 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+package com.l2jserver.model.template;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the com.l2jserver.model.template package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.l2jserver.model.template
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate }
+     * 
+     */
+    public NPCTemplate createNPCTemplate() {
+        return new NPCTemplate();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Droplist }
+     * 
+     */
+    public NPCTemplate.Droplist createNPCTemplateDroplist() {
+        return new NPCTemplate.Droplist();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Droplist.Item }
+     * 
+     */
+    public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() {
+        return new NPCTemplate.Droplist.Item();
+    }
+
+    /**
+     * Create an instance of {@link Teleports }
+     * 
+     */
+    public Teleports createTeleports() {
+        return new Teleports();
+    }
+
+    /**
+     * Create an instance of {@link Zones }
+     * 
+     */
+    public Zones createZones() {
+        return new Zones();
+    }
+
+    /**
+     * Create an instance of {@link ZoneType }
+     * 
+     */
+    public ZoneType createZoneType() {
+        return new ZoneType();
+    }
+
+    /**
+     * Create an instance of {@link Zones.Castle }
+     * 
+     */
+    public Zones.Castle createZonesCastle() {
+        return new Zones.Castle();
+    }
+
+    /**
+     * Create an instance of {@link Teleports.Teleport }
+     * 
+     */
+    public Teleports.Teleport createTeleportsTeleport() {
+        return new Teleports.Teleport();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Skills }
+     * 
+     */
+    public NPCTemplate.Skills createNPCTemplateSkills() {
+        return new NPCTemplate.Skills();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Talk }
+     * 
+     */
+    public NPCTemplate.Talk createNPCTemplateTalk() {
+        return new NPCTemplate.Talk();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info }
+     * 
+     */
+    public NPCTemplate.Info createNPCTemplateInfo() {
+        return new NPCTemplate.Info();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats }
+     * 
+     */
+    public NPCTemplate.Info.Stats createNPCTemplateInfoStats() {
+        return new NPCTemplate.Info.Stats();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Defense }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() {
+        return new NPCTemplate.Info.Stats.Defense();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Attack }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() {
+        return new NPCTemplate.Info.Stats.Attack();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate }
+     * 
+     */
+    public ItemTemplate createItemTemplate() {
+        return new ItemTemplate();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate.Armor }
+     * 
+     */
+    public ItemTemplate.Armor createItemTemplateArmor() {
+        return new ItemTemplate.Armor();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate.Attributes }
+     * 
+     */
+    public ItemTemplate.Attributes createItemTemplateAttributes() {
+        return new ItemTemplate.Attributes();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate }
+     * 
+     */
+    public CharacterTemplate createCharacterTemplate() {
+        return new CharacterTemplate();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Collision }
+     * 
+     */
+    public CharacterTemplate.Collision createCharacterTemplateCollision() {
+        return new CharacterTemplate.Collision();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats }
+     * 
+     */
+    public CharacterTemplate.Stats createCharacterTemplateStats() {
+        return new CharacterTemplate.Stats();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Defense }
+     * 
+     */
+    public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() {
+        return new CharacterTemplate.Stats.Defense();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Attack }
+     * 
+     */
+    public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() {
+        return new CharacterTemplate.Stats.Attack();
+    }
+
+    /**
+     * Create an instance of {@link CalculatorFunction }
+     * 
+     */
+    public CalculatorFunction createCalculatorFunction() {
+        return new CalculatorFunction();
+    }
+
+    /**
+     * Create an instance of {@link Coordinate }
+     * 
+     */
+    public Coordinate createCoordinate() {
+        return new Coordinate();
+    }
+
+    /**
+     * Create an instance of {@link CalculatorFunctionOperation }
+     * 
+     */
+    public CalculatorFunctionOperation createCalculatorFunctionOperation() {
+        return new CalculatorFunctionOperation();
+    }
+
+    /**
+     * Create an instance of {@link SkillTemplate }
+     * 
+     */
+    public SkillTemplate createSkillTemplate() {
+        return new SkillTemplate();
+    }
+
+    /**
+     * Create an instance of {@link ZoneType.Point }
+     * 
+     */
+    public ZoneType.Point createZoneTypePoint() {
+        return new ZoneType.Point();
+    }
+
+    /**
+     * Create an instance of {@link Zones.Castle.Siege }
+     * 
+     */
+    public Zones.Castle.Siege createZonesCastleSiege() {
+        return new Zones.Castle.Siege();
+    }
+
+    /**
+     * Create an instance of {@link Teleports.Teleport.Restrictions }
+     * 
+     */
+    public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() {
+        return new Teleports.Teleport.Restrictions();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Ai }
+     * 
+     */
+    public NPCTemplate.Ai createNPCTemplateAi() {
+        return new NPCTemplate.Ai();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Skills.Skill }
+     * 
+     */
+    public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() {
+        return new NPCTemplate.Skills.Skill();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Talk.Chat }
+     * 
+     */
+    public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() {
+        return new NPCTemplate.Talk.Chat();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Name }
+     * 
+     */
+    public NPCTemplate.Info.Name createNPCTemplateInfoName() {
+        return new NPCTemplate.Info.Name();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Title }
+     * 
+     */
+    public NPCTemplate.Info.Title createNPCTemplateInfoTitle() {
+        return new NPCTemplate.Info.Title();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Item }
+     * 
+     */
+    public NPCTemplate.Info.Item createNPCTemplateInfoItem() {
+        return new NPCTemplate.Info.Item();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Collision }
+     * 
+     */
+    public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() {
+        return new NPCTemplate.Info.Collision();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Hp }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() {
+        return new NPCTemplate.Info.Stats.Hp();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Mp }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() {
+        return new NPCTemplate.Info.Stats.Mp();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Move }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() {
+        return new NPCTemplate.Info.Stats.Move();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Base }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() {
+        return new NPCTemplate.Info.Stats.Base();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() {
+        return new NPCTemplate.Info.Stats.Defense.Physical();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() {
+        return new NPCTemplate.Info.Stats.Defense.Magical();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() {
+        return new NPCTemplate.Info.Stats.Attack.Physical();
+    }
+
+    /**
+     * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical }
+     * 
+     */
+    public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() {
+        return new NPCTemplate.Info.Stats.Attack.Magical();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate.Controller }
+     * 
+     */
+    public ItemTemplate.Controller createItemTemplateController() {
+        return new ItemTemplate.Controller();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate.Effect }
+     * 
+     */
+    public ItemTemplate.Effect createItemTemplateEffect() {
+        return new ItemTemplate.Effect();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate.EtcItem }
+     * 
+     */
+    public ItemTemplate.EtcItem createItemTemplateEtcItem() {
+        return new ItemTemplate.EtcItem();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate.Weapon }
+     * 
+     */
+    public ItemTemplate.Weapon createItemTemplateWeapon() {
+        return new ItemTemplate.Weapon();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate.Armor.Cost }
+     * 
+     */
+    public ItemTemplate.Armor.Cost createItemTemplateArmorCost() {
+        return new ItemTemplate.Armor.Cost();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate.Armor.Equipment }
+     * 
+     */
+    public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() {
+        return new ItemTemplate.Armor.Equipment();
+    }
+
+    /**
+     * Create an instance of {@link ItemTemplate.Attributes.Cost }
+     * 
+     */
+    public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() {
+        return new ItemTemplate.Attributes.Cost();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Collision.Male }
+     * 
+     */
+    public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() {
+        return new CharacterTemplate.Collision.Male();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Collision.Female }
+     * 
+     */
+    public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() {
+        return new CharacterTemplate.Collision.Female();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Hp }
+     * 
+     */
+    public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() {
+        return new CharacterTemplate.Stats.Hp();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Mp }
+     * 
+     */
+    public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() {
+        return new CharacterTemplate.Stats.Mp();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Cp }
+     * 
+     */
+    public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() {
+        return new CharacterTemplate.Stats.Cp();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Move }
+     * 
+     */
+    public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() {
+        return new CharacterTemplate.Stats.Move();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Base }
+     * 
+     */
+    public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() {
+        return new CharacterTemplate.Stats.Base();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Defense.Physical }
+     * 
+     */
+    public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() {
+        return new CharacterTemplate.Stats.Defense.Physical();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Defense.Magical }
+     * 
+     */
+    public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() {
+        return new CharacterTemplate.Stats.Defense.Magical();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Attack.Physical }
+     * 
+     */
+    public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() {
+        return new CharacterTemplate.Stats.Attack.Physical();
+    }
+
+    /**
+     * Create an instance of {@link CharacterTemplate.Stats.Attack.Magical }
+     * 
+     */
+    public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() {
+        return new CharacterTemplate.Stats.Attack.Magical();
+    }
+
+}

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

@@ -0,0 +1,163 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+package com.l2jserver.model.template;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+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;
+
+
+/**
+ * <p>Java class for skill element declaration.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;element name="skill">
+ *   &lt;complexType>
+ *     &lt;complexContent>
+ *       &lt;extension base="{}AbstractTemplate">
+ *         &lt;sequence>
+ *           &lt;element name="maximumLevel" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         &lt;/sequence>
+ *         &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+ *         &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         &lt;attribute name="delay" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *         &lt;attribute name="cooldown" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;/extension>
+ *     &lt;/complexContent>
+ *   &lt;/complexType>
+ * &lt;/element>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "maximumLevel"
+})
+@XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill")
+public class SkillTemplate
+    extends AbstractTemplate
+{
+
+    protected int maximumLevel;
+    @XmlAttribute(name = "id", required = true)
+    @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
+    protected SkillTemplateID id;
+    @XmlAttribute(name = "name", required = true)
+    protected String name;
+    @XmlAttribute(name = "delay", required = true)
+    protected int delay;
+    @XmlAttribute(name = "cooldown", required = true)
+    protected int cooldown;
+
+    /**
+     * Gets the value of the maximumLevel property.
+     * 
+     */
+    public int getMaximumLevel() {
+        return maximumLevel;
+    }
+
+    /**
+     * Sets the value of the maximumLevel property.
+     * 
+     */
+    public void setMaximumLevel(int value) {
+        this.maximumLevel = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public SkillTemplateID getID() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setID(SkillTemplateID value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the delay property.
+     * 
+     */
+    public int getDelay() {
+        return delay;
+    }
+
+    /**
+     * Sets the value of the delay property.
+     * 
+     */
+    public void setDelay(int value) {
+        this.delay = value;
+    }
+
+    /**
+     * Gets the value of the cooldown property.
+     * 
+     */
+    public int getCooldown() {
+        return cooldown;
+    }
+
+    /**
+     * Sets the value of the cooldown property.
+     * 
+     */
+    public void setCooldown(int value) {
+        this.cooldown = value;
+    }
+
+}

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

@@ -0,0 +1,381 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+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;
+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;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="teleport" maxOccurs="unbounded">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;extension base="{}AbstractTemplate">
+ *                 &lt;sequence>
+ *                   &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
+ *                   &lt;element name="restrictions" minOccurs="0">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="restriction" maxOccurs="unbounded">
+ *                               &lt;simpleType>
+ *                                 &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   &lt;enumeration value="NOBLE"/>
+ *                                 &lt;/restriction>
+ *                               &lt;/simpleType>
+ *                             &lt;/element>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                 &lt;/sequence>
+ *                 &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
+ *                 &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                 &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *               &lt;/extension>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "teleport"
+})
+@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
+public class Teleports {
+
+    @XmlElement(required = true)
+    protected List<Teleports.Teleport> teleport;
+
+    /**
+     * Gets the value of the teleport property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the teleport property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTeleport().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Teleports.Teleport }
+     * 
+     * 
+     */
+    public List<Teleports.Teleport> getTeleport() {
+        if (teleport == null) {
+            teleport = new ArrayList<Teleports.Teleport>();
+        }
+        return this.teleport;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * 
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * 
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;extension base="{}AbstractTemplate">
+     *       &lt;sequence>
+     *         &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
+     *         &lt;element name="restrictions" minOccurs="0">
+     *           &lt;complexType>
+     *             &lt;complexContent>
+     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 &lt;sequence>
+     *                   &lt;element name="restriction" maxOccurs="unbounded">
+     *                     &lt;simpleType>
+     *                       &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         &lt;enumeration value="NOBLE"/>
+     *                       &lt;/restriction>
+     *                     &lt;/simpleType>
+     *                   &lt;/element>
+     *                 &lt;/sequence>
+     *               &lt;/restriction>
+     *             &lt;/complexContent>
+     *           &lt;/complexType>
+     *         &lt;/element>
+     *       &lt;/sequence>
+     *       &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
+     *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *     &lt;/extension>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {
+        "point",
+        "restrictions"
+    })
+    public static class Teleport
+        extends AbstractTemplate
+    {
+
+        protected Coordinate point;
+        protected Teleports.Teleport.Restrictions restrictions;
+        @XmlAttribute(name = "id", required = true)
+        @XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
+        protected TeleportationTemplateID id;
+        @XmlAttribute(name = "name")
+        protected String name;
+        @XmlAttribute(name = "item")
+        protected Integer item;
+        @XmlAttribute(name = "price", required = true)
+        protected int price;
+
+        /**
+         * Gets the value of the point property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Coordinate }
+         *     
+         */
+        public Coordinate getPoint() {
+            return point;
+        }
+
+        /**
+         * Sets the value of the point property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Coordinate }
+         *     
+         */
+        public void setPoint(Coordinate value) {
+            this.point = value;
+        }
+
+        /**
+         * Gets the value of the restrictions property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Teleports.Teleport.Restrictions }
+         *     
+         */
+        public Teleports.Teleport.Restrictions getRestrictions() {
+            return restrictions;
+        }
+
+        /**
+         * Sets the value of the restrictions property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Teleports.Teleport.Restrictions }
+         *     
+         */
+        public void setRestrictions(Teleports.Teleport.Restrictions value) {
+            this.restrictions = value;
+        }
+
+        /**
+         * Gets the value of the id property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public TeleportationTemplateID getID() {
+            return id;
+        }
+
+        /**
+         * Sets the value of the id property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setID(TeleportationTemplateID value) {
+            this.id = value;
+        }
+
+        /**
+         * Gets the value of the name property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getName() {
+            return name;
+        }
+
+        /**
+         * Sets the value of the name property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setName(String value) {
+            this.name = value;
+        }
+
+        /**
+         * Gets the value of the item property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Integer }
+         *     
+         */
+        public Integer getItem() {
+            return item;
+        }
+
+        /**
+         * Sets the value of the item property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Integer }
+         *     
+         */
+        public void setItem(Integer value) {
+            this.item = value;
+        }
+
+        /**
+         * Gets the value of the price property.
+         * 
+         */
+        public int getPrice() {
+            return price;
+        }
+
+        /**
+         * Sets the value of the price property.
+         * 
+         */
+        public void setPrice(int value) {
+            this.price = value;
+        }
+
+
+        /**
+         * <p>Java class for anonymous complex type.
+         * 
+         * <p>The following schema fragment specifies the expected content contained within this class.
+         * 
+         * <pre>
+         * &lt;complexType>
+         *   &lt;complexContent>
+         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       &lt;sequence>
+         *         &lt;element name="restriction" maxOccurs="unbounded">
+         *           &lt;simpleType>
+         *             &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               &lt;enumeration value="NOBLE"/>
+         *             &lt;/restriction>
+         *           &lt;/simpleType>
+         *         &lt;/element>
+         *       &lt;/sequence>
+         *     &lt;/restriction>
+         *   &lt;/complexContent>
+         * &lt;/complexType>
+         * </pre>
+         * 
+         * 
+         */
+        @XmlAccessorType(XmlAccessType.FIELD)
+        @XmlType(name = "", propOrder = {
+            "restriction"
+        })
+        public static class Restrictions {
+
+            @XmlElement(required = true)
+            protected List<String> restriction;
+
+            /**
+             * Gets the value of the restriction property.
+             * 
+             * <p>
+             * This accessor method returns a reference to the live list,
+             * not a snapshot. Therefore any modification you make to the
+             * returned list will be present inside the JAXB object.
+             * This is why there is not a <CODE>set</CODE> method for the restriction property.
+             * 
+             * <p>
+             * For example, to add a new item, do as follows:
+             * <pre>
+             *    getRestriction().add(newItem);
+             * </pre>
+             * 
+             * 
+             * <p>
+             * Objects of the following type(s) are allowed in the list
+             * {@link String }
+             * 
+             * 
+             */
+            public List<String> getRestriction() {
+                if (restriction == null) {
+                    restriction = new ArrayList<String>();
+                }
+                return this.restriction;
+            }
+
+        }
+
+    }
+
+}

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

@@ -0,0 +1,180 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+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;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ZoneType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="point" maxOccurs="unbounded">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                 &lt;/sequence>
+ *                 &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                 &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneType", namespace = "zones", propOrder = {
+    "point"
+})
+public class ZoneType {
+
+    @XmlElement(required = true)
+    protected List<ZoneType.Point> point;
+    @XmlAttribute(name = "id", required = true)
+    protected String id;
+
+    /**
+     * Gets the value of the point property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the point property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPoint().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ZoneType.Point }
+     * 
+     * 
+     */
+    public List<ZoneType.Point> getPoint() {
+        if (point == null) {
+            point = new ArrayList<ZoneType.Point>();
+        }
+        return this.point;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * 
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * 
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;sequence>
+     *       &lt;/sequence>
+     *       &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "")
+    public static class Point {
+
+        @XmlAttribute(name = "x", required = true)
+        protected int x;
+        @XmlAttribute(name = "y", required = true)
+        protected int y;
+
+        /**
+         * Gets the value of the x property.
+         * 
+         */
+        public int getX() {
+            return x;
+        }
+
+        /**
+         * Sets the value of the x property.
+         * 
+         */
+        public void setX(int value) {
+            this.x = value;
+        }
+
+        /**
+         * Gets the value of the y property.
+         * 
+         */
+        public int getY() {
+            return y;
+        }
+
+        /**
+         * Sets the value of the y property.
+         * 
+         */
+        public void setY(int value) {
+            this.y = value;
+        }
+
+    }
+
+}

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

@@ -0,0 +1,211 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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 
+//
+
+
+package com.l2jserver.model.template;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="castle">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="siege">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="zone" type="{zones}ZoneType"/>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "castle"
+})
+@XmlRootElement(name = "zones", namespace = "zones")
+public class Zones {
+
+    @XmlElement(required = true)
+    protected Zones.Castle castle;
+
+    /**
+     * Gets the value of the castle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Zones.Castle }
+     *     
+     */
+    public Zones.Castle getCastle() {
+        return castle;
+    }
+
+    /**
+     * Sets the value of the castle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Zones.Castle }
+     *     
+     */
+    public void setCastle(Zones.Castle value) {
+        this.castle = value;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * 
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * 
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;sequence>
+     *         &lt;element name="siege">
+     *           &lt;complexType>
+     *             &lt;complexContent>
+     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 &lt;sequence>
+     *                   &lt;element name="zone" type="{zones}ZoneType"/>
+     *                 &lt;/sequence>
+     *               &lt;/restriction>
+     *             &lt;/complexContent>
+     *           &lt;/complexType>
+     *         &lt;/element>
+     *       &lt;/sequence>
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {
+        "siege"
+    })
+    public static class Castle {
+
+        @XmlElement(required = true)
+        protected Zones.Castle.Siege siege;
+
+        /**
+         * Gets the value of the siege property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Zones.Castle.Siege }
+         *     
+         */
+        public Zones.Castle.Siege getSiege() {
+            return siege;
+        }
+
+        /**
+         * Sets the value of the siege property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Zones.Castle.Siege }
+         *     
+         */
+        public void setSiege(Zones.Castle.Siege value) {
+            this.siege = value;
+        }
+
+
+        /**
+         * <p>Java class for anonymous complex type.
+         * 
+         * <p>The following schema fragment specifies the expected content contained within this class.
+         * 
+         * <pre>
+         * &lt;complexType>
+         *   &lt;complexContent>
+         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       &lt;sequence>
+         *         &lt;element name="zone" type="{zones}ZoneType"/>
+         *       &lt;/sequence>
+         *     &lt;/restriction>
+         *   &lt;/complexContent>
+         * &lt;/complexType>
+         * </pre>
+         * 
+         * 
+         */
+        @XmlAccessorType(XmlAccessType.FIELD)
+        @XmlType(name = "", propOrder = {
+            "zone"
+        })
+        public static class Siege {
+
+            @XmlElement(required = true)
+            protected ZoneType zone;
+
+            /**
+             * Gets the value of the zone property.
+             * 
+             * @return
+             *     possible object is
+             *     {@link ZoneType }
+             *     
+             */
+            public ZoneType getZone() {
+                return zone;
+            }
+
+            /**
+             * Sets the value of the zone property.
+             * 
+             * @param value
+             *     allowed object is
+             *     {@link ZoneType }
+             *     
+             */
+            public void setZone(ZoneType value) {
+                this.zone = value;
+            }
+
+        }
+
+    }
+
+}

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java

@@ -16,7 +16,8 @@
  */
 package com.l2jserver;
 
-import com.l2jserver.game.net.ProtocolVersion;
+import com.l2jserver.service.network.model.ProtocolVersion;
+
 
 /**
  * Constant values for this L2J compilation