[jetrix-cvs] SF.net SVN: jetrix:[717] jetrix/trunk/src

[<sm...@us...>]

Revision: 717
          http://jetrix.svn.sourceforge.net/jetrix/?rev=717&view=rev
Author:   smanux
Date:     2008-08-06 17:26:24 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
Renamed the datasource element in server.xml
Fixed the file generated by ServerConfig

Modified Paths:
--------------
    jetrix/trunk/src/etc/server.xml
    jetrix/trunk/src/etc/tetrinet-server.dtd
    jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java
    jetrix/trunk/src/java/net/jetrix/config/ServerRuleSet.java

Modified: jetrix/trunk/src/etc/server.xml
===================================================================
--- jetrix/trunk/src/etc/server.xml	2008-08-06 14:39:20 UTC (rev 716)
+++ jetrix/trunk/src/etc/server.xml	2008-08-06 17:26:24 UTC (rev 717)
@@ -105,7 +105,7 @@
   </ban>
 
   <!-- Database connection parameters -->
-  <data-source>
+  <datasource>
     <!-- The class of the JDBC driver used -->
     <driver>com.mysql.jdbc.Driver</driver>
 
@@ -117,6 +117,6 @@
 
     <!-- The password of the user -->
     <password>jetrixpass</password>
-  </data-source>
+  </datasource>
 
 </tetrinet-server>

Modified: jetrix/trunk/src/etc/tetrinet-server.dtd
===================================================================
--- jetrix/trunk/src/etc/tetrinet-server.dtd	2008-08-06 14:39:20 UTC (rev 716)
+++ jetrix/trunk/src/etc/tetrinet-server.dtd	2008-08-06 17:26:24 UTC (rev 717)
@@ -23,7 +23,7 @@
 
 <!ELEMENT tetrinet-server (name?, language?, timeout?, max-channels?,
   max-players?, max-connections?, op-password, admin-password, access-log,
-  error-log, listeners, services?, commands, ban?, data-source?)>
+  error-log, listeners, services?, commands, ban?, datasource?)>
 <!ATTLIST tetrinet-server host CDATA #IMPLIED>
 
 <!ELEMENT name (#PCDATA)>
@@ -67,7 +67,7 @@
 <!ELEMENT nick (#PCDATA)>
 <!ELEMENT team (#PCDATA)>
 
-<!ELEMENT data-source (driver, url, username, password?)>
+<!ELEMENT datasource (driver, url, username, password?)>
 <!ELEMENT driver (#PCDATA)>
 <!ELEMENT url (#PCDATA)>
 <!ELEMENT username (#PCDATA)>

Modified: jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java	2008-08-06 14:39:20 UTC (rev 716)
+++ jetrix/trunk/src/java/net/jetrix/config/ServerConfig.java	2008-08-06 17:26:24 UTC (rev 717)
@@ -286,7 +286,7 @@
         out.println();
         out.println("    <!-- The password of the user -->");
         out.println("    <password>" + dataSourcePassword + "</password>");
-        out.println("  <datasource>");
+        out.println("  </datasource>");
         out.println();
         out.println("</tetrinet-server>");
 

Modified: jetrix/trunk/src/java/net/jetrix/config/ServerRuleSet.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/ServerRuleSet.java	2008-08-06 14:39:20 UTC (rev 716)
+++ jetrix/trunk/src/java/net/jetrix/config/ServerRuleSet.java	2008-08-06 17:26:24 UTC (rev 717)
@@ -74,10 +74,10 @@
         digester.addCallMethod("tetrinet-server/ban/host", "addBannedHost", 0);
 
         // datasource
-        digester.addCallMethod("*/data-source/driver", "setDataSourceDriver", 0);
-        digester.addCallMethod("*/data-source/url", "setDataSourceURL", 0);
-        digester.addCallMethod("*/data-source/username", "setDataSourceUsername", 0);
-        digester.addCallMethod("*/data-source/password", "setDataSourcePassword", 0);
+        digester.addCallMethod("*/datasource/driver", "setDataSourceDriver", 0);
+        digester.addCallMethod("*/datasource/url", "setDataSourceURL", 0);
+        digester.addCallMethod("*/datasource/username", "setDataSourceUsername", 0);
+        digester.addCallMethod("*/datasource/password", "setDataSourcePassword", 0);
     }
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.