--no commit message

--no commit message

h2/src/main/org/h2/tools/Console.java

@@ -64,7 +64,7 @@ public class Console implements ActionListener, MouseListener {
                 System.out.println(web.getStatus());
             }
         }
-        Server tcp = null, odbc = null, pg = null;
+        Server tcp = null, pg = null;
         try {
             tcp = Server.createTcpServer(args);
             tcp.start();
@@ -75,16 +75,6 @@ public class Console implements ActionListener, MouseListener {
                 System.out.println(tcp.getStatus());
             }
         }
-        try {
-            odbc = Server.createOdbcServer(args);
-            odbc.start();
-        } catch(SQLException e) {
-            if(odbc == null) {
-                e.printStackTrace();
-            } else {
-                System.out.println(odbc.getStatus());
-            }
-        }
         try {
             pg = Server.createPgServer(args);
             pg.start();

h2/src/main/org/h2/tools/Server.java

@@ -33,7 +33,7 @@ public class Server implements Runnable {
     
     private void showUsage() {
         System.out.println("java "+getClass().getName() + " [options]");
-        System.out.println("By default, -tcp, -web, -browser and -odbc are started");
+        System.out.println("By default, -tcp, -web, -browser and -pg are started");
         System.out.println("-tcp (start the TCP Server)");
         System.out.println("-tcpPort <port> (default: " + TcpServer.DEFAULT_PORT+")");
         System.out.println("-tcpSSL [true|false]");        
@@ -48,14 +48,14 @@ public class Server implements Runnable {
         System.out.println("-webAllowOthers [true|false}");
         System.out.println("-browser (start a browser)");
 
-        System.out.println("-odbc (start the ODBC Server)");
-        System.out.println("-odbcPort <port> (default: " + OdbcServer.DEFAULT_PORT+")");
-        System.out.println("-odbcAllowOthers [true|false]");        
-
         System.out.println("-pg (start the PG Server)");
         System.out.println("-pgPort <port> (default: " + PgServer.DEFAULT_PORT+")");
         System.out.println("-pgAllowOthers [true|false]");        
 
+        System.out.println("-odbc (start the ODBC Server)");
+        System.out.println("-odbcPort <port> (default: " + OdbcServer.DEFAULT_PORT+")");
+        System.out.println("-odbcAllowOthers [true|false]");        
+
         System.out.println("-ftp (start the FTP Server)");
         System.out.println("-ftpPort <port> (default: " + Constants.DEFAULT_FTP_PORT+")");
         System.out.println("-ftpDir <directory> (default: " + FtpServer.DEFAULT_ROOT+", use jdbc:... to access a database)");        
@@ -82,8 +82,8 @@ public class Server implements Runnable {
      * </li><li>-web (start the Web Server / H2 Console application)
      * </li><li>-tcp (start the TCP Server)
      * </li><li>-tcpShutdown {url} (shutdown the running TCP Server, URL example: tcp://localhost:9094)
-     * </li><li>-odbc (start the ODBC Server)
      * </li><li>-pg (start the PG Server)
+     * </li><li>-odbc (start the ODBC Server)
      * </li><li>-browser (start a browser and open a page to connect to the Web Server)
      * </li><li>-log [true|false] (enable or disable logging)
      * </li><li>-baseDir {directory} (sets the base directory for database files; not for H2 Console)
@@ -165,7 +165,7 @@ public class Server implements Runnable {
         if(startDefaultServers) {
             tcpStart = true;
             pgStart = true;
-            odbcStart = true;
+            odbcStart = false;
             webStart = true;
             browserStart = true;
         }