[jetrix-cvs] SF.net SVN: jetrix:[764] jetrix/trunk
Brought to you by:
smanux
Menu
▾
▴
[jetrix-cvs] SF.net SVN: jetrix:[764] jetrix/trunk
|
From: <sm...@us...> - 2008-09-02 17:48:32
|
Revision: 764
http://jetrix.svn.sourceforge.net/jetrix/?rev=764&view=rev
Author: smanux
Date: 2008-09-02 17:48:20 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
Moved the configuration files in a conf sub directory
Modified Paths:
--------------
jetrix/trunk/build.xml
jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java
Added Paths:
-----------
jetrix/trunk/src/etc/conf/
jetrix/trunk/src/etc/conf/channels.xml
jetrix/trunk/src/etc/conf/server.xml
Removed Paths:
-------------
jetrix/trunk/src/etc/channels.xml
jetrix/trunk/src/etc/server.xml
Modified: jetrix/trunk/build.xml
===================================================================
--- jetrix/trunk/build.xml 2008-09-02 17:26:49 UTC (rev 763)
+++ jetrix/trunk/build.xml 2008-09-02 17:48:20 UTC (rev 764)
@@ -182,8 +182,7 @@
<zipfileset prefix="jetrix-${version}/" dir="${src}/etc/">
<include name="LICENSE" />
<include name="README" />
- <include name="server.xml" />
- <include name="channels.xml" />
+ <include name="conf/*" />
<include name="data/**" />
</zipfileset>
<zipfileset prefix="jetrix-${version}/" dir="${build}/bin/">
@@ -215,8 +214,7 @@
<tarfileset prefix="jetrix-${version}/" dir="${src}/etc/">
<include name="LICENSE" />
<include name="README" />
- <include name="server.xml" />
- <include name="channels.xml" />
+ <include name="conf/*" />
<include name="data/**" />
</tarfileset>
<tarfileset prefix="jetrix-${version}/" dir="${build}/bin/">
Deleted: jetrix/trunk/src/etc/channels.xml
===================================================================
--- jetrix/trunk/src/etc/channels.xml 2008-09-02 17:26:49 UTC (rev 763)
+++ jetrix/trunk/src/etc/channels.xml 2008-09-02 17:48:20 UTC (rev 764)
@@ -1,282 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE tetrinet-channels PUBLIC "-//LFJR//Jetrix Channels//EN" "http://jetrix.sourceforge.net/dtd/tetrinet-channels.dtd">
-
-<tetrinet-channels>
-
- <!-- Message Of The Day -->
- <motd><![CDATA[
-<b>
-Welcome on <b>Jetrix TetriNET Server</b>!
-<u><blue>http://jetrix.sourceforge.net/</blue></u>
-<b>
- ]]></motd>
-
- <!-- Channel filters -->
- <filter-definitions>
- <alias name="flood" class="net.jetrix.filter.FloodFilter"/>
- <alias name="start" class="net.jetrix.filter.StartFilter"/>
- <alias name="amplifier" class="net.jetrix.filter.AmplifierFilter"/>
- <alias name="ping" class="net.jetrix.filter.PingFilter"/>
- <alias name="7tetris" class="net.jetrix.filter.TetrisFilter"/>
- <alias name="stats" class="net.jetrix.filter.StatsFilter"/>
- <alias name="logo" class="net.jetrix.filter.LogoFilter"/>
- <alias name="sudden-death" class="net.jetrix.filter.SuddenDeathFilter"/>
- <alias name="command" class="net.jetrix.filter.CommandFilter"/>
- <alias name="survival" class="net.jetrix.filter.SurvivalFilter"/>
- <alias name="puzzle" class="net.jetrix.filter.PuzzleFilter"/>
- <alias name="random" class="net.jetrix.filter.RandomFilter"/>
- </filter-definitions>
-
- <!-- Global filters -->
- <default-filters>
- <filter name="flood">
- <param name="capacity" value="8"/>
- <param name="delay" value="5000"/>
- </filter>
- <filter name="start">
- <param name="delay" value="10000"/>
- </filter>
- <filter name="ping"/>
- <filter name="stats"/>
- <filter name="logo"/>
- <filter name="sudden-death"/>
- </default-filters>
-
- <!-- Winlists -->
- <winlists>
- <winlist name="default" class="net.jetrix.winlist.SimpleWinlist">
- <param name="display.score" value="true"/>
- </winlist>
- <winlist name="pure" class="net.jetrix.winlist.SimpleWinlist">
- <param name="display.score" value="true"/>
- </winlist>
- <winlist name="duel" class="net.jetrix.winlist.SimpleWinlist">
- <param name="display.score" value="true"/>
- </winlist>
- </winlists>
-
- <!-- Default game settings -->
- <default-settings>
- <!-- What level each player starts at -->
- <starting-level>1</starting-level>
-
- <!-- How many lines to make before player level increases -->
- <lines-per-level>2</lines-per-level>
-
- <!-- Number of levels to increase each time -->
- <level-increase>1</level-increase>
-
- <!-- Lines to make to get a special block -->
- <lines-per-special>2</lines-per-special>
-
- <!-- Number of special blocks added each time -->
- <special-added>1</special-added>
-
- <!-- Capacity of Special block inventory -->
- <special-capacity>18</special-capacity>
-
- <!-- Play by classic rules? -->
- <classic-rules>true</classic-rules>
-
- <!-- Average together all player's game level? -->
- <average-levels>true</average-levels>
-
- <!-- Same sequence of blocks for all players? (tetrinet 1.14 clients only) -->
- <same-blocks>true</same-blocks>
-
- <block-occurancy>
- <line>15</line>
- <square>15</square>
- <leftl>14</leftl>
- <rightl>14</rightl>
- <leftz>14</leftz>
- <rightz>14</rightz>
- <halfcross>14</halfcross>
- </block-occurancy>
-
- <special-occurancy>
- <addline>31</addline>
- <clearline>21</clearline>
- <nukefield>1</nukefield>
- <randomclear>13</randomclear>
- <switchfield>1</switchfield>
- <clearspecial>14</clearspecial>
- <gravity>1</gravity>
- <quakefield>7</quakefield>
- <blockbomb>11</blockbomb>
- </special-occurancy>
-
- <!-- Sudden death parameters -->
- <sudden-death>
- <!-- Time in seconds before the sudden death begins, 0 to disable the sudden death -->
- <time>600</time>
-
- <!-- The message displayed when the sudden death begins. Use "key:" prefix to display an internationalized message -->
- <message>key:filter.suddendeath.message</message>
-
- <!-- The delay in seconds between lines additions -->
- <delay>10</delay>
-
- <!-- The number of lines added -->
- <lines-added>1</lines-added>
- </sudden-death>
-
- </default-settings>
-
-
- <channels>
- <channel name="tetrinet1">
- <description>2:1</description>
- <winlist name="default"/>
- </channel>
-
- <channel name="tetrinet2">
- <description>2:1</description>
- <winlist name="default"/>
- </channel>
-
- <channel name="tetrinet3">
- <description>2:1</description>
- <winlist name="default"/>
- </channel>
-
- <channel name="pure">
- <description>Pure</description>
- <winlist name="pure"/>
- <settings>
- <special-added>0</special-added>
- </settings>
- </channel>
-
- <channel name="pure2">
- <description>Pure</description>
- <winlist name="pure"/>
- <settings>
- <special-added>0</special-added>
- </settings>
- </channel>
-
- <channel name="custom">
- <description>Custom mode</description>
- <topic>Type /mode to change the settings</topic>
- <filters>
- <filter name="command">
- <param name="class" value="net.jetrix.commands.ModeCommand"/>
- </filter>
- </filters>
- </channel>
-
- <channel name="random">
- <description>Random settings</description>
- <topic>New game, new settings. Enjoy!</topic>
- <filters>
- <filter name="random"/>
- </filters>
- </channel>
-
- <channel name="duel1">
- <description>Duel 2:1</description>
- <max-players>2</max-players>
- <winlist name="duel"/>
- </channel>
-
- <channel name="duel2">
- <description>Duel 2:1</description>
- <max-players>2</max-players>
- <winlist name="duel"/>
- </channel>
-
- <channel name="pureduel">
- <description>Pure - No Specials</description>
- <max-players>2</max-players>
- <winlist name="default"/>
- <settings>
- <special-added>0</special-added>
- <same-blocks>true</same-blocks>
- </settings>
- </channel>
-
- <channel name="sticks">
- <description>Sticks Only</description>
- <settings>
- <special-added>0</special-added>
- <block-occurancy>
- <line>100</line>
- </block-occurancy>
- </settings>
- </channel>
-
- <channel name="SnS">
- <description><![CDATA[Sticks <i>and</i> Squares]]></description>
- <settings>
- <special-added>0</special-added>
- <block-occurancy>
- <line>50</line>
- <square>50</square>
- </block-occurancy>
- </settings>
- </channel>
-
- <channel name="7Tetris">
- <description>7 tetris to win!</description>
- <topic>
-<![CDATA[
-<b>
-Welcome to the 7 tetris channel! The first player completing 7 tetris
-win. There is no special in this game, and the lines are not added to
-your opponents. Good luck!
-<b>
-]]>
- </topic>
- <settings>
- <special-added>0</special-added>
- </settings>
- <filters>
- <filter name="7tetris"/>
- </filters>
- </channel>
-
- <channel name="survival">
- <description>Staying Aliiiive !!</description>
- <topic>
-<![CDATA[
-<b>
-Welcome to the survival channel! Drop as many blocks as you can
-before you die. The sudden death is activated immediately and one
-line is added every 5 seconds.
-If you clear <b>2</b> lines, <b>1</b> extra line will be removed.
-If you clear <b>3</b> lines, <b>2</b> extra lines will be removed.
-If you clear <b>4</b> lines, <b>3</b> extra additional lines will be removed.
-<b>
-]]>
- </topic>
- <max-players>2</max-players>
- <settings>
- <sudden-death>
- <time>5</time>
- <delay>5</delay>
- <lines-added>1</lines-added>
- </sudden-death>
- </settings>
- <filters>
- <filter name="survival"/>
- </filters>
- </channel>
-
- <channel name="puzzle">
- <description>Downstack 'em all!</description>
- <max-players>1</max-players>
- <filters>
- <filter name="puzzle"/>
- </filters>
- </channel>
-
- <channel name="admins">
- <description>Administrators' Lair</description>
- <access-level>1</access-level>
- <idle>true</idle>
- </channel>
-
- </channels>
-
-</tetrinet-channels>
Copied: jetrix/trunk/src/etc/conf/channels.xml (from rev 752, jetrix/trunk/src/etc/channels.xml)
===================================================================
--- jetrix/trunk/src/etc/conf/channels.xml (rev 0)
+++ jetrix/trunk/src/etc/conf/channels.xml 2008-09-02 17:48:20 UTC (rev 764)
@@ -0,0 +1,282 @@
+<?xml version="1.0"?>
+<!DOCTYPE tetrinet-channels PUBLIC "-//LFJR//Jetrix Channels//EN" "http://jetrix.sourceforge.net/dtd/tetrinet-channels.dtd">
+
+<tetrinet-channels>
+
+ <!-- Message Of The Day -->
+ <motd><![CDATA[
+<b>
+Welcome on <b>Jetrix TetriNET Server</b>!
+<u><blue>http://jetrix.sourceforge.net/</blue></u>
+<b>
+ ]]></motd>
+
+ <!-- Channel filters -->
+ <filter-definitions>
+ <alias name="flood" class="net.jetrix.filter.FloodFilter"/>
+ <alias name="start" class="net.jetrix.filter.StartFilter"/>
+ <alias name="amplifier" class="net.jetrix.filter.AmplifierFilter"/>
+ <alias name="ping" class="net.jetrix.filter.PingFilter"/>
+ <alias name="7tetris" class="net.jetrix.filter.TetrisFilter"/>
+ <alias name="stats" class="net.jetrix.filter.StatsFilter"/>
+ <alias name="logo" class="net.jetrix.filter.LogoFilter"/>
+ <alias name="sudden-death" class="net.jetrix.filter.SuddenDeathFilter"/>
+ <alias name="command" class="net.jetrix.filter.CommandFilter"/>
+ <alias name="survival" class="net.jetrix.filter.SurvivalFilter"/>
+ <alias name="puzzle" class="net.jetrix.filter.PuzzleFilter"/>
+ <alias name="random" class="net.jetrix.filter.RandomFilter"/>
+ </filter-definitions>
+
+ <!-- Global filters -->
+ <default-filters>
+ <filter name="flood">
+ <param name="capacity" value="8"/>
+ <param name="delay" value="5000"/>
+ </filter>
+ <filter name="start">
+ <param name="delay" value="10000"/>
+ </filter>
+ <filter name="ping"/>
+ <filter name="stats"/>
+ <filter name="logo"/>
+ <filter name="sudden-death"/>
+ </default-filters>
+
+ <!-- Winlists -->
+ <winlists>
+ <winlist name="default" class="net.jetrix.winlist.SimpleWinlist">
+ <param name="display.score" value="true"/>
+ </winlist>
+ <winlist name="pure" class="net.jetrix.winlist.SimpleWinlist">
+ <param name="display.score" value="true"/>
+ </winlist>
+ <winlist name="duel" class="net.jetrix.winlist.SimpleWinlist">
+ <param name="display.score" value="true"/>
+ </winlist>
+ </winlists>
+
+ <!-- Default game settings -->
+ <default-settings>
+ <!-- What level each player starts at -->
+ <starting-level>1</starting-level>
+
+ <!-- How many lines to make before player level increases -->
+ <lines-per-level>2</lines-per-level>
+
+ <!-- Number of levels to increase each time -->
+ <level-increase>1</level-increase>
+
+ <!-- Lines to make to get a special block -->
+ <lines-per-special>2</lines-per-special>
+
+ <!-- Number of special blocks added each time -->
+ <special-added>1</special-added>
+
+ <!-- Capacity of Special block inventory -->
+ <special-capacity>18</special-capacity>
+
+ <!-- Play by classic rules? -->
+ <classic-rules>true</classic-rules>
+
+ <!-- Average together all player's game level? -->
+ <average-levels>true</average-levels>
+
+ <!-- Same sequence of blocks for all players? (tetrinet 1.14 clients only) -->
+ <same-blocks>true</same-blocks>
+
+ <block-occurancy>
+ <line>15</line>
+ <square>15</square>
+ <leftl>14</leftl>
+ <rightl>14</rightl>
+ <leftz>14</leftz>
+ <rightz>14</rightz>
+ <halfcross>14</halfcross>
+ </block-occurancy>
+
+ <special-occurancy>
+ <addline>31</addline>
+ <clearline>21</clearline>
+ <nukefield>1</nukefield>
+ <randomclear>13</randomclear>
+ <switchfield>1</switchfield>
+ <clearspecial>14</clearspecial>
+ <gravity>1</gravity>
+ <quakefield>7</quakefield>
+ <blockbomb>11</blockbomb>
+ </special-occurancy>
+
+ <!-- Sudden death parameters -->
+ <sudden-death>
+ <!-- Time in seconds before the sudden death begins, 0 to disable the sudden death -->
+ <time>600</time>
+
+ <!-- The message displayed when the sudden death begins. Use "key:" prefix to display an internationalized message -->
+ <message>key:filter.suddendeath.message</message>
+
+ <!-- The delay in seconds between lines additions -->
+ <delay>10</delay>
+
+ <!-- The number of lines added -->
+ <lines-added>1</lines-added>
+ </sudden-death>
+
+ </default-settings>
+
+
+ <channels>
+ <channel name="tetrinet1">
+ <description>2:1</description>
+ <winlist name="default"/>
+ </channel>
+
+ <channel name="tetrinet2">
+ <description>2:1</description>
+ <winlist name="default"/>
+ </channel>
+
+ <channel name="tetrinet3">
+ <description>2:1</description>
+ <winlist name="default"/>
+ </channel>
+
+ <channel name="pure">
+ <description>Pure</description>
+ <winlist name="pure"/>
+ <settings>
+ <special-added>0</special-added>
+ </settings>
+ </channel>
+
+ <channel name="pure2">
+ <description>Pure</description>
+ <winlist name="pure"/>
+ <settings>
+ <special-added>0</special-added>
+ </settings>
+ </channel>
+
+ <channel name="custom">
+ <description>Custom mode</description>
+ <topic>Type /mode to change the settings</topic>
+ <filters>
+ <filter name="command">
+ <param name="class" value="net.jetrix.commands.ModeCommand"/>
+ </filter>
+ </filters>
+ </channel>
+
+ <channel name="random">
+ <description>Random settings</description>
+ <topic>New game, new settings. Enjoy!</topic>
+ <filters>
+ <filter name="random"/>
+ </filters>
+ </channel>
+
+ <channel name="duel1">
+ <description>Duel 2:1</description>
+ <max-players>2</max-players>
+ <winlist name="duel"/>
+ </channel>
+
+ <channel name="duel2">
+ <description>Duel 2:1</description>
+ <max-players>2</max-players>
+ <winlist name="duel"/>
+ </channel>
+
+ <channel name="pureduel">
+ <description>Pure - No Specials</description>
+ <max-players>2</max-players>
+ <winlist name="default"/>
+ <settings>
+ <special-added>0</special-added>
+ <same-blocks>true</same-blocks>
+ </settings>
+ </channel>
+
+ <channel name="sticks">
+ <description>Sticks Only</description>
+ <settings>
+ <special-added>0</special-added>
+ <block-occurancy>
+ <line>100</line>
+ </block-occurancy>
+ </settings>
+ </channel>
+
+ <channel name="SnS">
+ <description><![CDATA[Sticks <i>and</i> Squares]]></description>
+ <settings>
+ <special-added>0</special-added>
+ <block-occurancy>
+ <line>50</line>
+ <square>50</square>
+ </block-occurancy>
+ </settings>
+ </channel>
+
+ <channel name="7Tetris">
+ <description>7 tetris to win!</description>
+ <topic>
+<![CDATA[
+<b>
+Welcome to the 7 tetris channel! The first player completing 7 tetris
+win. There is no special in this game, and the lines are not added to
+your opponents. Good luck!
+<b>
+]]>
+ </topic>
+ <settings>
+ <special-added>0</special-added>
+ </settings>
+ <filters>
+ <filter name="7tetris"/>
+ </filters>
+ </channel>
+
+ <channel name="survival">
+ <description>Staying Aliiiive !!</description>
+ <topic>
+<![CDATA[
+<b>
+Welcome to the survival channel! Drop as many blocks as you can
+before you die. The sudden death is activated immediately and one
+line is added every 5 seconds.
+If you clear <b>2</b> lines, <b>1</b> extra line will be removed.
+If you clear <b>3</b> lines, <b>2</b> extra lines will be removed.
+If you clear <b>4</b> lines, <b>3</b> extra additional lines will be removed.
+<b>
+]]>
+ </topic>
+ <max-players>2</max-players>
+ <settings>
+ <sudden-death>
+ <time>5</time>
+ <delay>5</delay>
+ <lines-added>1</lines-added>
+ </sudden-death>
+ </settings>
+ <filters>
+ <filter name="survival"/>
+ </filters>
+ </channel>
+
+ <channel name="puzzle">
+ <description>Downstack 'em all!</description>
+ <max-players>1</max-players>
+ <filters>
+ <filter name="puzzle"/>
+ </filters>
+ </channel>
+
+ <channel name="admins">
+ <description>Administrators' Lair</description>
+ <access-level>1</access-level>
+ <idle>true</idle>
+ </channel>
+
+ </channels>
+
+</tetrinet-channels>
Property changes on: jetrix/trunk/src/etc/conf/channels.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Copied: jetrix/trunk/src/etc/conf/server.xml (from rev 752, jetrix/trunk/src/etc/server.xml)
===================================================================
--- jetrix/trunk/src/etc/conf/server.xml (rev 0)
+++ jetrix/trunk/src/etc/conf/server.xml 2008-09-02 17:48:20 UTC (rev 764)
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!DOCTYPE tetrinet-server PUBLIC "-//LFJR//Jetrix TetriNET Server//EN" "http://jetrix.sourceforge.net/dtd/tetrinet-server.dtd">
+
+<tetrinet-server host="[ALL]">
+
+ <!-- Server name -->
+ <name>Jetrix TetriNET Server</name>
+
+ <!-- Server default language (using an ISO-639 two-letter language code) -->
+ <language>en</language>
+
+ <!-- How many seconds of inactivity before timeout occurs -->
+ <timeout>1000</timeout>
+
+ <!-- How many channels should be available on the server -->
+ <max-channels>8</max-channels>
+
+ <!-- Maximum number of players on the server -->
+ <max-players>50</max-players>
+
+ <!-- Maximum number of simultaneous connections allowed from the same IP -->
+ <max-connections>3</max-connections>
+
+ <!-- Typing /op <thispassword> will give player operator status -->
+ <op-password>jetrixpass</op-password>
+
+ <!-- Use this password to log on the administration console -->
+ <admin-password>adminpass</admin-password>
+
+ <!-- Access Log, where requests are logged to -->
+ <access-log path="log/access%g.log" />
+
+ <!-- Error Log, where errors are logged to -->
+ <error-log path="log/error%g.log" />
+
+ <!-- Client listeners -->
+ <listeners>
+ <listener class="net.jetrix.listeners.TetrinetListener"/>
+ <listener class="net.jetrix.listeners.TSpecListener"/>
+ <listener class="net.jetrix.listeners.IRCListener" port="31456" auto-start="false"/>
+ <listener class="net.jetrix.listeners.HttpListener" port="8080"/>
+ </listeners>
+
+ <!-- Services -->
+ <services>
+ <service class="net.jetrix.services.PublishingService">
+ <!--<param name="host" value="tetrinet.yourhostname.net"/>-->
+ </service>
+ <service class="net.jetrix.services.GhostbusterService"/>
+ <service class="net.jetrix.services.VersionService"/>
+ </services>
+
+ <!-- Server commands -->
+ <commands>
+ <command class="net.jetrix.commands.AwayCommand"/>
+ <command class="net.jetrix.commands.BroadcastCommand"/>
+ <command class="net.jetrix.commands.ConfigCommand"/>
+ <command class="net.jetrix.commands.EmoteCommand"/>
+ <command class="net.jetrix.commands.GotoCommand"/>
+ <command class="net.jetrix.commands.HelpCommand"/>
+ <command class="net.jetrix.commands.IgnoreCommand"/>
+ <command class="net.jetrix.commands.IpCommand"/>
+ <command class="net.jetrix.commands.JoinCommand"/>
+ <command class="net.jetrix.commands.KickCommand"/>
+ <command class="net.jetrix.commands.LanguageCommand"/>
+ <command class="net.jetrix.commands.ListCommand"/>
+ <command class="net.jetrix.commands.MotdCommand"/>
+ <command class="net.jetrix.commands.MoveCommand"/>
+ <command class="net.jetrix.commands.OperatorCommand"/>
+ <command class="net.jetrix.commands.PauseCommand"/>
+ <command class="net.jetrix.commands.PetitionCommand"/>
+ <command class="net.jetrix.commands.PingCommand"/>
+ <command class="net.jetrix.commands.RandomCommand"/>
+ <command class="net.jetrix.commands.ReplyCommand"/>
+ <command class="net.jetrix.commands.SpecListCommand"/>
+ <command class="net.jetrix.commands.StartCommand"/>
+ <command class="net.jetrix.commands.StopCommand"/>
+ <command class="net.jetrix.commands.SummonCommand"/>
+ <command class="net.jetrix.commands.TeamMessageCommand"/>
+ <command class="net.jetrix.commands.TeleportCommand"/>
+ <command class="net.jetrix.commands.TellCommand"/>
+ <command class="net.jetrix.commands.TimeCommand"/>
+ <command class="net.jetrix.commands.VersionCommand"/>
+ <command class="net.jetrix.commands.WhoCommand"/>
+ </commands>
+
+ <ban>
+ <!-- Cheating from host 1cust007.tnt2.billgates.da.uu.net -->
+ <host>*.tnt*.billgates.da.uu.net</host>
+
+ <!-- Flooding from 192.168.33.200. Ban all C class IP block -->
+ <host>192.168.33.*</host>
+
+ <!-- Ban all hostname contain the word foobar -->
+ <host>*foobar*</host>
+
+ <!-- Ban IP block from 192.168.10.0 to 192.168.19.255 -->
+ <host>192.168.1?.*</host>
+
+ <!-- Ban nickname -->
+ <nick>billgates</nick>
+
+ <!-- Ban team -->
+ <team>Flying Cucumbers</team>
+ </ban>
+
+ <!-- Database connection parameters -->
+ <datasource>
+ <!-- The class of the JDBC driver used -->
+ <driver>com.mysql.jdbc.Driver</driver>
+
+ <!-- The URL of the database (jdbc:<type>://<hostname>:<port>/<database>) -->
+ <url>jdbc:mysql://localhost/jetrix</url>
+
+ <!-- The username connecting to the database -->
+ <username>jetrix</username>
+
+ <!-- The password of the user -->
+ <password>jetrixpass</password>
+ </datasource>
+
+</tetrinet-server>
Property changes on: jetrix/trunk/src/etc/conf/server.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Deleted: jetrix/trunk/src/etc/server.xml
===================================================================
--- jetrix/trunk/src/etc/server.xml 2008-09-02 17:26:49 UTC (rev 763)
+++ jetrix/trunk/src/etc/server.xml 2008-09-02 17:48:20 UTC (rev 764)
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE tetrinet-server PUBLIC "-//LFJR//Jetrix TetriNET Server//EN" "http://jetrix.sourceforge.net/dtd/tetrinet-server.dtd">
-
-<tetrinet-server host="[ALL]">
-
- <!-- Server name -->
- <name>Jetrix TetriNET Server</name>
-
- <!-- Server default language (using an ISO-639 two-letter language code) -->
- <language>en</language>
-
- <!-- How many seconds of inactivity before timeout occurs -->
- <timeout>1000</timeout>
-
- <!-- How many channels should be available on the server -->
- <max-channels>8</max-channels>
-
- <!-- Maximum number of players on the server -->
- <max-players>50</max-players>
-
- <!-- Maximum number of simultaneous connections allowed from the same IP -->
- <max-connections>3</max-connections>
-
- <!-- Typing /op <thispassword> will give player operator status -->
- <op-password>jetrixpass</op-password>
-
- <!-- Use this password to log on the administration console -->
- <admin-password>adminpass</admin-password>
-
- <!-- Access Log, where requests are logged to -->
- <access-log path="log/access%g.log" />
-
- <!-- Error Log, where errors are logged to -->
- <error-log path="log/error%g.log" />
-
- <!-- Client listeners -->
- <listeners>
- <listener class="net.jetrix.listeners.TetrinetListener"/>
- <listener class="net.jetrix.listeners.TSpecListener"/>
- <listener class="net.jetrix.listeners.IRCListener" port="31456" auto-start="false"/>
- <listener class="net.jetrix.listeners.HttpListener" port="8080"/>
- </listeners>
-
- <!-- Services -->
- <services>
- <service class="net.jetrix.services.PublishingService">
- <!--<param name="host" value="tetrinet.yourhostname.net"/>-->
- </service>
- <service class="net.jetrix.services.GhostbusterService"/>
- <service class="net.jetrix.services.VersionService"/>
- </services>
-
- <!-- Server commands -->
- <commands>
- <command class="net.jetrix.commands.AwayCommand"/>
- <command class="net.jetrix.commands.BroadcastCommand"/>
- <command class="net.jetrix.commands.ConfigCommand"/>
- <command class="net.jetrix.commands.EmoteCommand"/>
- <command class="net.jetrix.commands.GotoCommand"/>
- <command class="net.jetrix.commands.HelpCommand"/>
- <command class="net.jetrix.commands.IgnoreCommand"/>
- <command class="net.jetrix.commands.IpCommand"/>
- <command class="net.jetrix.commands.JoinCommand"/>
- <command class="net.jetrix.commands.KickCommand"/>
- <command class="net.jetrix.commands.LanguageCommand"/>
- <command class="net.jetrix.commands.ListCommand"/>
- <command class="net.jetrix.commands.MotdCommand"/>
- <command class="net.jetrix.commands.MoveCommand"/>
- <command class="net.jetrix.commands.OperatorCommand"/>
- <command class="net.jetrix.commands.PauseCommand"/>
- <command class="net.jetrix.commands.PetitionCommand"/>
- <command class="net.jetrix.commands.PingCommand"/>
- <command class="net.jetrix.commands.RandomCommand"/>
- <command class="net.jetrix.commands.ReplyCommand"/>
- <command class="net.jetrix.commands.SpecListCommand"/>
- <command class="net.jetrix.commands.StartCommand"/>
- <command class="net.jetrix.commands.StopCommand"/>
- <command class="net.jetrix.commands.SummonCommand"/>
- <command class="net.jetrix.commands.TeamMessageCommand"/>
- <command class="net.jetrix.commands.TeleportCommand"/>
- <command class="net.jetrix.commands.TellCommand"/>
- <command class="net.jetrix.commands.TimeCommand"/>
- <command class="net.jetrix.commands.VersionCommand"/>
- <command class="net.jetrix.commands.WhoCommand"/>
- </commands>
-
- <ban>
- <!-- Cheating from host 1cust007.tnt2.billgates.da.uu.net -->
- <host>*.tnt*.billgates.da.uu.net</host>
-
- <!-- Flooding from 192.168.33.200. Ban all C class IP block -->
- <host>192.168.33.*</host>
-
- <!-- Ban all hostname contain the word foobar -->
- <host>*foobar*</host>
-
- <!-- Ban IP block from 192.168.10.0 to 192.168.19.255 -->
- <host>192.168.1?.*</host>
-
- <!-- Ban nickname -->
- <nick>billgates</nick>
-
- <!-- Ban team -->
- <team>Flying Cucumbers</team>
- </ban>
-
- <!-- Database connection parameters -->
- <datasource>
- <!-- The class of the JDBC driver used -->
- <driver>com.mysql.jdbc.Driver</driver>
-
- <!-- The URL of the database (jdbc:<type>://<hostname>:<port>/<database>) -->
- <url>jdbc:mysql://localhost/jetrix</url>
-
- <!-- The username connecting to the database -->
- <username>jetrix</username>
-
- <!-- The password of the user -->
- <password>jetrixpass</password>
- </datasource>
-
-</tetrinet-server>
Modified: jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java 2008-09-02 17:26:49 UTC (rev 763)
+++ jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java 2008-09-02 17:48:20 UTC (rev 764)
@@ -121,14 +121,14 @@
// parse the server configuration
digester.push(this);
- serverConfigURL = findResource("server.xml");
+ serverConfigURL = findResource("conf/server.xml");
Reader reader = new InputStreamReader(serverConfigURL.openStream(), ENCODING);
digester.parse(new InputSource(reader));
reader.close();
// parse the channel configuration
digester.push(this);
- channelsConfigURL = findResource("channels.xml");
+ channelsConfigURL = findResource("conf/channels.xml");
reader = new InputStreamReader(channelsConfigURL.openStream(), ENCODING);
digester.parse(new InputSource(reader));
reader.close();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
