Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-06 07:32:46 +00:00
Code Releases Activity

Removes ProxyConfigurationService in favor of XMLConfigurationService

Browse Source
This commit is contained in:
Rogiel Sulzbach
2011-12-19 00:35:02 -02:00
parent 8bc59491a9
commit 3581a432b6
16 changed files with 3 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
l2jserver2-gameserver/config/properties/database.properties
View File

@@ -1,30 +0,0 @@
# ---------------------------------------------------------------------------
# JDBCDatabaseService configuration
# ---------------------------------------------------------------------------
# Parameters in this file are used by JDBCDatabaseService.
# If you are not sure on the usage of any parameter, read the "Configuration"
# section in wiki article about "JDBCDatabaseService".
# https://github.com/l2jserver2/
# ---------------------------------------------------------------------------
# NOTE: this is the development configuration file. Always remember to add
# new parameters to "dist/config" files too!
# ---------------------------------------------------------------------------
# This defines the connection URL used by JDBC to connect to the database.
# Default: jdbc:mysql://localhost/l2jserver2
jdbc.url = jdbc:mysql://localhost/l2jserver2
# The driver used to connect to the database. Please note that the driver
# library must be available in the JVM classpath.
# Default: com.mysql.jdbc.Driver in MySQL binary distribution or
# org.h2.Driver in H2 binary distribution
jdbc.driver = com.mysql.jdbc.Driver
# The username used to login into the database.
# NOTE: Try not use "root" in production servers!
# Default: l2j
jdbc.username = l2j
# The password used to login into the database.
# Default: changeme
jdbc.password = changeme

16
l2jserver2-gameserver/config/properties/template.properties
View File

@@ -1,16 +0,0 @@
# ---------------------------------------------------------------------------
# XMLTemplateService configuration
# ---------------------------------------------------------------------------
# Parameters in this file are used by XMLTemplateService.
# If you are not sure on the usage of any parameter, read the "Configuration"
# section in wiki article about "XMLTemplateService".
# https://github.com/l2jserver2/
# ---------------------------------------------------------------------------
# NOTE: this is the development configuration file. Always remember to add
# new parameters to "dist/config" files too!
# ---------------------------------------------------------------------------
# The directory in which templates are located. All template files must be
# in .xml # file format. Must be relative to 'vfs.root' (vfs.properties)
# Default: data/templates
template.directory = data/templates

15
l2jserver2-gameserver/config/properties/vfs.properties
View File

@@ -1,15 +0,0 @@
# ---------------------------------------------------------------------------
# Java7VFSService configuration
# ---------------------------------------------------------------------------
# Parameters in this file are used by Java7VFSService.
# If you are not sure on the usage of any parameter, read the "Configuration"
# section in wiki article about "Java7VFSService".
# https://github.com/l2jserver2/
# ---------------------------------------------------------------------------
# NOTE: this is the development configuration file. Always remember to add
# new parameters to "dist/config" files too!
# ---------------------------------------------------------------------------
# The root of the VFS, any file placed in "/" will go to specified path.
# Defaul: <empty> (will inherit from terminal working directory, if any)
vfs.root =

27
l2jserver2-gameserver/distribution/global/config/properties/database.properties
View File

@@ -1,27 +0,0 @@
# ---------------------------------------------------------------------------
# JDBCDatabaseService configuration
# ---------------------------------------------------------------------------
# Parameters in this file are used by JDBCDatabaseService.
# If you are not sure on the usage of any parameter, read the "Configuration"
# section in wiki article about "JDBCDatabaseService".
# https://github.com/l2jserver2/
# ---------------------------------------------------------------------------
# This defines the connection URL used by JDBC to connect to the database.
# Default: jdbc:mysql://localhost/l2jserver2
jdbc.url = jdbc:mysql://localhost/l2jserver2
# The driver used to connect to the database. Please note that the driver
# library must be available in the JVM classpath.
# Default: com.mysql.jdbc.Driver in MySQL binary distribution or
# org.h2.Driver in H2 binary distribution
jdbc.driver = com.mysql.jdbc.Driver
# The username used to login into the database.
# NOTE: Try not use "root" in production servers!
# Default: <your database username>
jdbc.username = l2j
# The password used to login into the database.
# Default: <your database password>
jdbc.password = changeme

13
l2jserver2-gameserver/distribution/global/config/properties/template.properties
View File

@@ -1,13 +0,0 @@
# ---------------------------------------------------------------------------
# XMLTemplateService configuration
# ---------------------------------------------------------------------------
# Parameters in this file are used by XMLTemplateService.
# If you are not sure on the usage of any parameter, read the "Configuration"
# section in wiki article about "XMLTemplateService".
# https://github.com/l2jserver2/
# ---------------------------------------------------------------------------
# The directory in which templates are located. All template files must be
# in .xml # file format. Must be relative to 'vfs.root' (vfs.properties)
# Default: data/templates
template.directory = data/templates

12
l2jserver2-gameserver/distribution/global/config/properties/vfs.properties
View File

@@ -1,12 +0,0 @@
# ---------------------------------------------------------------------------
# Java7VFSService configuration
# ---------------------------------------------------------------------------
# Parameters in this file are used by Java7VFSService.
# If you are not sure on the usage of any parameter, read the "Configuration"
# section in wiki article about "Java7VFSService".
# https://github.com/l2jserver2/
# ---------------------------------------------------------------------------
# The root of the VFS, any file placed in "/" will go to specified path.
# Defaul: <empty> (will inherit from terminal working directory, if any)
vfs.root =

5
l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java
View File

@@ -55,8 +55,6 @@ import com.l2jserver.service.ServiceStopException;
import com.l2jserver.service.cache.Cache;
import com.l2jserver.service.cache.CacheService;
import com.l2jserver.service.configuration.ConfigurationService;
import com.l2jserver.service.configuration.ProxyConfigurationService.ConfigurationName;
import com.l2jserver.service.configuration.ProxyConfigurationService.ConfigurationPropertyKey;
import com.l2jserver.service.configuration.XMLConfigurationService.ConfigurationXPath;
import com.l2jserver.service.core.LoggingService;
import com.l2jserver.service.core.vfs.VFSService;
@@ -140,14 +138,12 @@ public class XMLTemplateService extends AbstractService implements
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
@ConfigurationName("template")
public interface XMLTemplateServiceConfiguration extends
TemplateServiceConfiguration {
/**
* @return the directory in which templates are stored
*/
@ConfigurationPropertyGetter(defaultValue = "data/template")
@ConfigurationPropertyKey("template.directory")
@ConfigurationXPath("/configuration/services/template/directory")
URI getTemplateDirectory();
@@ -156,7 +152,6 @@ public class XMLTemplateService extends AbstractService implements
* the directory in which templates are stored
*/
@ConfigurationPropertySetter
@ConfigurationPropertyKey("template.directory")
@ConfigurationXPath("/configuration/services/template/directory")
void setTemplateDirectory(URI file);
}

5
l2jserver2-gameserver/src/main/java/com/l2jserver/service/network/NetworkService.java
View File

@@ -27,8 +27,6 @@ import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.Service;
import com.l2jserver.service.ServiceConfiguration;
import com.l2jserver.service.configuration.Configuration;
import com.l2jserver.service.configuration.ProxyConfigurationService.ConfigurationName;
import com.l2jserver.service.configuration.ProxyConfigurationService.ConfigurationPropertyKey;
import com.l2jserver.service.configuration.XMLConfigurationService.ConfigurationXPath;
/**
@@ -73,7 +71,6 @@ public interface NetworkService extends Service {
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
@ConfigurationName("network")
public interface NetworkConfiguration extends ServiceConfiguration {
/**
* Get the server listen address
@@ -81,7 +78,6 @@ public interface NetworkService extends Service {
* @return the listen address
*/
@ConfigurationPropertyGetter(defaultValue = "0.0.0.0:7777")
@ConfigurationPropertyKey("network.listen")
@ConfigurationXPath("/configuration/services/network/listen")
InetSocketAddress getListenAddress();
@@ -92,7 +88,6 @@ public interface NetworkService extends Service {
* the listen address
*/
@ConfigurationPropertySetter
@ConfigurationPropertyKey("network.listen")
@ConfigurationXPath("/configuration/services/network/listen")
void setListenAddress(InetSocketAddress addr);
}