From 05e8355aaf14ac574674c6504b10a945a22816fb Mon Sep 17 00:00:00 2001 From: rogiel Date: Thu, 28 Apr 2011 19:34:16 -0300 Subject: [PATCH] Change-Id: I7385cf78327165548c25be9184190f5b80eeba9c --- pom.xml | 20 ++---------- .../com/l2jserver/service/ServiceModule.java | 15 +-------- .../service/configuration/Configuration.java | 24 -------------- .../configuration/ConfigurationService.java | 5 --- .../ProxyConfigurationService.java | 12 ------- .../service/database/AbstractDAO.java | 16 ---------- .../service/database/DB4ODatabaseService.java | 15 --------- .../service/database/DataAccessObject.java | 10 ------ .../database/DatabaseConfiguration.java | 11 ------- .../service/database/DatabaseService.java | 7 ----- .../database/MySQL5DatabaseService.java | 25 --------------- .../database/MySQLDatabaseConfiguration.java | 31 ------------------- .../l2jserver/service/logging/JdkLogger.java | 19 ------------ .../service/logging/JdkLoggingService.java | 26 ---------------- .../com/l2jserver/service/logging/Logger.java | 7 ----- .../service/logging/LoggingService.java | 7 ----- 16 files changed, 4 insertions(+), 246 deletions(-) delete mode 100644 src/main/java/com/l2jserver/service/configuration/Configuration.java delete mode 100644 src/main/java/com/l2jserver/service/configuration/ConfigurationService.java delete mode 100644 src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java delete mode 100644 src/main/java/com/l2jserver/service/database/AbstractDAO.java delete mode 100644 src/main/java/com/l2jserver/service/database/DB4ODatabaseService.java delete mode 100644 src/main/java/com/l2jserver/service/database/DataAccessObject.java delete mode 100644 src/main/java/com/l2jserver/service/database/DatabaseConfiguration.java delete mode 100644 src/main/java/com/l2jserver/service/database/DatabaseService.java delete mode 100644 src/main/java/com/l2jserver/service/database/MySQL5DatabaseService.java delete mode 100644 src/main/java/com/l2jserver/service/database/MySQLDatabaseConfiguration.java delete mode 100644 src/main/java/com/l2jserver/service/logging/JdkLogger.java delete mode 100644 src/main/java/com/l2jserver/service/logging/JdkLoggingService.java delete mode 100644 src/main/java/com/l2jserver/service/logging/Logger.java delete mode 100644 src/main/java/com/l2jserver/service/logging/LoggingService.java diff --git a/pom.xml b/pom.xml index 3e0a4f100..94db3bdd4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,23 +9,9 @@ - org.jboss.netty - netty - 3.2.4.Final - compile - - - junit - junit - 4.8.2 - jar - compile - - - com.google.inject - guice - 3.0 - jar + com.l2jserver + l2jserver2-core + 2.0.0-DEVEL compile diff --git a/src/main/java/com/l2jserver/service/ServiceModule.java b/src/main/java/com/l2jserver/service/ServiceModule.java index aeb38c6f3..61e48e9b0 100644 --- a/src/main/java/com/l2jserver/service/ServiceModule.java +++ b/src/main/java/com/l2jserver/service/ServiceModule.java @@ -1,23 +1,10 @@ package com.l2jserver.service; import com.google.inject.AbstractModule; -import com.google.inject.Scopes; -import com.l2jserver.service.configuration.ConfigurationService; -import com.l2jserver.service.configuration.ProxyConfigurationService; -import com.l2jserver.service.database.DB4ODatabaseService; -import com.l2jserver.service.database.DatabaseService; -import com.l2jserver.service.network.NettyNetworkService; -import com.l2jserver.service.network.NetworkService; public class ServiceModule extends AbstractModule { @Override protected void configure() { - bind(ConfigurationService.class).to(ProxyConfigurationService.class) - .in(Scopes.SINGLETON); - bind(DatabaseService.class).to(DB4ODatabaseService.class).in( - Scopes.SINGLETON); - - bind(NetworkService.class).to(NettyNetworkService.class).in( - Scopes.SINGLETON); + install(new BasicServiceModule()); } } diff --git a/src/main/java/com/l2jserver/service/configuration/Configuration.java b/src/main/java/com/l2jserver/service/configuration/Configuration.java deleted file mode 100644 index 1ac44a733..000000000 --- a/src/main/java/com/l2jserver/service/configuration/Configuration.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.l2jserver.service.configuration; - -import com.l2jserver.service.configuration.Configuration.ConfigurationName; - -@ConfigurationName("l2j") -public interface Configuration { - - public @interface ConfigurationName { - String value(); - } - - public @interface ConfigurationPrefix { - String value(); - } - - public @interface ConfigurationPropertyGetter { - String name(); - String defaultValue() default ""; - } - - public @interface ConfigurationPropertySetter { - String name(); - } -} diff --git a/src/main/java/com/l2jserver/service/configuration/ConfigurationService.java b/src/main/java/com/l2jserver/service/configuration/ConfigurationService.java deleted file mode 100644 index 20aa423f7..000000000 --- a/src/main/java/com/l2jserver/service/configuration/ConfigurationService.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.l2jserver.service.configuration; - -public interface ConfigurationService { - C get(Class config); -} diff --git a/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java b/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java deleted file mode 100644 index 7d735f525..000000000 --- a/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.l2jserver.service.configuration; - -import java.util.Properties; - -public class ProxyConfigurationService implements ConfigurationService { - private Properties properties; - - @Override - public C get(Class config) { - return null; - } -} diff --git a/src/main/java/com/l2jserver/service/database/AbstractDAO.java b/src/main/java/com/l2jserver/service/database/AbstractDAO.java deleted file mode 100644 index c27327610..000000000 --- a/src/main/java/com/l2jserver/service/database/AbstractDAO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.l2jserver.service.database; - -import com.google.inject.Inject; - -public abstract class AbstractDAO implements DataAccessObject { - protected final DatabaseService database; - - @Inject - protected AbstractDAO(DatabaseService database) { - this.database = database; - } - - public DatabaseService getDatabase() { - return database; - } -} diff --git a/src/main/java/com/l2jserver/service/database/DB4ODatabaseService.java b/src/main/java/com/l2jserver/service/database/DB4ODatabaseService.java deleted file mode 100644 index 50be31d9a..000000000 --- a/src/main/java/com/l2jserver/service/database/DB4ODatabaseService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.l2jserver.service.database; - -public class DB4ODatabaseService implements DatabaseService { - @Override - public void start() { - // TODO Auto-generated method stub - - } - - @Override - public void stop() { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/com/l2jserver/service/database/DataAccessObject.java b/src/main/java/com/l2jserver/service/database/DataAccessObject.java deleted file mode 100644 index fde32187a..000000000 --- a/src/main/java/com/l2jserver/service/database/DataAccessObject.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.l2jserver.service.database; - -/** - * The DAO interface - * - * @author Rogiel - */ -public interface DataAccessObject { - -} diff --git a/src/main/java/com/l2jserver/service/database/DatabaseConfiguration.java b/src/main/java/com/l2jserver/service/database/DatabaseConfiguration.java deleted file mode 100644 index b886a64e5..000000000 --- a/src/main/java/com/l2jserver/service/database/DatabaseConfiguration.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.l2jserver.service.database; - -import com.l2jserver.service.configuration.Configuration; -import com.l2jserver.service.configuration.Configuration.ConfigurationName; -import com.l2jserver.service.configuration.Configuration.ConfigurationPrefix; - -@ConfigurationName("database") -@ConfigurationPrefix("database") -public interface DatabaseConfiguration extends Configuration { - -} diff --git a/src/main/java/com/l2jserver/service/database/DatabaseService.java b/src/main/java/com/l2jserver/service/database/DatabaseService.java deleted file mode 100644 index b38f85a4c..000000000 --- a/src/main/java/com/l2jserver/service/database/DatabaseService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.l2jserver.service.database; - -import com.l2jserver.service.Service; - -public interface DatabaseService extends Service { - -} diff --git a/src/main/java/com/l2jserver/service/database/MySQL5DatabaseService.java b/src/main/java/com/l2jserver/service/database/MySQL5DatabaseService.java deleted file mode 100644 index aa2158dc7..000000000 --- a/src/main/java/com/l2jserver/service/database/MySQL5DatabaseService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.l2jserver.service.database; - -import com.google.inject.Inject; -import com.l2jserver.service.configuration.ConfigurationService; - -public class MySQL5DatabaseService implements DatabaseService { - private final MySQLDatabaseConfiguration config; - - @Inject - public MySQL5DatabaseService(ConfigurationService configService) { - config = configService.get(MySQLDatabaseConfiguration.class); - } - - @Override - public void start() { - // TODO Auto-generated method stub - - } - - @Override - public void stop() { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/com/l2jserver/service/database/MySQLDatabaseConfiguration.java b/src/main/java/com/l2jserver/service/database/MySQLDatabaseConfiguration.java deleted file mode 100644 index b9bcb8ae5..000000000 --- a/src/main/java/com/l2jserver/service/database/MySQLDatabaseConfiguration.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.l2jserver.service.database; - -import com.l2jserver.service.configuration.Configuration.ConfigurationPrefix; - -@ConfigurationPrefix("mysql") -public interface MySQLDatabaseConfiguration extends DatabaseConfiguration { - /** - * @return the jdbc url - */ - @ConfigurationPropertyGetter(name = "jdbc.url", defaultValue = "jdbc:mysql://localhost/l2jserver-gs") - String getJdbcUrl(); - - /** - * @param jdbcUrl - * the new jdbc url - */ - @ConfigurationPropertySetter(name = "jdbc.url") - void setJdbcUrl(String jdbcUrl); - - @ConfigurationPropertyGetter(name = "jdbc.username", defaultValue = "root") - String getUsername(); - - @ConfigurationPropertySetter(name = "jdbc.username") - void setUsername(String username); - - @ConfigurationPropertyGetter(name = "jdbc.password") - String getPassword(); - - @ConfigurationPropertySetter(name = "jdbc.password") - void setPassword(String password); -} diff --git a/src/main/java/com/l2jserver/service/logging/JdkLogger.java b/src/main/java/com/l2jserver/service/logging/JdkLogger.java deleted file mode 100644 index eeb107c11..000000000 --- a/src/main/java/com/l2jserver/service/logging/JdkLogger.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.l2jserver.service.logging; - -public class JdkLogger implements Logger { - private final java.util.logging.Logger logger; - - public JdkLogger(java.util.logging.Logger logger) { - this.logger = logger; - } - - @Override - public void info(String message) { - logger.info(message); - } - - @Override - public void info(String message, Exception e) { - logger.info(message); - } -} diff --git a/src/main/java/com/l2jserver/service/logging/JdkLoggingService.java b/src/main/java/com/l2jserver/service/logging/JdkLoggingService.java deleted file mode 100644 index 2a0eb773e..000000000 --- a/src/main/java/com/l2jserver/service/logging/JdkLoggingService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.l2jserver.service.logging; - -import java.util.logging.LogManager; - -import com.l2jserver.service.ServiceStartException; -import com.l2jserver.service.ServiceStopException; - -public class JdkLoggingService implements LoggingService { - @Override - public void start() throws ServiceStartException { - // TODO Auto-generated method stub - - } - - @Override - public Logger getLogger(Class clazz) { - return new JdkLogger(LogManager.getLogManager().getLogger( - clazz.getName())); - } - - @Override - public void stop() throws ServiceStopException { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/com/l2jserver/service/logging/Logger.java b/src/main/java/com/l2jserver/service/logging/Logger.java deleted file mode 100644 index 922c3794c..000000000 --- a/src/main/java/com/l2jserver/service/logging/Logger.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.l2jserver.service.logging; - -public interface Logger { - void info(String message); - - void info(String message, Exception e); -} diff --git a/src/main/java/com/l2jserver/service/logging/LoggingService.java b/src/main/java/com/l2jserver/service/logging/LoggingService.java deleted file mode 100644 index 48dff91e5..000000000 --- a/src/main/java/com/l2jserver/service/logging/LoggingService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.l2jserver.service.logging; - -import com.l2jserver.service.Service; - -public interface LoggingService extends Service { - Logger getLogger(Class clazz); -}