diff --git a/.classpath b/.classpath index 0dd58a7ee..52f62db63 100644 --- a/.classpath +++ b/.classpath @@ -4,13 +4,13 @@ - - - - + + + + - + diff --git a/data/plugin/plugin/PluginLoader.java b/data/plugin/plugin/PluginLoader.java index 389d54da6..1036fe4db 100644 --- a/data/plugin/plugin/PluginLoader.java +++ b/data/plugin/plugin/PluginLoader.java @@ -10,7 +10,7 @@ import com.google.inject.Inject; import com.l2jserver.model.template.Template; import com.l2jserver.service.game.scripting.classlistener.Loader; import com.l2jserver.service.game.scripting.classlistener.Unloader; -import com.l2jserver.service.game.template.StaticTemplateService; +import com.l2jserver.service.game.template.ScriptTemplateService; import com.l2jserver.service.game.template.TemplateService; import com.l2jserver.util.ClassUtils; import com.l2jserver.util.factory.CollectionFactory; @@ -26,11 +26,11 @@ public class PluginLoader implements Loader, Unloader { private static final Logger log = LoggerFactory .getLogger(PluginLoader.class); - private final StaticTemplateService templateService; + private final ScriptTemplateService templateService; @Inject public PluginLoader(TemplateService templateService) { - this.templateService = (StaticTemplateService) templateService; + this.templateService = (ScriptTemplateService) templateService; } @Override diff --git a/data/script/template/script/template/TemplateLoader.java b/data/script/template/script/template/TemplateLoader.java index bba9cdee0..07a7d1909 100644 --- a/data/script/template/script/template/TemplateLoader.java +++ b/data/script/template/script/template/TemplateLoader.java @@ -10,7 +10,7 @@ import com.google.inject.Inject; import com.l2jserver.model.template.Template; import com.l2jserver.service.game.scripting.classlistener.Loader; import com.l2jserver.service.game.scripting.classlistener.Unloader; -import com.l2jserver.service.game.template.StaticTemplateService; +import com.l2jserver.service.game.template.ScriptTemplateService; import com.l2jserver.service.game.template.TemplateService; import com.l2jserver.util.ClassUtils; import com.l2jserver.util.factory.CollectionFactory; @@ -26,11 +26,11 @@ public class TemplateLoader implements Loader, Unloader { private static final Logger log = LoggerFactory .getLogger(TemplateLoader.class); - private final StaticTemplateService templateService; + private final ScriptTemplateService templateService; @Inject public TemplateLoader(TemplateService templateService) { - this.templateService = (StaticTemplateService) templateService; + this.templateService = (ScriptTemplateService) templateService; } @Override diff --git a/dist/start.sh b/dist/start.sh new file mode 100644 index 000000000..e87df7349 --- /dev/null +++ b/dist/start.sh @@ -0,0 +1,2 @@ +#!/bin/sh +echo "Not yet implemented!" diff --git a/pom.xml b/pom.xml index 5b9ca3766..dbe223139 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.l2jserver - l2jserver2-gameserver - 2.0.0-DEVEL + l2j2-gameserver + 2.0.0 L2JServer - Game Server Lineage II server emulator 2011 @@ -20,56 +20,56 @@ org.jboss.netty netty 3.2.4.Final - compile + runtime com.google.inject guice 3.0 jar - compile + runtime com.google.inject.extensions guice-assistedinject 3.0 jar - compile + runtime org.slf4j slf4j-log4j12 1.6.1 jar - compile + runtime mysql mysql-connector-java 5.1.16 jar - compile + runtime javacc javacc 4.1 jar - compile + runtime org.apache.commons commons-io 1.3.2 jar - compile + runtime com.kenai.nbpwr org-apache-commons-dbcp 1.2.2-201002241055 nbm - compile + runtime @@ -98,21 +98,40 @@ git://github.com/Rogiel/l2jserver2-gs.git - ssh://git@github.com:Rogiel/l2jserver2-gs.git + ssh://git@github.com:Rogiel/l2jserver2-gs.git + master https://github.com/Rogiel/l2jserver2-gs package + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + assembly + + + org.apache.maven.plugins maven-jar-plugin 2.3.1 + + + + true + libs/ + com.l2jserver.L2JGameServerMain + + + - jar - package + assembly jar @@ -121,38 +140,22 @@ org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - default - package - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - default - package - - jar - - - + maven-assembly-plugin + 2.2.1 + + + src/assembly/distribution-bin.xml + src/assembly/distribution-src.xml + + repository.jboss.org - https://repository.jboss.org/nexus/content/repositories/releases/ + https://repository.jboss.org/nexus/content/repositories/releases/ + false diff --git a/src/assembly/distribution-bin.xml b/src/assembly/distribution-bin.xml new file mode 100644 index 000000000..af50ab371 --- /dev/null +++ b/src/assembly/distribution-bin.xml @@ -0,0 +1,46 @@ + + bin + + tar.gz + tar.bz2 + zip + + + + + ${project.basedir} + / + + data/** + README + LICENSE + + + + ${project.basedir}/dist + / + + + ${project.build.directory} + / + + *.jar + + + *-sources.jar + *-javadoc.jar + + + + + + /libs + true + false + runtime + + + \ No newline at end of file diff --git a/src/assembly/distribution-src.xml b/src/assembly/distribution-src.xml new file mode 100644 index 000000000..bca3433a0 --- /dev/null +++ b/src/assembly/distribution-src.xml @@ -0,0 +1,36 @@ + + src + + tar.gz + tar.bz2 + zip + + + + + ${project.basedir} + / + + data/** + src/** + README + LICENSE + + + + ${project.basedir}/dist + / + + + + + /libs + true + false + runtime + + + \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/ServiceModule.java b/src/main/java/com/l2jserver/service/ServiceModule.java index bde84b50b..03e053948 100644 --- a/src/main/java/com/l2jserver/service/ServiceModule.java +++ b/src/main/java/com/l2jserver/service/ServiceModule.java @@ -8,7 +8,7 @@ import com.l2jserver.service.database.DatabaseService; import com.l2jserver.service.database.MySQLDatabaseService; import com.l2jserver.service.game.scripting.ScriptingService; import com.l2jserver.service.game.scripting.ScriptingServiceImpl; -import com.l2jserver.service.game.template.StaticTemplateService; +import com.l2jserver.service.game.template.ScriptTemplateService; import com.l2jserver.service.game.template.TemplateService; import com.l2jserver.service.game.world.WorldService; import com.l2jserver.service.game.world.WorldServiceImpl; @@ -34,7 +34,7 @@ public class ServiceModule extends AbstractModule { Scopes.SINGLETON); bind(ScriptingService.class).to(ScriptingServiceImpl.class).in( Scopes.SINGLETON); - bind(TemplateService.class).to(StaticTemplateService.class).in( + bind(TemplateService.class).to(ScriptTemplateService.class).in( Scopes.SINGLETON); bind(WorldService.class).to(WorldServiceImpl.class) diff --git a/src/main/java/com/l2jserver/service/game/template/StaticTemplateService.java b/src/main/java/com/l2jserver/service/game/template/ScriptTemplateService.java similarity index 89% rename from src/main/java/com/l2jserver/service/game/template/StaticTemplateService.java rename to src/main/java/com/l2jserver/service/game/template/ScriptTemplateService.java index 2ebf45a8a..f40213648 100644 --- a/src/main/java/com/l2jserver/service/game/template/StaticTemplateService.java +++ b/src/main/java/com/l2jserver/service/game/template/ScriptTemplateService.java @@ -14,10 +14,10 @@ import com.l2jserver.service.game.scripting.ScriptContext; import com.l2jserver.service.game.scripting.ScriptingService; import com.l2jserver.util.factory.CollectionFactory; -public class StaticTemplateService extends AbstractService implements +public class ScriptTemplateService extends AbstractService implements TemplateService { private final ScriptingService scriptingService; - private final StaticTemplateServiceConfiguration config; + private final ScriptTemplateServiceConfiguration config; private final Injector injector; private ScriptContext context; @@ -27,12 +27,12 @@ public class StaticTemplateService extends AbstractService implements TemplateID.class, Template.class); @Inject - public StaticTemplateService(ScriptingService scriptingService, + public ScriptTemplateService(ScriptingService scriptingService, ConfigurationService configService, Injector injector) { this.scriptingService = scriptingService; this.injector = injector; this.config = configService - .get(StaticTemplateServiceConfiguration.class); + .get(ScriptTemplateServiceConfiguration.class); } @Override diff --git a/src/main/java/com/l2jserver/service/game/template/StaticTemplateServiceConfiguration.java b/src/main/java/com/l2jserver/service/game/template/ScriptTemplateServiceConfiguration.java similarity index 88% rename from src/main/java/com/l2jserver/service/game/template/StaticTemplateServiceConfiguration.java rename to src/main/java/com/l2jserver/service/game/template/ScriptTemplateServiceConfiguration.java index 7c154efc5..cda8179c2 100644 --- a/src/main/java/com/l2jserver/service/game/template/StaticTemplateServiceConfiguration.java +++ b/src/main/java/com/l2jserver/service/game/template/ScriptTemplateServiceConfiguration.java @@ -6,7 +6,7 @@ import com.l2jserver.service.configuration.Configuration; import com.l2jserver.service.configuration.Configuration.ConfigurationName; @ConfigurationName("template") -public interface StaticTemplateServiceConfiguration extends Configuration { +public interface ScriptTemplateServiceConfiguration extends Configuration { @ConfigurationPropertyGetter(name = "template.descriptor", defaultValue = "data/script/template/template.xml") File getTemplateDescriptor(); diff --git a/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java b/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java index 4a5963ce8..3984b1b92 100644 --- a/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java +++ b/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java @@ -4,28 +4,17 @@ import org.junit.Test; import script.template.item.AdenaItemTemplate; -import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.Scopes; import com.l2jserver.db.dao.DAOModuleMySQL5; import com.l2jserver.model.id.factory.IDFactoryModule; import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory; +import com.l2jserver.service.ServiceModule; import com.l2jserver.service.ServiceStartException; -import com.l2jserver.service.game.scripting.ScriptingService; -import com.l2jserver.service.game.scripting.ScriptingServiceImpl; public class StaticTemplateServiceTest { - private final Injector injector = Guice.createInjector( - new IDFactoryModule(), new DAOModuleMySQL5(), new AbstractModule() { - @Override - protected void configure() { - bind(ScriptingService.class).to(ScriptingServiceImpl.class) - .in(Scopes.SINGLETON); - bind(TemplateService.class).to(StaticTemplateService.class) - .in(Scopes.SINGLETON); - } - }); + private final Injector injector = Guice.createInjector(new ServiceModule(), + new IDFactoryModule(), new DAOModuleMySQL5()); private final TemplateService service = injector .getInstance(TemplateService.class); private final ItemTemplateIDFactory factory = injector