Update XSD files for templates

This commit updades all XSD files for templates.

l2jserver2-tools/src/main/java/com/l2jserver/model/template/CharacterTemplateConverter.java

@@ -33,6 +33,7 @@ import javax.xml.bind.SchemaOutputResolver;
 import javax.xml.transform.Result;
 import javax.xml.transform.stream.StreamResult;
 
+import com.l2jserver.model.id.template.CharacterTemplateID;
 import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata;
 import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata.AttackMetadata;
 import com.l2jserver.model.template.CharacterTemplate.CharacterStatsMetadata.AttackMetadata.AttackValueMetadata;
@@ -50,7 +51,7 @@ import com.l2jserver.model.template.CharacterTemplate.CollitionMetadataContainer
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
 public class CharacterTemplateConverter {
-	private static final String JDBC_URL = "jdbc:mysql://localhost/l2j-old";
+	private static final String JDBC_URL = "jdbc:mysql://localhost/l2jlegacy";
 	private static final String JDBC_USERNAME = "l2j";
 	private static final String JDBC_PASSWORD = "changeme";
 
@@ -72,9 +73,6 @@ public class CharacterTemplateConverter {
 
 		final Marshaller m = c.createMarshaller();
 		m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-		m.setProperty(Marshaller.JAXB_NO_NAMESPACE_SCHEMA_LOCATION, "character");
-		m.setProperty(Marshaller.JAXB_SCHEMA_LOCATION,
-				"character ../character.xsd");
 
 		final Connection conn = DriverManager.getConnection(JDBC_URL,
 				JDBC_USERNAME, JDBC_PASSWORD);
@@ -108,6 +106,8 @@ public class CharacterTemplateConverter {
 	private static CharacterTemplate fillTemplate(ResultSet rs)
 			throws SQLException {
 		final CharacterTemplate t = new CharacterTemplate();
+		
+		t.id = new CharacterTemplateID(rs.getInt("Classid"), null);
 
 		t.stats = new CharacterStatsMetadata();
 		t.stats.hp = new Stat();

l2jserver2-tools/src/main/java/com/l2jserver/model/template/NPCTemplateConverter.java

@@ -46,7 +46,6 @@ import com.l2jserver.model.id.template.ItemTemplateID;
 import com.l2jserver.model.id.template.NPCTemplateID;
 import com.l2jserver.model.id.template.SkillTemplateID;
 import com.l2jserver.model.id.template.TeleportationTemplateID;
-import com.l2jserver.model.template.NPCTemplate.Chat;
 import com.l2jserver.model.template.NPCTemplate.DropItemMetadata;
 import com.l2jserver.model.template.NPCTemplate.DropItemMetadata.DropCategory;
 import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata;
@@ -64,6 +63,7 @@ import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCStatsM
 import com.l2jserver.model.template.NPCTemplate.NPCInformationMetadata.NPCTitleMetadata;
 import com.l2jserver.model.template.NPCTemplate.SkillMetadata;
 import com.l2jserver.model.template.NPCTemplate.TalkMetadata;
+import com.l2jserver.model.template.NPCTemplate.TalkMetadata.Chat;
 import com.l2jserver.model.template.TeleportationTemplate.TeleportRestriction;
 import com.l2jserver.model.template.actor.ActorSex;
 import com.l2jserver.model.template.npc.NPCRace;
@@ -102,7 +102,7 @@ public class NPCTemplateConverter {
 		controllers.put("L2FlyMonster", MonsterController.class);
 		Class.forName("com.mysql.jdbc.Driver");
 
-		final File target = new File("data/templates");
+		final File target = new File("generated/template/npc");
 
 		System.out.println("Scaning legacy HTML files...");
 		htmlScannedFiles = FileUtils.listFiles(L2J_HTML_FOLDER, new String[] {
@@ -119,10 +119,6 @@ public class NPCTemplateConverter {
 
 			final Marshaller m = c.createMarshaller();
 			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-			m.setProperty(Marshaller.JAXB_NO_NAMESPACE_SCHEMA_LOCATION,
-					"teleportation");
-			m.setProperty(Marshaller.JAXB_SCHEMA_LOCATION,
-					"teleportation teleportation.xsd");
 
 			final PreparedStatement st = conn
 					.prepareStatement("SELECT * FROM teleport");
@@ -163,7 +159,6 @@ public class NPCTemplateConverter {
 		try {
 			final Marshaller m = c.createMarshaller();
 			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-			m.setProperty(Marshaller.JAXB_NO_NAMESPACE_SCHEMA_LOCATION, "npc");
 
 			final PreparedStatement st = conn
 					.prepareStatement("SELECT npc.*, npcskills.level AS race "

l2jserver2-tools/src/main/java/com/l2jserver/tool/xml/TemplateSchemaGeneratorMain.java

@@ -0,0 +1,62 @@
+package com.l2jserver.tool.xml;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.SchemaOutputResolver;
+import javax.xml.transform.Result;
+import javax.xml.transform.stream.StreamResult;
+
+import com.l2jserver.model.template.CharacterTemplate;
+import com.l2jserver.model.template.ItemTemplate;
+import com.l2jserver.model.template.NPCTemplate;
+import com.l2jserver.model.template.SkillTemplate;
+import com.l2jserver.service.game.template.XMLTemplateService.TeleportationTemplateContainer;
+
+public class TemplateSchemaGeneratorMain {
+	/**
+	 * @param args
+	 * @throws JAXBException
+	 * @throws IOException
+	 */
+	public static void main(String[] args) throws JAXBException, IOException {
+		final File baseDir = new File("generated/schemas");
+
+		JAXBContext context = JAXBContext.newInstance(CharacterTemplate.class,
+				NPCTemplate.class, ItemTemplate.class, SkillTemplate.class,
+				TeleportationTemplateContainer.class);
+
+		context.generateSchema(new SchemaOutputResolver() {
+			public Result createOutput(String namespaceUri,
+					String suggestedFileName) throws IOException {
+				switch (namespaceUri) {
+				case "http://schemas.l2jserver2.com/teleport":
+					suggestedFileName = "teleport.xsd";
+					break;
+				case "http://schemas.l2jserver2.com/skill":
+					suggestedFileName = "skill.xsd";
+					break;
+				case "http://schemas.l2jserver2.com/npc":
+					suggestedFileName = "npc.xsd";
+					break;
+				case "http://schemas.l2jserver2.com/item":
+					suggestedFileName = "item.xsd";
+					break;
+				case "http://schemas.l2jserver2.com/character":
+					suggestedFileName = "character.xsd";
+					break;
+				case "":
+					namespaceUri = "[empty]";
+					suggestedFileName = "l2jserver2.xsd";
+					break;
+				}
+
+				System.out.println(namespaceUri + " mapped to "
+						+ suggestedFileName);
+				return new StreamResult(new File(baseDir, suggestedFileName));
+			}
+		});
+	}
+}