Implemented XML templates

src/main/java/com/l2jserver/service/ServiceModule.java

@@ -39,8 +39,8 @@ import com.l2jserver.service.game.scripting.ScriptingService;
 import com.l2jserver.service.game.scripting.ScriptingServiceImpl;
 import com.l2jserver.service.game.spawn.SpawnService;
 import com.l2jserver.service.game.spawn.SpawnServiceImpl;
-import com.l2jserver.service.game.template.ScriptTemplateService;
 import com.l2jserver.service.game.template.TemplateService;
+import com.l2jserver.service.game.template.XMLTemplateService;
 import com.l2jserver.service.game.world.CachedWorldIDService;
 import com.l2jserver.service.game.world.WorldIDService;
 import com.l2jserver.service.game.world.WorldService;
@@ -80,7 +80,7 @@ public class ServiceModule extends AbstractModule {
 				Scopes.SINGLETON);
 		bind(ScriptingService.class).to(ScriptingServiceImpl.class).in(
 				Scopes.SINGLETON);
-		bind(TemplateService.class).to(ScriptTemplateService.class).in(
+		bind(TemplateService.class).to(XMLTemplateService.class).in(
 				Scopes.SINGLETON);
 
 		bind(ChatService.class).to(SimpleChatService.class)

src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java

@@ -29,7 +29,6 @@ import com.l2jserver.service.AbstractService;
 import com.l2jserver.service.game.spawn.AlreadySpawnedServiceException;
 import com.l2jserver.service.game.spawn.SpawnPointNotFoundServiceException;
 import com.l2jserver.service.game.spawn.SpawnService;
-import com.l2jserver.util.exception.L2Exception;
 
 /**
  * Default {@link NPCService} implementation
@@ -61,11 +60,11 @@ public class NPCServiceImpl extends AbstractService implements NPCService {
 		Preconditions.checkNotNull(action, "action");
 
 		final NPCTemplate template = npc.getTemplate();
-		try {
-			template.action(npc, character, new String[0]);
-		} catch (L2Exception e) {
-			throw new ActionServiceException(e);
-		}
+		// try {
+		// // template.action(npc, character, new String[0]);
+		// } catch (L2Exception e) {
+		// throw new ActionServiceException(e);
+		// }
 	}
 
 	@Override
@@ -77,11 +76,11 @@ public class NPCServiceImpl extends AbstractService implements NPCService {
 			args = new String[0];
 
 		final NPCTemplate template = npc.getTemplate();
-		try {
-			template.action(npc, character, args);
-		} catch (L2Exception e) {
-			throw new ActionServiceException(e);
-		}
+		// try {
+		// // template.action(npc, character, args);
+		// } catch (L2Exception e) {
+		// throw new ActionServiceException(e);
+		// }
 	}
 
 	@Override

src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java

@@ -0,0 +1,129 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * l2jserver is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.service.game.template;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.Map;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import org.apache.commons.io.FileUtils;
+
+import com.google.common.base.Preconditions;
+import com.google.inject.Inject;
+import com.l2jserver.model.id.TemplateID;
+import com.l2jserver.model.template.CharacterTemplate;
+import com.l2jserver.model.template.ItemTemplate;
+import com.l2jserver.model.template.NPCTemplate;
+import com.l2jserver.model.template.Template;
+import com.l2jserver.service.AbstractService;
+import com.l2jserver.service.AbstractService.Depends;
+import com.l2jserver.service.ServiceStartException;
+import com.l2jserver.service.ServiceStopException;
+import com.l2jserver.service.configuration.ConfigurationService;
+import com.l2jserver.service.core.LoggingService;
+import com.l2jserver.util.factory.CollectionFactory;
+import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
+import com.l2jserver.util.jaxb.ItemTemplateIDAdapter;
+import com.l2jserver.util.jaxb.NPCTemplateIDAdapter;
+
+@Depends({ LoggingService.class, ConfigurationService.class })
+public class XMLTemplateService extends AbstractService implements
+		TemplateService {
+	private final XMLTemplateServiceConfiguration config;
+	private final NPCTemplateIDAdapter npcTemplateIdAdapter;
+	private final ItemTemplateIDAdapter itemTemplateIdAdapter;
+	private final CharacterTemplateIDAdapter charIdTemplateAdapter;
+
+	private JAXBContext context;
+	private Unmarshaller unmarshaller;
+
+	@SuppressWarnings("rawtypes")
+	private Map<TemplateID, Template> templates = CollectionFactory.newMap();
+
+	@Inject
+	public XMLTemplateService(ConfigurationService configService,
+			NPCTemplateIDAdapter npcTemplateIdAdapter,
+			ItemTemplateIDAdapter itemTemplateIdAdapter,
+			CharacterTemplateIDAdapter charIdTemplateAdapter) {
+		this.config = configService.get(XMLTemplateServiceConfiguration.class);
+		this.npcTemplateIdAdapter = npcTemplateIdAdapter;
+		this.itemTemplateIdAdapter = itemTemplateIdAdapter;
+		this.charIdTemplateAdapter = charIdTemplateAdapter;
+	}
+
+	@Override
+	protected void doStart() throws ServiceStartException {
+		try {
+			context = JAXBContext.newInstance(CharacterTemplate.class,
+					NPCTemplate.class, ItemTemplate.class);
+			unmarshaller = context.createUnmarshaller();
+
+			unmarshaller.setAdapter(NPCTemplateIDAdapter.class,
+					npcTemplateIdAdapter);
+			unmarshaller.setAdapter(ItemTemplateIDAdapter.class,
+					itemTemplateIdAdapter);
+			unmarshaller.setAdapter(CharacterTemplateIDAdapter.class,
+					charIdTemplateAdapter);
+
+			@SuppressWarnings("unchecked")
+			Collection<File> files = FileUtils
+					.listFiles(config.getTemplateDirectory(),
+							new String[] { "xml" }, true);
+			for (final File file : files) {
+				loadTemplate(file);
+			}
+		} catch (JAXBException e) {
+			throw new ServiceStartException(e);
+		}
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T extends Template<?>> T getTemplate(TemplateID<T> id) {
+		Preconditions.checkNotNull(id, "id");
+		return (T) templates.get(id);
+	}
+
+	public void loadTemplate(File file) throws JAXBException {
+		Preconditions.checkNotNull(file, "file");
+		final Template<?> template = (Template<?>) unmarshaller.unmarshal(file);
+		if (template.getID() != null)
+			templates.put(template.getID(), template);
+	}
+
+	public void removeTemplate(Template<?> template) {
+		Preconditions.checkNotNull(template, "template");
+		templates.remove(template.getID());
+	}
+
+	@Override
+	public void reload() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	protected void doStop() throws ServiceStopException {
+		templates.clear();
+		unmarshaller = null;
+		context = null;
+	}
+}

src/main/java/com/l2jserver/service/game/template/XMLTemplateServiceConfiguration.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * l2jserver is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.service.game.template;
+
+import java.io.File;
+
+import com.l2jserver.service.configuration.Configuration;
+import com.l2jserver.service.configuration.Configuration.ConfigurationName;
+
+@ConfigurationName("template")
+public interface XMLTemplateServiceConfiguration extends Configuration {
+	@ConfigurationPropertyGetter(name = "template.directory", defaultValue = "data/templates")
+	File getTemplateDirectory();
+
+	@ConfigurationPropertySetter(name = "template.directory")
+	void setTemplateDirectory(File file);
+}